diff --git a/third_party/nixpkgs/.editorconfig b/third_party/nixpkgs/.editorconfig index f272739f24..dab4bb0e80 100644 --- a/third_party/nixpkgs/.editorconfig +++ b/third_party/nixpkgs/.editorconfig @@ -11,18 +11,26 @@ insert_final_newline = true trim_trailing_whitespace = true charset = utf-8 +# Ignore diffs/patches +[*.{diff,patch}] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset + # see https://nixos.org/nixpkgs/manual/#chap-conventions -# Match nix/ruby/docbook files, set indent to spaces with width of two -[*.{nix,rb,xml}] +# Match nix/perl/python/ruby/shell/docbook files, set indent to spaces +[*.{nix,pl,py,rb,sh,xml}] indent_style = space + +# Match docbook files, set indent width of one +[*.xml] +indent_size = 1 + +# Match nix/ruby files, set indent width of two +[*.{nix,rb}] indent_size = 2 -# Match shell/python/perl scripts, set indent to spaces with width of four -[*.{sh,py,pl}] -indent_style = space +# Match perl/python/shell scripts, set indent width of four +[*.{pl,py,sh}] indent_size = 4 - -# Match diffs, avoid to trim trailing whitespace -[*.{diff,patch}] -trim_trailing_whitespace = false diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 211779a470..5376d51a61 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -181,9 +181,15 @@ /nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz /nixos/tests/prometheus-exporters.nix @WilliButz -# PHP -/doc/languages-frameworks/php.section.md @etu -/nixos/tests/php @etu -/pkgs/build-support/build-pecl.nix @etu -/pkgs/development/interpreters/php @etu -/pkgs/top-level/php-packages.nix @etu +# PHP interpreter, packages, extensions, tests and documentation +/doc/languages-frameworks/php.section.md @NixOS/php +/nixos/tests/php @NixOS/php +/pkgs/build-support/build-pecl.nix @NixOS/php +/pkgs/development/interpreters/php @NixOS/php +/pkgs/top-level/php-packages.nix @NixOS/php + +# Podman, CRI-O modules and related +/nixos/modules/virtualisation/containers.nix @NixOS/podman +/nixos/modules/virtualisation/cri-o.nix @NixOS/podman +/nixos/modules/virtualisation/podman.nix @NixOS/podman +/nixos/tests/podman.nix @NixOS/podman diff --git a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md index 7a5dc767b7..8cba6d9faa 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md @@ -42,7 +42,7 @@ $ agda -l standard-library -i . MyFile.agda ``` name: my-library include: . -depends: standard-library +depend: standard-library ``` - Create the file `~/.agda/defaults` and add any libraries you want to use by default. diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 35ea480e6b..838426afa0 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -1023,7 +1023,8 @@ are used in `buildPythonPackage`. - `setuptoolsBuildHook` to build a wheel using `setuptools`. - `setuptoolsCheckHook` to run tests with `python setup.py test`. - `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A - `venv` is created if it does not yet exist. + `venv` is created if it does not yet exist. `postVenvCreation` can be used to + to run commands only after venv is first created. - `wheelUnpackHook` to move a wheel to the correct folder so it can be installed with the `pipInstallHook`. @@ -1291,10 +1292,17 @@ in pkgs.mkShell rec { zlib ]; + # Run this command, only after creating the virtual environment + postVenvCreation = '' + unset SOURCE_DATE_EPOCH + pip install -r requirements.txt + ''; + # Now we can execute any commands within the virtual environment. # This is optional and can be left out to run pip manually. postShellHook = '' - pip install -r requirements.txt + # allow pip to install wheels + unset SOURCE_DATE_EPOCH ''; } diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index cc2ea541d6..d9608d2bcf 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -247,12 +247,6 @@ githubId = 732652; name = "Andreas Herrmann"; }; - ahmedtd = { - email = "ahmed.taahir@gmail.com"; - github = "ahmedtd"; - githubId = 1017202; - name = "Taahir Ahmed"; - }; ahuzik = { email = "ales.guzik@gmail.com"; github = "alesguzik"; @@ -1175,6 +1169,12 @@ githubId = 510553; name = "Jos van Bakel"; }; + caadar = { + email = "v88m@posteo.net"; + github = "caadar"; + githubId = 15320726; + name = "Car Cdr"; + }; cab404 = { email = "cab404@mailbox.org"; github = "cab404"; @@ -1280,6 +1280,12 @@ githubId = 64804; name = "Dennis Gosnell"; }; + ccellado = { + email = "annplague@gmail.com"; + github = "ccellado"; + githubId = 44584960; + name = "Denis Khalmatov"; + }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; @@ -3586,12 +3592,24 @@ githubId = 51518420; name = "jitwit"; }; + jk = { + email = "hello+nixpkgs@j-k.io"; + github = "06kellyjac"; + githubId = 9866621; + name = "Jack"; + }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; githubId = 1058504; name = "José Luis Lafuente"; }; + jloyet = { + email = "ml@fatbsd.com"; + github = "fatpat"; + githubId = 822436; + name = "Jérôme Loyet"; + }; jluttine = { email = "jaakko.luttinen@iki.fi"; github = "jluttine"; @@ -3991,6 +4009,12 @@ githubId = 59667; name = "Ahmed Kamal"; }; + kimat = { + email = "mail@kimat.org"; + github = "kimat"; + githubId = 3081769; + name = "Kimat Boven"; + }; kimburgess = { email = "kim@acaprojects.com"; github = "kimburgess"; @@ -4041,6 +4065,16 @@ github = "klntsky"; githubId = 18447310; }; + kloenk = { + email = "me@kloenk.de"; + name = "Finn Behrens"; + github = "kloenk"; + githubId = 12898828; + keys = [{ + longkeyid = "ed25519/0xB92445CFC9546F9D"; + fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; + }]; + }; kmcopper = { email = "kmcopper@danwin1210.me"; name = "Kyle Copperfield"; @@ -4162,6 +4196,12 @@ githubId = 10544; name = "Giuluo Eulisse"; }; + kthielen = { + email = "kthielen@gmail.com"; + github = "kthielen"; + githubId = 1409287; + name = "Kalani Thielen"; + }; ktor = { email = "kruszewsky@gmail.com"; github = "ktor"; @@ -4695,6 +4735,12 @@ githubId = 3507; name = "Michael Fellinger"; }; + maralorn = { + email = "malte.brandy@maralorn.de"; + github = "maralorn"; + githubId = 1651325; + name = "Malte Brandy"; + }; marcweber = { email = "marco-oweber@gmx.de"; github = "marcweber"; @@ -5546,6 +5592,12 @@ githubId = 4368690; name = "Ratko Mladic"; }; + nilp0inter = { + email = "robertomartinezp@gmail.com"; + github = "nilp0inter"; + githubId = 1224006; + name = "Roberto Abdelkader Martínez Pérez"; + }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; @@ -6562,6 +6614,12 @@ githubId = 353885; name = "Rob Vermaas"; }; + robaca = { + email = "carsten@r0hrbach.de"; + github = "robaca"; + githubId = 580474; + name = "Carsten Rohrbach"; + }; robberer = { email = "robberer@freakmail.de"; github = "robberer"; @@ -6634,6 +6692,12 @@ githubId = 1942810; name = "Christian Ulrich"; }; + rpearce = { + email = "me@robertwpearce.com"; + github = "rpearce"; + githubId = 592876; + name = "Robert W. Pearce"; + }; rprospero = { email = "rprospero+nix@gmail.com"; github = "rprospero"; @@ -6694,6 +6758,12 @@ githubId = 889991; name = "Ryan Artecona"; }; + ryanorendorff = { + email = "12442942+ryanorendorff@users.noreply.github.com"; + github = "ryanorendorff"; + githubId = 12442942; + name = "Ryan Orendorff"; + }; ryansydnor = { email = "ryan.t.sydnor@gmail.com"; github = "ryansydnor"; @@ -8107,6 +8177,16 @@ githubId = 6508; name = "Vincent Demeester"; }; + veehaitch = { + name = "Vincent Haupert"; + email = "mail@vincent-haupert.de"; + github = "veehaitch"; + githubId = 15069839; + keys = [{ + longkeyid = "rsa4096/0x874BD6F916FAA742"; + fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; + }]; + }; velovix = { email = "xaviosx@gmail.com"; github = "velovix"; @@ -8283,6 +8363,12 @@ githubId = 6016963; name = "Patrick Winter"; }; + wishfort36 = { + email = "42300264+wishfort36@users.noreply.github.com"; + github = "wishfort36"; + githubId = 42300264; + name = "wishfort36"; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; @@ -8301,6 +8387,12 @@ githubId = 54934; name = "Wout Mertens"; }; + wnklmnn = { + email = "pascal@wnklmnn.de"; + github = "wnklmnn"; + githubId = 9423014; + name = "Pascal Winkelmann"; + }; woffs = { email = "github@woffs.de"; github = "woffs"; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index 341b304cb9..e17e8ac24d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -26,6 +26,12 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + maxx package removed along with services.xserver.desktopManager.maxx module. + Please migrate to cdesktopenv and services.xserver.desktopManager.cde module. + + We now distribute a GNOME ISO. @@ -122,8 +128,16 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' - The go-modules builder now uses vendorSha256 instead of modSha256 to pin - fetched version data. This is currently a warning, but will be removed in the next release. + buildGoModule now internally creates a vendor directory + in the source tree for downloaded modules instead of using go's module + proxy protocol. This storage format is simpler and therefore less + likekly to break with future versions of go. As a result + buildGoModule switched from + modSha256 to the vendorSha256 + attribute to pin fetched version data. buildGoModule + still accepts modSha256 with a warning, but support will + be removed in the next release. @@ -381,6 +395,52 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; will have changed. + + + The rkt module has been removed, it was archived by upstream. + + + + + The Bazaar VCS is + unmaintained and, as consequence of the Python 2 EOL, the packages + bazaar and bazaarTools were + removed. Breezy, the backward compatible fork of Bazaar (see the + announcement), + was packaged as breezy and can be used instead. + + + Regarding Nixpkgs, fetchbzr, + nix-prefetch-bzr and Bazaar support in Hydra will + continue to work through Breezy. + + + + + In addition to the hostname, the fully qualified domain name (FQDN), + which consists of ${cfg.hostName} and + ${cfg.domain} is now added to + /etc/hosts, to allow local FQDN resolution, as used by the + hostname --fqdn command and other applications that + try to determine the FQDN. These new entries take precedence over entries + from the DNS which could cause regressions in some very specific setups. + Additionally the hostname is now resolved to 127.0.0.2 + instead of 127.0.1.1 to be consistent with what + nss-myhostname (from systemd) returns. + The old behaviour can e.g. be restored by using + networking.hosts = lib.mkForce { "127.0.1.1" = [ config.networking.hostName ]; };. + + + + + The hostname (networking.hostName) must now be a valid + DNS label (see RFC 1035) and as such must not contain the domain part. + This means that the hostname must start with a letter, end with a letter + or digit, and have as interior characters only letters, digits, and + hyphen. The maximum length is 63 characters. Additionally it is + recommended to only use lower-case characters. + + @@ -413,6 +473,34 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; The default output of buildGoPackage is now $out instead of $bin. + + + Default algorithm for ZRAM swap was changed to zstd. + + + + + The scripted networking system now uses .link files in + /etc/systemd/network to configure mac address and link MTU, + instead of the sometimes buggy network-link-* units, which + have been removed. + Bringing the interface up has been moved to the beginning of the + network-addresses-* unit. + Note this doesn't require systemd-networkd - it's udev that + parses .link files. + Extra care needs to be taken in the presence of legacy udev rules + to rename interfaces, as MAC Address and MTU defined in these options can only match on the original link name. + In such cases, you most likely want to create a 10-*.link file through and set both name and MAC Address / MTU there. + + + + + Grafana received a major update to version 7.x. A plugin is now needed for + image rendering support, and plugins must now be signed by default. More + information can be found + in the Grafana documentation. + + diff --git a/third_party/nixpkgs/nixos/modules/config/networking.nix b/third_party/nixpkgs/nixos/modules/config/networking.nix index 03944de824..4cb7d81c99 100644 --- a/third_party/nixpkgs/nixos/modules/config/networking.nix +++ b/third_party/nixpkgs/nixos/modules/config/networking.nix @@ -8,9 +8,6 @@ let cfg = config.networking; - localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1"; - localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1"; - localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ])); in @@ -147,12 +144,6 @@ in config = { assertions = [{ - assertion = localhostMapped4; - message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"''; - } { - assertion = !cfg.enableIPv6 || localhostMapped6; - message = ''`networking.hosts` doesn't map "::1" to "localhost"''; - } { assertion = !localhostMultiple; message = '' `networking.hosts` maps "localhost" to something other than "127.0.0.1" @@ -161,22 +152,34 @@ in ''; }]; - networking.hosts = { - "127.0.0.1" = [ "localhost" ]; - } // optionalAttrs (cfg.hostName != "") { - "127.0.1.1" = [ cfg.hostName ]; + # These entries are required for "hostname -f" and to resolve both the + # hostname and FQDN correctly: + networking.hosts = let + hostnames = # Note: The FQDN (canonical hostname) has to come first: + optional (cfg.hostName != "" && cfg.domain != null) "${cfg.hostName}.${cfg.domain}" + ++ optional (cfg.hostName != "") cfg.hostName; # Then the hostname (without the domain) + in { + "127.0.0.2" = hostnames; } // optionalAttrs cfg.enableIPv6 { - "::1" = [ "localhost" ]; + "::1" = hostnames; }; networking.hostFiles = let + # Note: localhostHosts has to appear first in /etc/hosts so that 127.0.0.1 + # resolves back to "localhost" (as some applications assume) instead of + # the FQDN! By default "networking.hosts" also contains entries for the + # FQDN so that e.g. "hostname -f" works correctly. + localhostHosts = pkgs.writeText "localhost-hosts" '' + 127.0.0.1 localhost + ${optionalString cfg.enableIPv6 "::1 localhost"} + ''; 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 ]; + in mkBefore [ localhostHosts stringHosts extraHosts ]; environment.etc = { # /etc/services: TCP/UDP port assignments. diff --git a/third_party/nixpkgs/nixos/modules/config/power-management.nix b/third_party/nixpkgs/nixos/modules/config/power-management.nix index 64cdf50f14..cc0ff732ff 100644 --- a/third_party/nixpkgs/nixos/modules/config/power-management.nix +++ b/third_party/nixpkgs/nixos/modules/config/power-management.nix @@ -94,7 +94,7 @@ in after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ]; script = '' - ${config.systemd.package}/bin/systemctl try-restart post-resume.target + /run/current-system/systemd/bin/systemctl try-restart post-resume.target ${cfg.resumeCommands} ${cfg.powerUpCommands} ''; diff --git a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix index cc202bca6c..cd0ed49138 100644 --- a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix +++ b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix @@ -21,7 +21,7 @@ let '' + optionalString config.services.nscd.enable '' # Invalidate the nscd cache whenever resolv.conf is # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' + libc_restart='/run/current-system/systemd/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' '' + optionalString (length resolvconfOptions > 0) '' # Options as described in resolv.conf(5) resolv_conf_options='${concatStringsSep " " resolvconfOptions}' diff --git a/third_party/nixpkgs/nixos/modules/config/zram.nix b/third_party/nixpkgs/nixos/modules/config/zram.nix index 5d411c73a5..5e9870bf6b 100644 --- a/third_party/nixpkgs/nixos/modules/config/zram.nix +++ b/third_party/nixpkgs/nixos/modules/config/zram.nix @@ -91,7 +91,7 @@ in }; algorithm = mkOption { - default = "lzo"; + default = "zstd"; example = "lz4"; type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str; description = '' diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 842976c357..bfd8970d2b 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/8928ygfyf9iassfrnj76v55s6zid58ja-nix-2.3.4"; - i686-linux = "/nix/store/b5cx3nmba9ahx3wk5ybxa67k40pdpdxn-nix-2.3.4"; - aarch64-linux = "/nix/store/p6j4mis6agdjlk4j0cyg7yh58wpm3kif-nix-2.3.4"; - x86_64-darwin = "/nix/store/aizhr07dljmlbf17wfrj40x3s0b5iv3d-nix-2.3.4"; + x86_64-linux = "/nix/store/xb0nl3z356n0sfrhswfli2g19a19slys-nix-2.3.5"; + i686-linux = "/nix/store/k8kdd4yy1yap6lai5idyhmzcwsjh1fik-nix-2.3.5"; + aarch64-linux = "/nix/store/dr86cbipxqjcb8pf2k0v8wvw0h0adfpz-nix-2.3.5"; + x86_64-darwin = "/nix/store/n6dqdndkv9kac66kdr988kaiyavl44x8-nix-2.3.5"; } diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 5adbc26522..d4e6f753e9 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -415,6 +415,7 @@ ./services/misc/apache-kafka.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix + ./services/misc/bazarr.nix ./services/misc/beanstalkd.nix ./services/misc/bees.nix ./services/misc/bepasty.nix @@ -605,6 +606,7 @@ ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/epmd.nix + ./services/networking/ergo.nix ./services/networking/eternal-terminal.nix ./services/networking/fakeroute.nix ./services/networking/ferm.nix @@ -816,6 +818,7 @@ ./services/torrent/magnetico.nix ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix + ./services/torrent/rtorrent.nix ./services/torrent/transmission.nix ./services/ttys/agetty.nix ./services/ttys/gpm.nix @@ -828,6 +831,7 @@ ./services/web-apps/cryptpad.nix ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix + ./services/web-apps/engelsystem.nix ./services/web-apps/frab.nix ./services/web-apps/gerrit.nix ./services/web-apps/gotify-server.nix @@ -847,6 +851,7 @@ ./services/web-apps/matomo.nix ./services/web-apps/moinmoin.nix ./services/web-apps/restya-board.nix + ./services/web-apps/sogo.nix ./services/web-apps/tt-rss.nix ./services/web-apps/trac.nix ./services/web-apps/trilium.nix @@ -1002,7 +1007,6 @@ ./virtualisation/podman.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix - ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix index 930cc1987a..049a315c76 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix @@ -135,6 +135,13 @@ in type = types.bool; }; + enableBashCompletion = mkOption { + default = false; + description = '' + Enable compatibility with bash's programmable completion system. + ''; + type = types.bool; + }; enableGlobalCompInit = mkOption { default = cfg.enableCompletion; @@ -239,6 +246,11 @@ in autoload -U compinit && compinit ''} + ${optionalString cfg.enableBashCompletion '' + # Enable compatibility with bash's completion system. + autoload -U bashcompinit && bashcompinit + ''} + # Setup custom interactive shell init stuff. ${cfge.interactiveShellInit} diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index a946268494..7776c648af 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -48,6 +48,7 @@ with lib; systemd-logind API). Instead of using the module you can now simply add the brightnessctl package to environment.systemPackages. '') + (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream") (mkRemovedOptionModule ["services" "prey" ] '' prey-bash-client is deprecated upstream diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix index 44183788d9..51885881cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix @@ -32,13 +32,7 @@ in services.mysql = { - enable = mkOption { - type = types.bool; - default = false; - description = " - Whether to enable the MySQL server. - "; - }; + enable = mkEnableOption "MySQL server"; package = mkOption { type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index 5c817422aa..799c3db621 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -11,12 +11,11 @@ let port ${toString cfg.port} ${condOption "bind" cfg.bind} ${condOption "unixsocket" cfg.unixSocket} - daemonize yes + daemonize no supervised systemd loglevel ${cfg.logLevel} logfile ${cfg.logfile} syslog-enabled ${redisBool cfg.syslog} - pidfile /run/redis/redis.pid databases ${toString cfg.databases} ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save} dbfilename dump.rdb diff --git a/third_party/nixpkgs/nixos/modules/services/databases/rethinkdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/rethinkdb.nix index f18fbaf5b0..c764d6c21c 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/rethinkdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/rethinkdb.nix @@ -15,10 +15,7 @@ in services.rethinkdb = { - enable = mkOption { - default = false; - description = "Whether to enable the RethinkDB server."; - }; + enable = mkEnableOption "RethinkDB server"; #package = mkOption { # default = pkgs.rethinkdb; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix b/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix index 931bac58ac..f8fb73701a 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix @@ -41,7 +41,6 @@ pkgs.deepin.dde-session-ui pkgs.deepin.deepin-anything pkgs.deepin.deepin-image-viewer - pkgs.deepin.deepin-screenshot ]; services.dbus.packages = [ @@ -55,7 +54,6 @@ pkgs.deepin.dde-session-ui pkgs.deepin.deepin-anything pkgs.deepin.deepin-image-viewer - pkgs.deepin.deepin-screenshot ]; systemd.packages = [ diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix index 168056a475..587b9b0234 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix @@ -83,6 +83,10 @@ let run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="/' | sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq) for i in $import_progs $run_progs; do + # if the path refers to /run/current-system/systemd, replace with config.systemd.package + if [[ $i == /run/current-system/systemd* ]]; then + i="${config.systemd.package}/''${i#/run/current-system/systemd/}" + fi if [[ ! -x $i ]]; then echo "FAIL" echo "$i is called in udev rules but is not executable or does not exist" diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index fdd9f0f3e5..565618b27a 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -5,26 +5,85 @@ with lib; let cfg = config.services.logrotate; - configFile = pkgs.writeText "logrotate.conf" - cfg.config; + pathOptions = { + options = { + path = mkOption { + type = types.str; + description = "The path to log files to be rotated"; + }; + user = mkOption { + type = types.str; + description = "The user account to use for rotation"; + }; + group = mkOption { + type = types.str; + description = "The group to use for rotation"; + }; + frequency = mkOption { + type = types.enum [ + "daily" "weekly" "monthly" "yearly" + ]; + default = "daily"; + description = "How often to rotate the logs"; + }; + keep = mkOption { + type = types.int; + default = 20; + description = "How many rotations to keep"; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Extra logrotate config options for this path"; + }; + }; + }; + + pathConfig = options: '' + "${options.path}" { + su ${options.user} ${options.group} + ${options.frequency} + missingok + notifempty + rotate ${toString options.keep} + ${options.extraConfig} + } + ''; + + configFile = pkgs.writeText "logrotate.conf" ( + (concatStringsSep "\n" ((map pathConfig cfg.paths) ++ [cfg.extraConfig])) + ); in { + imports = [ + (mkRenamedOptionModule [ "services" "logrotate" "config" ] [ "services" "logrotate" "extraConfig" ]) + ]; + options = { services.logrotate = { - enable = mkOption { - type = lib.types.bool; - default = false; - description = '' - Enable the logrotate cron job - ''; + enable = mkEnableOption "the logrotate systemd service"; + + paths = mkOption { + type = types.listOf (types.submodule pathOptions); + default = []; + description = "List of attribute sets with paths to rotate"; + example = { + "/var/log/myapp/*.log" = { + user = "myuser"; + group = "mygroup"; + rotate = "weekly"; + keep = 5; + }; + }; }; - config = mkOption { + extraConfig = mkOption { default = ""; type = types.lines; description = '' - The contents of the logrotate config file + Extra contents to add to the logrotate config file. + See https://linux.die.net/man/8/logrotate ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix new file mode 100644 index 0000000000..d3fd5b08cc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix @@ -0,0 +1,76 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.bazarr; +in +{ + options = { + services.bazarr = { + enable = mkEnableOption "bazarr, a subtitle manager for Sonarr and Radarr"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the bazarr web interface."; + }; + + listenPort = mkOption { + type = types.port; + default = 6767; + description = "Port on which the bazarr web interface should listen"; + }; + + user = mkOption { + type = types.str; + default = "bazarr"; + description = "User account under which bazarr runs."; + }; + + group = mkOption { + type = types.str; + default = "bazarr"; + description = "Group under which bazarr runs."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.bazarr = { + description = "bazarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = rec { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + StateDirectory = "bazarr"; + SyslogIdentifier = "bazarr"; + ExecStart = pkgs.writeShellScript "start-bazarr" '' + ${pkgs.bazarr}/bin/bazarr \ + --config '/var/lib/${StateDirectory}' \ + --port ${toString cfg.listenPort} \ + --no-update True + ''; + Restart = "on-failure"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listenPort ]; + }; + + users.users = mkIf (cfg.user == "bazarr") { + bazarr = { + group = cfg.group; + home = "/var/lib/${config.systemd.services.bazarr.serviceConfig.StateDirectory}"; + }; + }; + + users.groups = mkIf (cfg.group == "bazarr") { + bazarr = {}; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix b/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix index 89bac4f47d..1c2e2cc535 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix @@ -138,7 +138,7 @@ in { script = '' ${pkgs.docker-distribution}/bin/registry garbage-collect ${configFile} - ${pkgs.systemd}/bin/systemctl restart docker-registry.service + /run/current-system/systemd/bin/systemctl restart docker-registry.service ''; startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix b/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix index 0de5ba4281..d27dbe220d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix @@ -78,7 +78,7 @@ in { wantedBy = [ "multi-user.target" ]; restartTriggers = [ configDirectory ]; serviceConfig = { - ExecStart = "${pkgs.systemd}/bin/systemctl try-reload-or-restart freeswitch.service"; + ExecStart = "/run/current-system/systemd/bin/systemctl try-reload-or-restart freeswitch.service"; RemainAfterExit = true; Type = "oneshot"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix index 1febdba0c8..0e71cf9256 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix @@ -26,7 +26,7 @@ let scm_mercurial_command: ${pkgs.mercurial}/bin/hg scm_git_command: ${pkgs.gitAndTools.git}/bin/git scm_cvs_command: ${pkgs.cvs}/bin/cvs - scm_bazaar_command: ${pkgs.bazaar}/bin/bzr + scm_bazaar_command: ${pkgs.breezy}/bin/bzr scm_darcs_command: ${pkgs.darcs}/bin/darcs ${cfg.extraConfig} @@ -297,7 +297,7 @@ in environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; path = with pkgs; [ imagemagick - bazaar + breezy cvs darcs gitAndTools.git diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix index d5b3537068..d9d34b7fac 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix @@ -63,10 +63,6 @@ let ${cfg.extraConfig} ''; - phpExtensions = with pkgs.phpPackages; [ - { pkg = apcu; name = "apcu"; } - ]; - in { options = { services.zoneminder = with lib; { @@ -289,11 +285,9 @@ in { phpfpm = lib.mkIf useNginx { pools.zoneminder = { inherit user group; + phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]); phpOptions = '' date.timezone = "${config.time.timeZone}" - - ${lib.concatStringsSep "\n" (map (e: - "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)} ''; settings = lib.mapAttrs (name: lib.mkDefault) { "listen.owner" = user; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index c0619211c2..0507b739d4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -81,7 +81,7 @@ let # anything ever again ("couldn't resolve ..., giving up on # it"), so we silently lose time synchronisation. This also # applies to openntpd. - ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service chronyd.service || true + /run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd.service openntpd.service chronyd.service || true fi ${cfg.runHook} @@ -217,7 +217,7 @@ in powerManagement.resumeCommands = mkIf config.systemd.services.dhcpcd.enable '' # Tell dhcpcd to rebind its interfaces if it's running. - ${config.systemd.package}/bin/systemctl reload dhcpcd.service + /run/current-system/systemd/bin/systemctl reload dhcpcd.service ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index e48eb72910..28691e8382 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -55,6 +55,7 @@ in AmbientCapabilities = "CAP_NET_BIND_SERVICE"; DynamicUser = true; ExecStart = "${pkgs.dnscrypt-proxy2}/bin/dnscrypt-proxy -config ${cfg.configFile}"; + Restart = "always"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix index e53fb7a157..b9333cd19a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -5,12 +5,20 @@ let cfg = config.services.dnscrypt-wrapper; dataDir = "/var/lib/dnscrypt-wrapper"; + mkPath = path: default: + if path != null + then toString path + else default; + + publicKey = mkPath cfg.providerKey.public "${dataDir}/public.key"; + secretKey = mkPath cfg.providerKey.secret "${dataDir}/secret.key"; + daemonArgs = with cfg; [ "--listen-address=${address}:${toString port}" "--resolver-address=${upstream.address}:${toString upstream.port}" "--provider-name=${providerName}" - "--provider-publickey-file=public.key" - "--provider-secretkey-file=secret.key" + "--provider-publickey-file=${publicKey}" + "--provider-secretkey-file=${secretKey}" "--provider-cert-file=${providerName}.crt" "--crypt-secretkey-file=${providerName}.key" ]; @@ -24,17 +32,19 @@ let dnscrypt-wrapper --gen-cert-file \ --crypt-secretkey-file=${cfg.providerName}.key \ --provider-cert-file=${cfg.providerName}.crt \ - --provider-publickey-file=public.key \ - --provider-secretkey-file=secret.key \ + --provider-publickey-file=${publicKey} \ + --provider-secretkey-file=${secretKey} \ --cert-file-expire-days=${toString cfg.keys.expiration} } cd ${dataDir} # generate provider keypair (first run only) - if [ ! -f public.key ] || [ ! -f secret.key ]; then - dnscrypt-wrapper --gen-provider-keypair - fi + ${optionalString (cfg.providerKey.public == null || cfg.providerKey.secret == null) '' + if [ ! -f ${publicKey} ] || [ ! -f ${secretKey} ]; then + dnscrypt-wrapper --gen-provider-keypair + fi + ''} # generate new keys for rotation if [ ! -f ${cfg.providerName}.key ] || [ ! -f ${cfg.providerName}.crt ]; then @@ -64,6 +74,47 @@ let fi ''; + + # This is the fork of the original dnscrypt-proxy maintained by Dyne.org. + # dnscrypt-proxy2 doesn't provide the `--test` feature that is needed to + # correctly implement key rotation of dnscrypt-wrapper ephemeral keys. + dnscrypt-proxy1 = pkgs.callPackage + ({ stdenv, fetchFromGitHub, autoreconfHook + , pkgconfig, libsodium, ldns, openssl, systemd }: + + stdenv.mkDerivation rec { + pname = "dnscrypt-proxy"; + version = "2019-08-20"; + + src = fetchFromGitHub { + owner = "dyne"; + repo = "dnscrypt-proxy"; + rev = "07ac3825b5069adc28e2547c16b1d983a8ed8d80"; + sha256 = "0c4mq741q4rpmdn09agwmxap32kf0vgfz7pkhcdc5h54chc3g3xy"; + }; + + configureFlags = optional stdenv.isLinux "--with-systemd"; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + # depends on + buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd; + + postInstall = '' + # Previous versions required libtool files to load plugins; they are + # now strictly optional. + rm $out/lib/dnscrypt-proxy/*.la + ''; + + meta = { + description = "A tool for securing communications between a client and a DNS resolver"; + homepage = "https://github.com/dyne/dnscrypt-proxy"; + license = licenses.isc; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.linux; + }; + }) { }; + in { @@ -98,6 +149,26 @@ in { ''; }; + providerKey.public = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/secrets/public.key"; + description = '' + The filepath to the provider public key. If not given a new + provider key pair will be generated on the first run. + ''; + }; + + providerKey.secret = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/secrets/secret.key"; + description = '' + The filepath to the provider secret key. If not given a new + provider key pair will be generated on the first run. + ''; + }; + upstream.address = mkOption { type = types.str; default = "127.0.0.1"; @@ -179,7 +250,7 @@ in { requires = [ "dnscrypt-wrapper.service" ]; description = "Rotates DNSCrypt wrapper keys if soon to expire"; - path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy gawk ]; + path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy1 gawk ]; script = rotateKeys; serviceConfig.User = "dnscrypt-wrapper"; }; @@ -196,6 +267,13 @@ in { }; }; + assertions = with cfg; [ + { assertion = (providerKey.public == null && providerKey.secret == null) || + (providerKey.secret != null && providerKey.public != null); + message = "The secret and public provider key must be set together."; + } + ]; + }; meta.maintainers = with lib.maintainers; [ rnhmjoj ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ergo.nix b/third_party/nixpkgs/nixos/modules/services/networking/ergo.nix new file mode 100644 index 0000000000..c52de30dc3 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/ergo.nix @@ -0,0 +1,141 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.ergo; + + inherit (lib) mkEnableOption mkIf mkOption optionalString types; + + configFile = pkgs.writeText "ergo.conf" ('' +ergo { + directory = "${cfg.dataDir}" + node { + mining = false + } + wallet.secretStorage.secretDir = "${cfg.dataDir}/wallet/keystore" +} + +scorex { + network { + bindAddress = "${cfg.listen.ip}:${toString cfg.listen.port}" + } +'' + optionalString (cfg.api.keyHash != null) '' + restApi { + apiKeyHash = "${cfg.api.keyHash}" + bindAddress = "${cfg.api.listen.ip}:${toString cfg.api.listen.port}" + } +'' + '' +} +''); + +in { + + options = { + + services.ergo = { + enable = mkEnableOption "Ergo service"; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/ergo"; + description = "The data directory for the Ergo node."; + }; + + listen = { + ip = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IP address on which the Ergo node should listen."; + }; + + port = mkOption { + type = types.port; + default = 9006; + description = "Listen port for the Ergo node."; + }; + }; + + api = { + keyHash = mkOption { + type = types.nullOr types.str; + default = null; + example = "324dcf027dd4a30a932c441f365a25e86b173defa4b8e58948253471b81b72cf"; + description = "Hex-encoded Blake2b256 hash of an API key as a 64-chars long Base16 string."; + }; + + listen = { + ip = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IP address that the Ergo node API should listen on if is defined."; + }; + + port = mkOption { + type = types.port; + default = 9052; + description = "Listen port for the API endpoint if is defined."; + }; + }; + }; + + testnet = mkOption { + type = types.bool; + default = false; + description = "Connect to testnet network instead of the default mainnet."; + }; + + user = mkOption { + type = types.str; + default = "ergo"; + description = "The user as which to run the Ergo node."; + }; + + group = mkOption { + type = types.str; + default = cfg.user; + description = "The group as which to run the Ergo node."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the Ergo node as well as the API."; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" + ]; + + systemd.services.ergo = { + description = "ergo server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = ''${pkgs.ergo}/bin/ergo \ + ${optionalString (!cfg.testnet) + "--mainnet"} \ + -c ${configFile}''; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listen.port ] ++ [ cfg.api.listen.port ]; + }; + + users.users.${cfg.user} = { + name = cfg.user; + group = cfg.group; + description = "Ergo daemon user"; + home = cfg.dataDir; + isSystemUser = true; + }; + + users.groups.${cfg.group} = {}; + + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index 6f24141b33..cc789897b2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -449,6 +449,13 @@ in { systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ]; + # override unit as recommended by upstream - see https://github.com/NixOS/nixpkgs/issues/88089 + # TODO: keep an eye on modem-manager releases as this will eventually be added to the upstream unit + systemd.services.ModemManager.serviceConfig.ExecStart = [ + "" + "${pkgs.modemmanager}/sbin/ModemManager --filter-policy=STRICT" + ]; + systemd.services.NetworkManager-dispatcher = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix index 429580e5c6..6e3eed0c55 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -252,7 +252,7 @@ let Use imports or pkgs.lib.readFile if you don't want this data in your config file. ''; }; - + dnssec = mkEnableOption "DNSSEC"; dnssecPolicy = { @@ -970,7 +970,7 @@ in script = signZones; postStop = '' - ${pkgs.systemd}/bin/systemctl kill -s SIGHUP nsd.service + /run/current-system/systemd/bin/systemctl kill -s SIGHUP nsd.service ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index de0f11595a..a7dea95056 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -253,12 +253,12 @@ in { }; powerManagement.resumeCommands = '' - ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant + /run/current-system/systemd/bin/systemctl try-restart wpa_supplicant ''; # Restart wpa_supplicant when a wlan device appears or disappears. services.udev.extraRules = '' - ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service" + ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="/run/current-system/systemd/bin/systemctl try-restart wpa_supplicant.service" ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index ecd1406b48..0fe9a200a1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -1,55 +1,17 @@ { config, lib, pkgs, ... }: with lib; let + keysPath = "/var/lib/yggdrasil/keys.json"; + cfg = config.services.yggdrasil; - configProvided = (cfg.config != {}); - configAsFile = (if configProvided then - toString (pkgs.writeTextFile { - name = "yggdrasil-conf"; - text = builtins.toJSON cfg.config; - }) - else null); - configFileProvided = (cfg.configFile != null); - generateConfig = ( - if configProvided && configFileProvided then - "${pkgs.jq}/bin/jq -s add ${configAsFile} ${cfg.configFile}" - else if configProvided then - "cat ${configAsFile}" - else if configFileProvided then - "cat ${cfg.configFile}" - else - "${cfg.package}/bin/yggdrasil -genconf" - ); + configProvided = cfg.config != { }; + configFileProvided = cfg.configFile != null; in { options = with types; { services.yggdrasil = { enable = mkEnableOption "the yggdrasil system service"; - configFile = mkOption { - type = nullOr str; - default = null; - example = "/run/keys/yggdrasil.conf"; - description = '' - A file which contains JSON configuration for yggdrasil. - - You do not have to supply a complete configuration, as - yggdrasil will use default values for anything which is - omitted. If the encryption and signing keys are omitted, - yggdrasil will generate new ones each time the service is - started, resulting in a random IPv6 address on the yggdrasil - network each time. - - If both this option and are - supplied, they will be combined, with values from - taking precedence. - - You can use the command nix-shell -p yggdrasil --run - "yggdrasil -genconf -json" to generate a default - JSON configuration. - ''; - }; - config = mkOption { type = attrs; default = {}; @@ -66,16 +28,21 @@ in { Configuration for yggdrasil, as a Nix attribute set. Warning: this is stored in the WORLD-READABLE Nix store! - Therefore, it is not appropriate for private keys. If you - do not specify the keys, yggdrasil will generate a new set - each time the service is started, creating a random IPv6 - address on the yggdrasil network each time. + Therefore, it is not appropriate for private keys. If you + wish to specify the keys, use . - If you wish to specify the keys, use - . If both - and are - supplied, they will be combined, with values from - taking precedence. + If the is enabled then the + keys that are generated during activation will override + those in or + . + + If no keys are specified then ephemeral keys are generated + and the Yggdrasil interface will have a random IPv6 address + each time the service is started, this is the default. + + If both and + are supplied, they will be combined, with values from + taking precedence. You can use the command nix-shell -p yggdrasil --run "yggdrasil -genconf" to generate default @@ -83,12 +50,21 @@ in { ''; }; + configFile = mkOption { + type = nullOr path; + default = null; + example = "/run/keys/yggdrasil.conf"; + description = '' + A file which contains JSON configuration for yggdrasil. + See the option for more information. + ''; + }; + group = mkOption { type = types.str; default = "root"; example = "wheel"; - description = - "Group to grant acces to the Yggdrasil control socket."; + description = "Group to grant acces to the Yggdrasil control socket."; }; openMulticastPort = mkOption { @@ -126,37 +102,64 @@ in { defaultText = "pkgs.yggdrasil"; description = "Yggdrasil package to use."; }; + + persistentKeys = mkEnableOption '' + If enabled then keys will be generated once and Yggdrasil + will retain the same IPv6 address when the service is + restarted. Keys are stored at ${keysPath}. + ''; + }; }; - config = mkIf cfg.enable { - assertions = [ - { assertion = config.networking.enableIPv6; - message = "networking.enableIPv6 must be true for yggdrasil to work"; - } - ]; + config = mkIf cfg.enable (let binYggdrasil = cfg.package + "/bin/yggdrasil"; + in { + assertions = [{ + assertion = config.networking.enableIPv6; + message = "networking.enableIPv6 must be true for yggdrasil to work"; + }]; + + system.activationScripts.yggdrasil = mkIf cfg.persistentKeys '' + if [ ! -e ${keysPath} ] + then + mkdir -p ${builtins.dirOf keysPath} + ${binYggdrasil} -genconf -json \ + | ${pkgs.jq}/bin/jq \ + 'to_entries|map(select(.key|endswith("Key")))|from_entries' \ + > ${keysPath} + chmod 600 ${keysPath} + fi + ''; systemd.services.yggdrasil = { description = "Yggdrasil Network Service"; - path = [ cfg.package ] ++ optional (configProvided && configFileProvided) pkgs.jq; bindsTo = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - ${generateConfig} | yggdrasil -normaliseconf -useconf > /run/yggdrasil/yggdrasil.conf - ''; + preStart = + (if configProvided || configFileProvided || cfg.persistentKeys then + "echo " + + + (lib.optionalString configProvided + "'${builtins.toJSON cfg.config}'") + + (lib.optionalString configFileProvided "$(cat ${cfg.configFile})") + + (lib.optionalString cfg.persistentKeys "$(cat ${keysPath})") + + " | ${pkgs.jq}/bin/jq -s add | ${binYggdrasil} -normaliseconf -useconf" + else + "${binYggdrasil} -genconf") + " > /run/yggdrasil/yggdrasil.conf"; serviceConfig = { - ExecStart = "${cfg.package}/bin/yggdrasil -useconffile /run/yggdrasil/yggdrasil.conf"; + ExecStart = + "${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; Group = cfg.group; RuntimeDirectory = "yggdrasil"; RuntimeDirectoryMode = "0750"; - BindReadOnlyPaths = mkIf configFileProvided - [ "${cfg.configFile}" ]; + BindReadOnlyPaths = lib.optional configFileProvided cfg.configFile + ++ lib.optional cfg.persistentKeys keysPath; # TODO: as of yggdrasil 0.3.8 and systemd 243, yggdrasil fails # to set up the network adapter when DynamicUser is set. See @@ -191,6 +194,6 @@ in { # Make yggdrasilctl available on the command line. environment.systemPackages = [ cfg.package ]; - }; - meta.maintainers = with lib.maintainers; [ gazally ]; + }); + meta.maintainers = with lib.maintainers; [ gazally ehmry ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix b/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix index 8ece1ca190..cbac4ef05b 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix @@ -29,7 +29,6 @@ in type = types.package; default = pkgs.fprintd; defaultText = "pkgs.fprintd"; - example = "pkgs.fprintd-thinkpad"; description = '' fprintd package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix index 4ced5acd9b..f4118eb87f 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix @@ -207,6 +207,29 @@ in { Type = "simple"; ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}''; Restart = "on-failure"; + + AmbientCapabilities = ""; + CapabilityBoundingSet = "CAP_CHOWN CAP_FOWNER"; + DeviceAllow = "/dev/null rw"; + DevicePolicy = "strict"; + IPAddressDeny = "any"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelModules = true; + ProtectSystem = true; + ReadOnlyPaths = "-/"; + ReadWritePaths = "-/dev/shm -${dirOf cfg.auditFilePath} -/tmp -${dirOf cfg.ruleFile}"; + RestrictAddressFamilies = "AF_UNIX AF_NETLINK"; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "0077"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix index 39d1bf274b..c6a001d30e 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix @@ -67,9 +67,19 @@ in notificationsCommand = mkOption { type = types.nullOr types.str; default = null; - example = "sudo -u example_user DISPLAY=:0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus notify-send"; description = '' - Command used to send notifications. + This option is deprecated and ignored by earlyoom since 1.6. + Use instead. + ''; + }; + + enableNotifications = mkOption { + type = types.bool; + default = false; + description = '' + Send notifications about killed processes via the system d-bus. + To actually see the notifications in your GUI session, you need to have + systembus-notify running as your user. See README for details. ''; @@ -87,9 +97,13 @@ in message = "Both options in conjunction do not make sense"; } ]; + warnings = optional (ecfg.notificationsCommand != null) + "`services.earlyoom.notificationsCommand` is deprecated and ignored by earlyoom since 1.6."; + systemd.services.earlyoom = { description = "Early OOM Daemon for Linux"; wantedBy = [ "multi-user.target" ]; + path = optional ecfg.enableNotifications pkgs.dbus; serviceConfig = { StandardOutput = "null"; StandardError = "syslog"; @@ -100,10 +114,11 @@ in ${optionalString ecfg.useKernelOOMKiller "-k"} \ ${optionalString ecfg.ignoreOOMScoreAdjust "-i"} \ ${optionalString ecfg.enableDebugInfo "-d"} \ - ${optionalString (ecfg.notificationsCommand != null) - "-N ${escapeShellArg ecfg.notificationsCommand}"} + ${optionalString ecfg.enableNotifications "-n"} ''; }; }; + + environment.systemPackages = optional ecfg.enableNotifications pkgs.systembus-notify; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix new file mode 100644 index 0000000000..be57c03b17 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix @@ -0,0 +1,209 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + + cfg = config.services.rtorrent; + +in { + options.services.rtorrent = { + enable = mkEnableOption "rtorrent"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/rtorrent"; + description = '' + The directory where rtorrent stores its data files. + ''; + }; + + downloadDir = mkOption { + type = types.str; + default = "${cfg.dataDir}/download"; + description = '' + Where to put downloaded files. + ''; + }; + + user = mkOption { + type = types.str; + default = "rtorrent"; + description = '' + User account under which rtorrent runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "rtorrent"; + description = '' + Group under which rtorrent runs. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.rtorrent; + defaultText = "pkgs.rtorrent"; + description = '' + The rtorrent package to use. + ''; + }; + + port = mkOption { + type = types.port; + default = 50000; + description = '' + The rtorrent port. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the firewall for the port in . + ''; + }; + + rpcSocket = mkOption { + type = types.str; + readOnly = true; + default = "/run/rtorrent/rpc.sock"; + description = '' + RPC socket path. + ''; + }; + + configText = mkOption { + type = types.lines; + default = ""; + description = '' + The content of rtorrent.rc. The modernized configuration template with the values specified in this module will be prepended using mkBefore. You can use mkForce to overwrite the config completly. + ''; + }; + }; + + config = mkIf cfg.enable { + + users.groups = mkIf (cfg.group == "rtorrent") { + rtorrent = {}; + }; + + users.users = mkIf (cfg.user == "rtorrent") { + rtorrent = { + group = cfg.group; + shell = pkgs.bashInteractive; + home = cfg.dataDir; + description = "rtorrent Daemon user"; + isSystemUser = true; + }; + }; + + networking.firewall.allowedTCPPorts = mkIf (cfg.openFirewall) [ cfg.port ]; + + services.rtorrent.configText = mkBefore '' + # Instance layout (base paths) + method.insert = cfg.basedir, private|const|string, (cat,"${cfg.dataDir}/") + method.insert = cfg.watch, private|const|string, (cat,(cfg.basedir),"watch/") + method.insert = cfg.logs, private|const|string, (cat,(cfg.basedir),"log/") + method.insert = cfg.logfile, private|const|string, (cat,(cfg.logs),(system.time),".log") + method.insert = cfg.rpcsock, private|const|string, (cat,"${cfg.rpcSocket}") + + # Create instance directories + execute.throw = sh, -c, (cat, "mkdir -p ", (cfg.basedir), "/session ", (cfg.watch), " ", (cfg.logs)) + + # Listening port for incoming peer traffic (fixed; you can also randomize it) + network.port_range.set = ${toString cfg.port}-${toString cfg.port} + network.port_random.set = no + + # Tracker-less torrent and UDP tracker support + # (conservative settings for 'private' trackers, change for 'public') + dht.mode.set = disable + protocol.pex.set = no + trackers.use_udp.set = no + + # Peer settings + throttle.max_uploads.set = 100 + throttle.max_uploads.global.set = 250 + + throttle.min_peers.normal.set = 20 + throttle.max_peers.normal.set = 60 + throttle.min_peers.seed.set = 30 + throttle.max_peers.seed.set = 80 + trackers.numwant.set = 80 + + protocol.encryption.set = allow_incoming,try_outgoing,enable_retry + + # Limits for file handle resources, this is optimized for + # an `ulimit` of 1024 (a common default). You MUST leave + # a ceiling of handles reserved for rTorrent's internal needs! + network.http.max_open.set = 50 + network.max_open_files.set = 600 + network.max_open_sockets.set = 3000 + + # Memory resource usage (increase if you have a large number of items loaded, + # and/or the available resources to spend) + pieces.memory.max.set = 1800M + network.xmlrpc.size_limit.set = 4M + + # Basic operational settings (no need to change these) + session.path.set = (cat, (cfg.basedir), "session/") + directory.default.set = "${cfg.downloadDir}" + log.execute = (cat, (cfg.logs), "execute.log") + ##log.xmlrpc = (cat, (cfg.logs), "xmlrpc.log") + execute.nothrow = sh, -c, (cat, "echo >", (session.path), "rtorrent.pid", " ", (system.pid)) + + # Other operational settings (check & adapt) + encoding.add = utf8 + system.umask.set = 0027 + system.cwd.set = (cfg.basedir) + network.http.dns_cache_timeout.set = 25 + schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M)) + + # Watch directories (add more as you like, but use unique schedule names) + #schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent"))) + #schedule2 = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent"))) + + # Logging: + # Levels = critical error warn notice info debug + # Groups = connection_* dht_* peer_* rpc_* storage_* thread_* tracker_* torrent_* + print = (cat, "Logging to ", (cfg.logfile)) + log.open_file = "log", (cfg.logfile) + log.add_output = "info", "log" + ##log.add_output = "tracker_debug", "log" + + # XMLRPC + scgi_local = (cfg.rpcsock) + schedule = scgi_group,0,0,"execute.nothrow=chown,\":rtorrent\",(cfg.rpcsock)" + schedule = scgi_permission,0,0,"execute.nothrow=chmod,\"g+w,o=\",(cfg.rpcsock)" + ''; + + systemd = { + services = { + rtorrent = let + rtorrentConfigFile = pkgs.writeText "rtorrent.rc" cfg.configText; + in { + description = "rTorrent system service"; + after = [ "network.target" ]; + path = [ cfg.package pkgs.bash ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Type = "simple"; + Restart = "on-failure"; + WorkingDirectory = cfg.dataDir; + ExecStartPre=''${pkgs.bash}/bin/bash -c "if test -e ${cfg.dataDir}/session/rtorrent.lock && test -z $(${pkgs.procps}/bin/pidof rtorrent); then rm -f ${cfg.dataDir}/session/rtorrent.lock; fi"''; + ExecStart="${cfg.package}/bin/rtorrent -n -o system.daemon.set=true -o import=${rtorrentConfigFile}"; + RuntimeDirectory = "rtorrent"; + RuntimeDirectoryMode = 755; + }; + }; + }; + + tmpfiles.rules = [ "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} -" ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix index fd28b94f7b..e7f5aaed84 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix @@ -11,7 +11,7 @@ let downloadDir = "${homeDir}/Downloads"; incompleteDir = "${homeDir}/.incomplete"; - settingsDir = "${homeDir}/.config/transmission-daemon"; + settingsDir = "${homeDir}/config"; settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings); # for users in group "transmission" to have access to torrents @@ -20,12 +20,6 @@ let preStart = pkgs.writeScript "transmission-pre-start" '' #!${pkgs.runtimeShell} set -ex - for DIR in "${homeDir}" "${settingsDir}" "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"; do - mkdir -p "$DIR" - done - chmod 755 "${homeDir}" - chmod 700 "${settingsDir}" - chmod ${downloadDirPermissions} "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}" cp -f ${settingsFile} ${settingsDir}/settings.json ''; in @@ -110,6 +104,13 @@ in }; config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${homeDir}' 0770 '${cfg.user}' '${cfg.group}' - -" + "d '${settingsDir}' 0700 '${cfg.user}' '${cfg.group}' - -" + "d '${fullSettings.download-dir}' '${downloadDirPermissions}' '${cfg.user}' '${cfg.group}' - -" + "d '${fullSettings.incomplete-dir}' '${downloadDirPermissions}' '${cfg.user}' '${cfg.group}' - -" + ]; + systemd.services.transmission = { description = "Transmission BitTorrent Service"; after = [ "network.target" ] ++ optional apparmor "apparmor.service"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix new file mode 100644 index 0000000000..899582a203 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix @@ -0,0 +1,186 @@ +{ config, lib, pkgs, utils, ... }: + +let + inherit (lib) mkDefault mkEnableOption mkIf mkOption types literalExample; + cfg = config.services.engelsystem; +in { + options = { + services.engelsystem = { + enable = mkOption { + default = false; + example = true; + description = '' + Whether to enable engelsystem, an online tool for coordinating helpers + and shifts on large events. + ''; + type = lib.types.bool; + }; + + domain = mkOption { + type = types.str; + example = "engelsystem.example.com"; + description = "Domain to serve on."; + }; + + package = mkOption { + type = types.package; + example = literalExample "pkgs.engelsystem"; + description = "Engelsystem package used for the service."; + default = pkgs.engelsystem; + }; + + createDatabase = mkOption { + type = types.bool; + default = true; + description = '' + Whether to create a local database automatically. + This will override every database setting in . + ''; + }; + }; + + services.engelsystem.config = mkOption { + type = types.attrs; + default = { + database = { + host = "localhost"; + database = "engelsystem"; + username = "engelsystem"; + }; + }; + example = { + maintenance = false; + database = { + host = "database.example.com"; + database = "engelsystem"; + username = "engelsystem"; + password._secret = "/var/keys/engelsystem/database"; + }; + email = { + driver = "smtp"; + host = "smtp.example.com"; + port = 587; + from.address = "engelsystem@example.com"; + from.name = "example engelsystem"; + encryption = "tls"; + username = "engelsystem@example.com"; + password._secret = "/var/keys/engelsystem/mail"; + }; + autoarrive = true; + min_password_length = 6; + default_locale = "de_DE"; + }; + description = '' + Options to be added to config.php, as a nix attribute set. Options containing secret data + should be set to an attribute set containing the attribute _secret - a string pointing to a + file containing the value the option should be set to. See the example to get a better + picture of this: in the resulting config.php file, the email.password key will be set to + the contents of the /var/keys/engelsystem/mail file. + + See https://engelsystem.de/doc/admin/configuration/ for available options. + + Note that the admin user login credentials cannot be set here - they always default to + admin:asdfasdf. Log in and change them immediately. + ''; + }; + }; + + config = mkIf cfg.enable { + # create database + services.mysql = mkIf cfg.createDatabase { + enable = true; + package = mkDefault pkgs.mysql; + ensureUsers = [{ + name = "engelsystem"; + ensurePermissions = { "engelsystem.*" = "ALL PRIVILEGES"; }; + }]; + ensureDatabases = [ "engelsystem" ]; + }; + + environment.etc."engelsystem/config.php".source = + pkgs.writeText "config.php" '' + /etc/sogo/sogo.conf + '' else '' + cp /etc/sogo/sogo.conf.raw /etc/sogo/sogo.conf + ''} + ''; + +in { + options.services.sogo = with types; { + enable = mkEnableOption "SOGo groupware"; + + vhostName = mkOption { + description = "Name of the nginx vhost"; + type = str; + default = "sogo"; + }; + + timezone = mkOption { + description = "Timezone of your SOGo instance"; + type = str; + example = "America/Montreal"; + }; + + language = mkOption { + description = "Language of SOGo"; + type = str; + default = "English"; + }; + + ealarmsCredFile = mkOption { + description = "Optional path to a credentials file for email alarms"; + type = nullOr str; + default = null; + }; + + configReplaces = mkOption { + description = '' + Replacement-filepath mapping for sogo.conf. + Every key is replaced with the contents of the file specified as value. + + In the example, every occurence of LDAP_BINDPW will be replaced with the text of the + specified file. + ''; + type = attrsOf str; + default = {}; + example = { + LDAP_BINDPW = "/var/lib/secrets/sogo/ldappw"; + }; + }; + + extraConfig = mkOption { + description = "Extra sogo.conf configuration lines"; + type = lines; + default = ""; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.sogo ]; + + environment.etc."sogo/sogo.conf.raw".text = '' + { + // Mandatory parameters + SOGoTimeZone = "${cfg.timezone}"; + SOGoLanguage = "${cfg.language}"; + // Paths + WOSendMail = "/run/wrappers/bin/sendmail"; + SOGoMailSpoolPath = "/var/lib/sogo/spool"; + SOGoZipPath = "${pkgs.zip}/bin/zip"; + // Enable CSRF protection + SOGoXSRFValidationEnabled = YES; + // Remove dates from log (jornald does that) + NGLogDefaultLogEventFormatterClass = "NGLogEventFormatter"; + // Extra config + ${cfg.extraConfig} + } + ''; + + systemd.services.sogo = { + description = "SOGo groupware"; + after = [ "postgresql.service" "mysql.service" "memcached.service" "openldap.service" "dovecot2.service" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."sogo/sogo.conf.raw".source ]; + + environment.LDAPTLS_CACERT = "/etc/ssl/certs/ca-certificates.crt"; + + serviceConfig = { + Type = "forking"; + ExecStartPre = "+" + preStart + "/bin/sogo-prestart"; + ExecStart = "${pkgs.sogo}/bin/sogod -WOLogFile - -WOPidFile /run/sogo/sogo.pid"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + RuntimeDirectory = "sogo"; + StateDirectory = "sogo/spool"; + + User = "sogo"; + Group = "sogo"; + + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + PrivateUsers = true; + MemoryDenyWriteExecute = true; + SystemCallFilter = "@basic-io @file-system @network-io @system-service @timer"; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + }; + }; + + systemd.services.sogo-tmpwatch = { + description = "SOGo tmpwatch"; + + startAt = [ "hourly" ]; + script = '' + SOGOSPOOL=/var/lib/sogo/spool + + find "$SOGOSPOOL" -type f -user sogo -atime +23 -delete > /dev/null + find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null + ''; + + serviceConfig = { + Type = "oneshot"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + StateDirectory = "sogo/spool"; + + User = "sogo"; + Group = "sogo"; + + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + PrivateUsers = true; + PrivateNetwork = true; + SystemCallFilter = "@basic-io @file-system @system-service"; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = ""; + }; + }; + + systemd.services.sogo-ealarms = { + description = "SOGo email alarms"; + + after = [ "postgresql.service" "mysqld.service" "memcached.service" "openldap.service" "dovecot2.service" "sogo.service" ]; + restartTriggers = [ config.environment.etc."sogo/sogo.conf.raw".source ]; + + startAt = [ "minutely" ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.sogo}/bin/sogo-ealarms-notify${optionalString (cfg.ealarmsCredFile != null) " -p ${cfg.ealarmsCredFile}"}"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + StateDirectory = "sogo/spool"; + + User = "sogo"; + Group = "sogo"; + + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + + LockPersonality = true; + RestrictRealtime = true; + PrivateMounts = true; + PrivateUsers = true; + MemoryDenyWriteExecute = true; + SystemCallFilter = "@basic-io @file-system @network-io @system-service"; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + }; + }; + + # nginx vhost + services.nginx.virtualHosts."${cfg.vhostName}" = { + locations."/".extraConfig = '' + rewrite ^ https://$server_name/SOGo; + allow all; + ''; + + # For iOS 7 + locations."/principals/".extraConfig = '' + rewrite ^ https://$server_name/SOGo/dav; + allow all; + ''; + + locations."^~/SOGo".extraConfig = '' + proxy_pass http://127.0.0.1:20000; + proxy_redirect http://127.0.0.1:20000 default; + + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header x-webobjects-server-protocol HTTP/1.0; + proxy_set_header x-webobjects-remote-host 127.0.0.1; + proxy_set_header x-webobjects-server-port $server_port; + proxy_set_header x-webobjects-server-name $server_name; + proxy_set_header x-webobjects-server-url $scheme://$host; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffer_size 4k; + proxy_buffers 4 32k; + proxy_busy_buffers_size 64k; + proxy_temp_file_write_size 64k; + client_max_body_size 50m; + client_body_buffer_size 128k; + break; + ''; + + locations."/SOGo.woa/WebServerResources/".extraConfig = '' + alias ${pkgs.sogo}/lib/GNUstep/SOGo/WebServerResources/; + allow all; + ''; + + locations."/SOGo/WebServerResources/".extraConfig = '' + alias ${pkgs.sogo}/lib/GNUstep/SOGo/WebServerResources/; + allow all; + ''; + + locations."~ ^/SOGo/so/ControlPanel/Products/([^/]*)/Resources/(.*)$".extraConfig = '' + alias ${pkgs.sogo}/lib/GNUstep/SOGo/$1.SOGo/Resources/$2; + ''; + + locations."~ ^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\\.(jpg|png|gif|css|js)$".extraConfig = '' + alias ${pkgs.sogo}/lib/GNUstep/SOGo/$1.SOGo/Resources/$2; + ''; + }; + + # User and group + users.groups.sogo = {}; + users.users.sogo = { + group = "sogo"; + isSystemUser = true; + description = "SOGo service user"; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix index b92e344989..2ea9537b93 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix @@ -631,9 +631,12 @@ let serviceConfig = { User = "${cfg.user}"; Group = "tt_rss"; - ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon"; + ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon --quiet"; StandardOutput = "syslog"; StandardError = "syslog"; + Restart = "on-failure"; + RestartSec = "60"; + SyslogIdentifier = "tt-rss"; }; wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 312d2b0a21..8a015bb355 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -756,9 +756,9 @@ in serviceConfig.Type = "oneshot"; serviceConfig.TimeoutSec = 60; script = '' - if ${pkgs.systemd}/bin/systemctl -q is-active nginx.service ; then + if /run/current-system/systemd/bin/systemctl -q is-active nginx.service ; then ${execCommand} -t && \ - ${pkgs.systemd}/bin/systemctl reload nginx.service + /run/current-system/systemd/bin/systemctl reload nginx.service fi ''; serviceConfig.RemainAfterExit = true; @@ -772,7 +772,7 @@ in webroot = vhostConfig.acmeRoot; extraDomains = genAttrs vhostConfig.serverAliases (alias: null); postRun = '' - systemctl reload nginx + /run/current-system/systemd/bin/systemctl reload nginx ''; }; }) acmeEnabledVhosts; in diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix index 4b74c329e3..936e211ec7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix @@ -79,7 +79,25 @@ in { }; instance = mkOption { - type = types.attrs; + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + (lazyAttrsOf valueType) + (listOf valueType) + (mkOptionType { + name = "function"; + description = "function"; + check = x: isFunction x; + merge = mergeOneOption; + }) + ]) // { + description = "Json value or lambda"; + emptyValue.value = {}; + }; + in valueType; default = { type = "normal"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix index c1b6d3bf06..2d9504fb5f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix @@ -8,9 +8,26 @@ let in { options.services.xserver.desktopManager.cde = { enable = mkEnableOption "Common Desktop Environment"; + + extraPackages = mkOption { + type = with types; listOf package; + default = with pkgs.xorg; [ + xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud + ]; + example = literalExample '' + with pkgs.xorg; [ + xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud + ] + ''; + description = '' + Extra packages to be installed system wide. + ''; + }; }; config = mkIf (xcfg.enable && cfg.enable) { + environment.systemPackages = cfg.extraPackages; + services.rpcbind.enable = true; services.xinetd.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix index ea6aac9f6c..5d3a84d713 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix - ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix + ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 1690a7d51a..3a7ab64510 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -32,15 +32,14 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ - e.efl e.enlightenment - e.terminology e.econnman - pkgs.xorg.xauth # used by kdesu - pkgs.gtk2 # To get GTK's themes. - pkgs.tango-icon-theme - - pkgs.gnome-icon-theme - pkgs.xorg.xcursorthemes + environment.systemPackages = with pkgs; [ + enlightenment.econnman + enlightenment.efl + enlightenment.enlightenment + enlightenment.ephoto + enlightenment.rage + enlightenment.terminology + xorg.xcursorthemes ]; environment.pathsToLink = [ @@ -50,11 +49,10 @@ in "/share/locale" ]; - services.xserver.desktopManager.session = [ - { name = "Enlightenment"; - start = '' - export XDG_MENU_PREFIX=e- + services.xserver.displayManager.sessionPackages = [ pkgs.enlightenment.enlightenment ]; + services.xserver.displayManager.sessionCommands = '' + if test "$XDG_CURRENT_DESKTOP" = "Enlightenment"; then export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}" # make available for D-BUS user services @@ -62,12 +60,15 @@ in # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update + fi + ''; - exec ${e.enlightenment}/bin/enlightenment_start - ''; - }]; - - security.wrappers = (import "${e.enlightenment}/e-wrappers.nix").security.wrappers; + # Wrappers for programs installed by enlightenment that should be setuid + security.wrappers = { + enlightenment_ckpasswd.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd"; + enlightenment_sys.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys"; + enlightenment_system.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system"; + }; environment.etc."X11/xkb".source = xcfg.xkbDir; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix index 2224bcd5a2..419f5055d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -23,12 +23,9 @@ in config = mkIf cfg.enable { - services.xserver.desktopManager.session = singleton { - name = "lumina"; - start = '' - exec ${pkgs.lumina.lumina}/bin/start-lumina-desktop - ''; - }; + services.xserver.displayManager.sessionPackages = [ + pkgs.lumina.lumina + ]; environment.systemPackages = pkgs.lumina.preRequisitePackages ++ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix deleted file mode 100644 index 1c04104df4..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/maxx.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.maxx; -in { - options.services.xserver.desktopManager.maxx = { - enable = mkEnableOption "MaXX desktop environment"; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.maxx ]; - - # there is hardcoded path in binaries - system.activationScripts.setup-maxx = '' - mkdir -p /opt - ln -sfn ${pkgs.maxx}/opt/MaXX /opt - ''; - - services.xserver.desktopManager.session = [ - { name = "MaXX"; - start = '' - exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt - ''; - }]; - }; - - meta.maintainers = [ maintainers.gnidorah ]; -} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 60ef0159ff..6d48b899d2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -158,6 +158,19 @@ in example = "vlc"; description = "Phonon audio backend to install."; }; + + supportDDC = mkOption { + type = types.bool; + default = false; + description = '' + Support setting monitor brightness via DDC. + + + This is not needed for controlling brightness of the internal monitor + of a laptop and as it is considered experimental by upstream, it is + disabled by default. + ''; + }; }; }; @@ -184,6 +197,12 @@ in }; }; + # DDC support + boot.kernelModules = lib.optional cfg.supportDDC "i2c_dev"; + services.udev.extraRules = lib.optionalString cfg.supportDDC '' + KERNEL=="i2c-[0-9]*", TAG+="uaccess" + ''; + environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; [ frameworkintegration diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index 2a7a19e769..aa6a5ec42b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -39,7 +39,8 @@ let ${optionalString cfg.startDbusSession '' if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$@" + /run/current-system/systemd/bin/systemctl --user start dbus.socket + export `/run/current-system/systemd/bin/systemctl --user show-environment | grep '^DBUS_SESSION_BUS_ADDRESS'` fi ''} @@ -59,7 +60,7 @@ let # # Also tell systemd about the dbus session bus address. # This is required by user units using the session bus. - ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS + /run/current-system/systemd/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS # Load X defaults. This should probably be safe on wayland too. ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} @@ -88,7 +89,7 @@ let fi # Start systemd user services for graphical sessions - ${config.systemd.package}/bin/systemctl --user start graphical-session.target + /run/current-system/systemd/bin/systemctl --user start graphical-session.target # Allow the user to setup a custom session type. if test -x ~/.xsession; then @@ -393,7 +394,7 @@ in test -n "$waitPID" && wait "$waitPID" - ${config.systemd.package}/bin/systemctl --user stop graphical-session.target + /run/current-system/systemd/bin/systemctl --user stop graphical-session.target exit 0 ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index 4224c557ed..2f42271da8 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -30,8 +30,8 @@ let cfgFile = pkgs.writeText "sddm.conf" '' [General] - HaltCommand=${pkgs.systemd}/bin/systemctl poweroff - RebootCommand=${pkgs.systemd}/bin/systemctl reboot + HaltCommand=/run/current-system/systemd/bin/systemctl poweroff + RebootCommand=/run/current-system/systemd/bin/systemctl reboot ${optionalString cfg.autoNumlock '' Numlock=on ''} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix b/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix index 3e03131ca1..5ce08fce7c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix @@ -66,7 +66,7 @@ in killer = mkOption { default = null; # default according to `man xautolock` is none - example = "${pkgs.systemd}/bin/systemctl suspend"; + example = "/run/current-system/systemd/bin/systemctl suspend"; type = types.nullOr types.str; description = '' diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index a677ab4cb7..9eeae0c3ef 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -268,9 +268,10 @@ in { mkdir -p -m 0755 /run/binfmt ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ''; - systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) - [ "proc-sys-fs-binfmt_misc.automount" - "proc-sys-fs-binfmt_misc.mount" - ]; + systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 7c4dc93e2f..99892a2811 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -164,7 +164,6 @@ let "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" - "systemd-binfmt.service" "systemd-exit.service" "systemd-update-done.service" ] ++ optionals config.services.journald.enableHttpGateway [ @@ -1056,7 +1055,6 @@ in systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; - systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; systemd.services.systemd-importd.environment = proxy_env; # Don't bother with certain units in containers. diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 43347161a8..71eed4d6f1 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -433,7 +433,16 @@ in services.zfs.zed.settings = { ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; - PATH = lib.makeBinPath [ packages.zfsUser pkgs.utillinux pkgs.gawk pkgs.gnused pkgs.gnugrep pkgs.coreutils pkgs.curl ]; + PATH = lib.makeBinPath [ + packages.zfsUser + pkgs.coreutils + pkgs.curl + pkgs.gawk + pkgs.gnugrep + pkgs.gnused + pkgs.nettools + pkgs.utillinux + ]; }; environment.etc = genAttrs diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix index 9720d90217..d895c58bab 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix @@ -54,7 +54,16 @@ let }; normalConfig = { - + systemd.network.links = let + createNetworkLink = i: nameValuePair "40-${i.name}" { + matchConfig.OriginalName = i.name; + linkConfig = optionalAttrs (i.macAddress != null) { + MACAddress = i.macAddress; + } // optionalAttrs (i.mtu != null) { + MTUBytes = toString i.mtu; + }; + }; + in listToAttrs (map createNetworkLink interfaces); systemd.services = let @@ -164,7 +173,6 @@ let { description = "Address configuration of ${i.name}"; wantedBy = [ "network-setup.service" - "network-link-${i.name}.service" "network.target" ]; # order before network-setup because the routes that are configured @@ -183,6 +191,8 @@ let state="/run/nixos/network/addresses/${i.name}" mkdir -p $(dirname "$state") + ip link set "${i.name}" up + ${flip concatMapStrings ips (ip: let cidr = "${ip.address}/${toString ip.prefixLength}"; @@ -237,38 +247,6 @@ let ''; }; - createNetworkLink = i: - let - deviceDependency = if (config.boot.isContainer || i.name == "lo") - then [] - else [ (subsystemDevice i.name) ]; - in - nameValuePair "network-link-${i.name}" - { description = "Link configuration of ${i.name}"; - wantedBy = [ "network-interfaces.target" ]; - before = [ "network-interfaces.target" ]; - bindsTo = deviceDependency; - after = [ "network-pre.target" ] ++ deviceDependency; - path = [ pkgs.iproute ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - script = - '' - echo "Configuring link..." - '' + optionalString (i.macAddress != null) '' - echo "setting MAC address to ${i.macAddress}..." - ip link set "${i.name}" address "${i.macAddress}" - '' + optionalString (i.mtu != null) '' - echo "setting MTU to ${toString i.mtu}..." - ip link set "${i.name}" mtu "${toString i.mtu}" - '' + '' - echo -n "bringing up interface... " - ip link set "${i.name}" up && echo "done" || (echo "failed"; exit 1) - ''; - }; - createTunDevice = i: nameValuePair "${i.name}-netdev" { description = "Virtual Network Interface ${i.name}"; bindsTo = [ "dev-net-tun.device" ]; @@ -298,7 +276,7 @@ let bindsTo = deps ++ optional v.rstp "mstpd.service"; partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service"; after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service" - ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; + ++ map (i: "network-addresses-${i}.service") v.interfaces; before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; @@ -327,7 +305,7 @@ let # if `libvirtd.service` is not running, do not use `virsh` which would try activate it via 'libvirtd.socket' and thus start it out-of-order. # `libvirtd.service` will set up bridge interfaces when it will start normally. # - if ${pkgs.systemd}/bin/systemctl --quiet is-active 'libvirtd.service'; then + if /run/current-system/systemd/bin/systemctl --quiet is-active 'libvirtd.service'; then for uri in qemu:///system lxc:///; do for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ @@ -375,7 +353,7 @@ let createVswitchDevice = n: v: nameValuePair "${n}-netdev" (let deps = concatLists (map deviceDependency (attrNames (filterAttrs (_: config: config.type != "internal") v.interfaces))); - internalConfigs = concatMap (i: ["network-link-${i}.service" "network-addresses-${i}.service"]) (attrNames (filterAttrs (_: config: config.type == "internal") v.interfaces)); + internalConfigs = map (i: "network-addresses-${i}.service") (attrNames (filterAttrs (_: config: config.type == "internal") v.interfaces)); ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules; in { description = "Open vSwitch Interface ${n}"; @@ -427,7 +405,7 @@ let bindsTo = deps; partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps - ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; + ++ map (i: "network-addresses-${i}.service") v.interfaces; before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; @@ -540,7 +518,6 @@ let }); in listToAttrs ( - map createNetworkLink interfaces ++ map configureAddrs interfaces ++ map createTunDevice (filter (i: i.virtual) interfaces)) // mapAttrs' createBridgeDevice cfg.bridges diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 44677d417e..12cff6b038 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -376,10 +376,20 @@ in networking.hostName = mkOption { default = "nixos"; - type = types.str; + # Only allow hostnames without the domain name part (i.e. no FQDNs, see + # e.g. "man 5 hostname") and require valid DNS labels (recommended + # syntax). Note: We also allow underscores for compatibility/legacy + # reasons (as undocumented feature): + type = types.strMatching + "^[[:alpha:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$"; description = '' - The name of the machine. Leave it empty if you want to obtain - it from a DHCP server (if using DHCP). + The name of the machine. Leave it empty if you want to obtain it from a + DHCP server (if using DHCP). The hostname must be a valid DNS label (see + RFC 1035 section 2.3.1: "Preferred name syntax") and as such must not + contain the domain part. This means that the hostname must start with a + letter, end with a letter or digit, and have as interior characters only + letters, digits, and hyphen. The maximum length is 63 characters. + Additionally it is recommended to only use lower-case characters. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix b/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix index 036b1036f9..e85482af83 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix @@ -48,7 +48,7 @@ let provisionedHook = pkgs.writeScript "provisioned-hook" '' #!${pkgs.runtimeShell} - ${config.systemd.package}/bin/systemctl start provisioned.target + /run/current-system/systemd/bin/systemctl start provisioned.target ''; in diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix index 2af4214302..f267c97b17 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.virtualisation.cri-o; + crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); + # Copy configuration files to avoid having the entire sources in the system closure copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' cp ${filePath} $out @@ -23,55 +25,90 @@ in enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)"; storageDriver = mkOption { - type = types.enum ["btrfs" "overlay" "vfs"]; + type = types.enum [ "btrfs" "overlay" "vfs" ]; default = "overlay"; description = "Storage driver to be used"; }; logLevel = mkOption { - type = types.enum ["trace" "debug" "info" "warn" "error" "fatal"]; + type = types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ]; default = "info"; description = "Log level to be used"; }; pauseImage = mkOption { - type = types.str; - default = "k8s.gcr.io/pause:3.1"; - description = "Pause image for pod sandboxes to be used"; + type = types.nullOr types.str; + default = null; + description = "Override the default pause image for pod sandboxes"; + example = [ "k8s.gcr.io/pause:3.2" ]; }; pauseCommand = mkOption { - type = types.str; - default = "/pause"; - description = "Pause command to be executed"; + type = types.nullOr types.str; + default = null; + description = "Override the default pause command"; + example = [ "/pause" ]; + }; + + runtime = mkOption { + type = types.nullOr types.str; + default = null; + description = "Override the default runtime"; + example = [ "crun" ]; + }; + + extraPackages = mkOption { + type = with types; listOf package; + default = [ ]; + example = lib.literalExample '' + [ + pkgs.gvisor + ] + ''; + description = '' + Extra packages to be installed in the CRI-O wrapper. + ''; + }; + + package = lib.mkOption { + type = types.package; + default = crioPackage; + internal = true; + description = '' + The final CRI-O package (including extra packages). + ''; }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; - [ cri-o cri-tools conmon iptables runc utillinux ]; + environment.systemPackages = [ cfg.package pkgs.cri-tools ]; - environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o.src}/crictl.yaml"; + environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; environment.etc."crio/crio.conf".text = '' [crio] storage_driver = "${cfg.storageDriver}" [crio.image] - pause_image = "${cfg.pauseImage}" - pause_command = "${cfg.pauseCommand}" + ${optionalString (cfg.pauseImage != null) ''pause_image = "${cfg.pauseImage}"''} + ${optionalString (cfg.pauseCommand != null) ''pause_command = "${cfg.pauseCommand}"''} [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] - network_dir = "/etc/cni/net.d/" [crio.runtime] - conmon = "${pkgs.conmon}/bin/conmon" + cgroup_manager = "systemd" log_level = "${cfg.logLevel}" - manage_network_ns_lifecycle = true + manage_ns_lifecycle = true + + ${optionalString (cfg.runtime != null) '' + default_runtime = "${cfg.runtime}" + [crio.runtime.runtimes] + [crio.runtime.runtimes.${cfg.runtime}] + ''} ''; - environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; @@ -81,10 +118,10 @@ in documentation = [ "https://github.com/cri-o/cri-o" ]; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - path = [ pkgs.utillinux pkgs.runc pkgs.iptables ]; + path = [ cfg.package ]; serviceConfig = { Type = "notify"; - ExecStart = "${pkgs.cri-o}/bin/crio"; + ExecStart = "${cfg.package}/bin/crio"; ExecReload = "/bin/kill -s HUP $MAINPID"; TasksMax = "infinity"; LimitNOFILE = "1048576"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-image.nix index be2f12b7d0..fabc9113df 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-image.nix @@ -37,6 +37,7 @@ in { name = cfg.vmDerivationName; postVM = '' ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=dynamic -O vhdx $diskImage $out/${cfg.vmFileName} + rm $diskImage ''; format = "raw"; diskSize = cfg.baseImageSize; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/rkt.nix b/third_party/nixpkgs/nixos/modules/virtualisation/rkt.nix deleted file mode 100644 index fd662b52df..0000000000 --- a/third_party/nixpkgs/nixos/modules/virtualisation/rkt.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.virtualisation.rkt; -in -{ - options.virtualisation.rkt = { - enable = mkEnableOption "rkt metadata service"; - - gc = { - automatic = mkOption { - default = true; - type = types.bool; - description = "Automatically run the garbage collector at a specific time."; - }; - - dates = mkOption { - default = "03:15"; - type = types.str; - description = '' - Specification (in the format described by - systemd.time - 7) of the time at - which the garbage collector will run. - ''; - }; - - options = mkOption { - default = "--grace-period=24h"; - type = types.str; - description = '' - Options given to rkt gc when the - garbage collector is run automatically. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.rkt ]; - - systemd.services.rkt = { - description = "rkt metadata service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${pkgs.rkt}/bin/rkt metadata-service"; - }; - }; - - systemd.services.rkt-gc = { - description = "rkt garbage collection"; - startAt = optionalString cfg.gc.automatic cfg.gc.dates; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}"; - }; - }; - - users.groups.rkt = {}; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/vmware-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/vmware-image.nix new file mode 100644 index 0000000000..9da9e145f7 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/vmware-image.nix @@ -0,0 +1,90 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + boolToStr = value: if value then "on" else "off"; + cfg = config.vmware; + + subformats = [ + "monolithicSparse" + "monolithicFlat" + "twoGbMaxExtentSparse" + "twoGbMaxExtentFlat" + "streamOptimized" + ]; + +in { + options = { + vmware = { + baseImageSize = mkOption { + type = types.int; + default = 2048; + description = '' + The size of the VMWare base image in MiB. + ''; + }; + vmDerivationName = mkOption { + type = types.str; + default = "nixos-vmware-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; + description = '' + The name of the derivation for the VMWare appliance. + ''; + }; + vmFileName = mkOption { + type = types.str; + default = "nixos-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.vmdk"; + description = '' + The file name of the VMWare appliance. + ''; + }; + vmSubformat = mkOption { + type = types.enum subformats; + default = "monolithicSparse"; + description = "Specifies which VMDK subformat to use."; + }; + vmCompat6 = mkOption { + type = types.bool; + default = false; + example = true; + description = "Create a VMDK version 6 image (instead of version 4)."; + }; + }; + }; + + config = { + system.build.vmwareImage = import ../../lib/make-disk-image.nix { + name = cfg.vmDerivationName; + postVM = '' + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o compat6=${boolToStr cfg.vmCompat6},subformat=${cfg.vmSubformat} -O vmdk $diskImage $out/${cfg.vmFileName} + rm $diskImage + ''; + format = "raw"; + diskSize = cfg.baseImageSize; + partitionTableType = "efi"; + inherit config lib pkgs; + }; + + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + + boot.growPartition = true; + + boot.loader.grub = { + version = 2; + device = "nodev"; + efiSupport = true; + efiInstallAsRemovable = true; + }; + + virtualisation.vmware.guest.enable = true; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 5caf1c958f..796c626f3d 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -27,6 +27,7 @@ in atd = handleTest ./atd.nix {}; avahi = handleTest ./avahi.nix {}; babeld = handleTest ./babeld.nix {}; + bazarr = handleTest ./bazarr.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 beanstalkd = handleTest ./beanstalkd.nix {}; bees = handleTest ./bees.nix {}; @@ -69,6 +70,7 @@ in deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; + dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {}; doas = handleTest ./doas.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; @@ -86,8 +88,10 @@ in ecryptfs = handleTest ./ecryptfs.nix {}; ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; + engelsystem = handleTest ./engelsystem.nix {}; enlightenment = handleTest ./enlightenment.nix {}; env = handleTest ./env.nix {}; + ergo = handleTest ./ergo.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; fancontrol = handleTest ./fancontrol.nix {}; @@ -132,6 +136,7 @@ in hitch = handleTest ./hitch {}; hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; home-assistant = handleTest ./home-assistant.nix {}; + hostname = handleTest ./hostname.nix {}; hound = handleTest ./hound.nix {}; hydra = handleTest ./hydra {}; hydra-db-migration = handleTest ./hydra/db-migration.nix {}; @@ -292,6 +297,7 @@ in slurm = handleTest ./slurm.nix {}; smokeping = handleTest ./smokeping.nix {}; snapper = handleTest ./snapper.nix {}; + sogo = handleTest ./sogo.nix {}; solr = handleTest ./solr.nix {}; spacecookie = handleTest ./spacecookie.nix {}; spike = handleTest ./spike.nix {}; @@ -304,6 +310,7 @@ in syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-analyze = handleTest ./systemd-analyze.nix {}; + systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; systemd-boot = handleTestOn ["x86_64-linux"] ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; @@ -334,10 +341,7 @@ in vault = handleTest ./vault.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; - wg-quick = handleTest ./wireguard/wg-quick.nix {}; wireguard = handleTest ./wireguard {}; - wireguard-generated = handleTest ./wireguard/generated.nix {}; - wireguard-namespaces = handleTest ./wireguard/namespaces.nix {}; wordpress = handleTest ./wordpress.nix {}; xandikos = handleTest ./xandikos.nix {}; xautolock = handleTest ./xautolock.nix {}; @@ -348,6 +352,7 @@ in yabar = handleTest ./yabar.nix {}; yggdrasil = handleTest ./yggdrasil.nix {}; zfs = handleTest ./zfs.nix {}; - zsh-history = handleTest ./zsh-history.nix {}; + zoneminder = handleTest ./zoneminder.nix {}; zookeeper = handleTest ./zookeeper.nix {}; + zsh-history = handleTest ./zsh-history.nix {}; } diff --git a/third_party/nixpkgs/nixos/tests/bazarr.nix b/third_party/nixpkgs/nixos/tests/bazarr.nix new file mode 100644 index 0000000000..b8cd8ef38b --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/bazarr.nix @@ -0,0 +1,26 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +let + port = 42069; +in +{ + name = "bazarr"; + meta.maintainers = with maintainers; [ xwvvvvwx ]; + + nodes.machine = + { pkgs, ... }: + { + services.bazarr = { + enable = true; + listenPort = port; + }; + }; + + testScript = '' + machine.wait_for_unit("bazarr.service") + machine.wait_for_open_port("${toString port}") + machine.succeed("curl --fail http://localhost:${toString port}/") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix new file mode 100644 index 0000000000..1dc925f4de --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix @@ -0,0 +1,71 @@ +import ../make-test-python.nix ({ pkgs, ... }: { + name = "dnscrypt-wrapper"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + nodes = { + server = { lib, ... }: + { services.dnscrypt-wrapper = with builtins; + { enable = true; + address = "192.168.1.1"; + keys.expiration = 5; # days + keys.checkInterval = 2; # min + # The keypair was generated by the command: + # dnscrypt-wrapper --gen-provider-keypair \ + # --provider-name=2.dnscrypt-cert.server \ + # --ext-address=192.168.1.1:5353 + providerKey.public = toFile "public.key" (readFile ./public.key); + providerKey.secret = toFile "secret.key" (readFile ./secret.key); + }; + services.tinydns.enable = true; + services.tinydns.data = '' + ..:192.168.1.1:a + +it.works:1.2.3.4 + ''; + networking.firewall.allowedUDPPorts = [ 5353 ]; + networking.firewall.allowedTCPPorts = [ 5353 ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce + [ { address = "192.168.1.1"; prefixLength = 24; } ]; + }; + + client = { lib, ... }: + { services.dnscrypt-proxy2.enable = true; + services.dnscrypt-proxy2.settings = { + server_names = [ "server" ]; + static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg"; + }; + networking.nameservers = [ "127.0.0.1" ]; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce + [ { address = "192.168.1.2"; prefixLength = 24; } ]; + }; + + }; + + testScript = '' + start_all() + + with subtest("The server can generate the ephemeral keypair"): + server.wait_for_unit("dnscrypt-wrapper") + server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.key") + server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.crt") + + with subtest("The client can connect to the server"): + server.wait_for_unit("tinydns") + client.wait_for_unit("dnscrypt-proxy2") + assert "1.2.3.4" in client.succeed( + "host it.works" + ), "The IP address of 'it.works' does not match 1.2.3.4" + + with subtest("The server rotates the ephemeral keys"): + # advance time by a little less than 5 days + server.succeed("date -s \"$(date --date '4 days 6 hours')\"") + client.succeed("date -s \"$(date --date '4 days 6 hours')\"") + server.wait_for_file("/var/lib/dnscrypt-wrapper/oldkeys") + + with subtest("The client can still connect to the server"): + server.wait_for_unit("dnscrypt-wrapper") + client.succeed("host it.works") + ''; +}) + diff --git a/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/public.key b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/public.key new file mode 100644 index 0000000000..80232b97f5 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/public.key @@ -0,0 +1 @@ +A:B ;o4S @] \ No newline at end of file diff --git a/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/secret.key b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/secret.key new file mode 100644 index 0000000000..01fbf8e08b --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/secret.key @@ -0,0 +1 @@ +G>Ʃ>(J=lA:B ;o4S @] \ No newline at end of file diff --git a/third_party/nixpkgs/nixos/tests/engelsystem.nix b/third_party/nixpkgs/nixos/tests/engelsystem.nix new file mode 100644 index 0000000000..39c1071809 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/engelsystem.nix @@ -0,0 +1,41 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "engelsystem"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ talyz ]; + }; + + nodes.engelsystem = + { ... }: + { + services.engelsystem = { + enable = true; + domain = "engelsystem"; + createDatabase = true; + }; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + environment.systemPackages = with pkgs; [ + xmlstarlet + libxml2 + ]; + }; + + testScript = '' + engelsystem.start() + engelsystem.wait_for_unit("phpfpm-engelsystem.service") + engelsystem.wait_until_succeeds("curl engelsystem/login -sS -f") + engelsystem.succeed( + "curl engelsystem/login -sS -f -c cookie | xmllint -html -xmlout - >login" + ) + engelsystem.succeed( + "xml sel -T -t -m \"html/head/meta[@name='csrf-token']\" -v @content login >token" + ) + engelsystem.succeed( + "curl engelsystem/login -sS -f -b cookie -F 'login=admin' -F 'password=asdfasdf' -F '_token=news" + ) + engelsystem.succeed( + "test 'News - Engelsystem' = \"$(xml sel -T -t -c html/head/title news)\"" + ) + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/enlightenment.nix b/third_party/nixpkgs/nixos/tests/enlightenment.nix index 5fa8d765dd..0132b98b1c 100644 --- a/third_party/nixpkgs/nixos/tests/enlightenment.nix +++ b/third_party/nixpkgs/nixos/tests/enlightenment.nix @@ -41,28 +41,24 @@ import ./make-test-python.nix ({ pkgs, ...} : with subtest("First time wizard"): machine.wait_for_text("Default") # Language - machine.succeed("xdotool mousemove 512 185 click 1") # Default Language machine.screenshot("wizard1") machine.succeed("xdotool mousemove 512 740 click 1") # Next + machine.screenshot("wizard2") machine.wait_for_text("English") # Keyboard (default) - machine.screenshot("wizard2") - machine.succeed("xdotool mousemove 512 740 click 1") # Next - - machine.wait_for_text("Standard") # Profile (default) machine.screenshot("wizard3") machine.succeed("xdotool mousemove 512 740 click 1") # Next - machine.wait_for_text("Title") # Sizing (default) + machine.wait_for_text("Standard") # Profile (default) machine.screenshot("wizard4") machine.succeed("xdotool mousemove 512 740 click 1") # Next - machine.wait_for_text("clicked") # Windows Phocus - machine.succeed("xdotool mousemove 512 370 click 1") # Click + machine.wait_for_text("Title") # Sizing (default) machine.screenshot("wizard5") machine.succeed("xdotool mousemove 512 740 click 1") # Next - machine.wait_for_text("bindings") # Mouse Modifiers (default) + machine.wait_for_text("clicked") # Windows Focus + machine.succeed("xdotool mousemove 512 370 click 1") # Click machine.screenshot("wizard6") machine.succeed("xdotool mousemove 512 740 click 1") # Next @@ -74,7 +70,7 @@ import ./make-test-python.nix ({ pkgs, ...} : machine.screenshot("wizard8") machine.succeed("xdotool mousemove 512 740 click 1") # Next - machine.wait_for_text("Compositing") # Compositing (default) + machine.wait_for_text("OpenGL") # Compositing (default) machine.screenshot("wizard9") machine.succeed("xdotool mousemove 512 740 click 1") # Next diff --git a/third_party/nixpkgs/nixos/tests/ergo.nix b/third_party/nixpkgs/nixos/tests/ergo.nix new file mode 100644 index 0000000000..8cdbbf62a9 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ergo.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "ergo"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mmahut ]; + }; + + nodes = { + machine = { ... }: { + services.ergo.enable = true; + services.ergo.api.keyHash = "324dcf027dd4a30a932c441f365a25e86b173defa4b8e58948253471b81b72cf"; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("ergo.service") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/home-assistant.nix b/third_party/nixpkgs/nixos/tests/home-assistant.nix index 80dca43f1f..3365e74ba8 100644 --- a/third_party/nixpkgs/nixos/tests/home-assistant.nix +++ b/third_party/nixpkgs/nixos/tests/home-assistant.nix @@ -76,7 +76,7 @@ in { hass.succeed("test -f ${configDir}/ui-lovelace.yaml") with subtest("Check that Home Assistant's web interface and API can be reached"): hass.wait_for_open_port(8123) - hass.succeed("curl --fail http://localhost:8123/states") + hass.succeed("curl --fail http://localhost:8123/lovelace") assert "API running" in hass.succeed( "curl --fail -H 'x-ha-access: ${apiPassword}' http://localhost:8123/api/" ) diff --git a/third_party/nixpkgs/nixos/tests/hostname.nix b/third_party/nixpkgs/nixos/tests/hostname.nix new file mode 100644 index 0000000000..3b87303d73 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/hostname.nix @@ -0,0 +1,66 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + makeHostNameTest = hostName: domain: + let + fqdn = hostName + (optionalString (domain != null) ".${domain}"); + in + makeTest { + name = "hostname-${fqdn}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ primeos blitz ]; + }; + + machine = { lib, ... }: { + networking.hostName = hostName; + networking.domain = domain; + + environment.systemPackages = with pkgs; [ + inetutils + ]; + }; + + testScript = '' + start_all() + + machine = ${hostName} + + machine.wait_for_unit("network-online.target") + + # The FQDN, domain name, and hostname detection should work as expected: + assert "${fqdn}" == machine.succeed("hostname --fqdn").strip() + assert "${optionalString (domain != null) domain}" == machine.succeed("dnsdomainname").strip() + assert ( + "${hostName}" + == machine.succeed( + 'hostnamectl status | grep "Static hostname" | cut -d: -f2' + ).strip() + ) + + # 127.0.0.1 and ::1 should resolve back to "localhost": + assert ( + "localhost" == machine.succeed("getent hosts 127.0.0.1 | awk '{print $2}'").strip() + ) + assert "localhost" == machine.succeed("getent hosts ::1 | awk '{print $2}'").strip() + + # 127.0.0.2 should resolve back to the FQDN and hostname: + fqdn_and_host_name = "${optionalString (domain != null) "${hostName}.${domain} "}${hostName}" + assert ( + fqdn_and_host_name + == machine.succeed("getent hosts 127.0.0.2 | awk '{print $2,$3}'").strip() + ) + ''; + }; + +in +{ + noExplicitDomain = makeHostNameTest "ahost" null; + + explicitDomain = makeHostNameTest "ahost" "adomain"; +} diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix index 92ac5c46e8..9cbecf01f5 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix @@ -9,7 +9,22 @@ in { nodes = { # The only thing the client needs to do is download a file. - client = { ... }: {}; + client = { ... }: { + services.davfs2.enable = true; + system.activationScripts.davfs2-secrets = '' + echo "http://nextcloud/remote.php/webdav/ ${adminuser} ${adminpass}" > /tmp/davfs2-secrets + chmod 600 /tmp/davfs2-secrets + ''; + fileSystems = pkgs.lib.mkVMOverride { + "/mnt/dav" = { + device = "http://nextcloud/remote.php/webdav/"; + fsType = "davfs"; + options = let + davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets"); + in [ "conf=${davfs2Conf}" "x-systemd.automount" "noauto"]; + }; + }; + }; nextcloud = { config, pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 80 ]; @@ -60,5 +75,6 @@ in { client.succeed( "${withRcloneEnv} ${diffSharedFile}" ) + assert "hi" in client.succeed("cat /mnt/dav/test-shared-file") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/podman.nix b/third_party/nixpkgs/nixos/tests/podman.nix index 283db71d9a..9134a68ff3 100644 --- a/third_party/nixpkgs/nixos/tests/podman.nix +++ b/third_party/nixpkgs/nixos/tests/podman.nix @@ -38,23 +38,45 @@ import ./make-test-python.nix ( start_all() - with subtest("Run container as root"): + with subtest("Run container as root with runc"): podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") podman.succeed( - "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) podman.succeed("podman ps | grep sleeping") podman.succeed("podman stop sleeping") + podman.succeed("podman rm sleeping") - with subtest("Run container rootless"): + with subtest("Run container as root with crun"): + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + podman.succeed( + "podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + podman.succeed("podman ps | grep sleeping") + podman.succeed("podman stop sleeping") + podman.succeed("podman rm sleeping") + + with subtest("Run container rootless with runc"): podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) podman.succeed( su_cmd( - "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) ) podman.succeed(su_cmd("podman ps | grep sleeping")) podman.succeed(su_cmd("podman stop sleeping")) + podman.succeed(su_cmd("podman rm sleeping")) + + with subtest("Run container rootless with crun"): + podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + podman.succeed( + su_cmd( + "podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + ) + podman.succeed(su_cmd("podman ps | grep sleeping")) + podman.succeed(su_cmd("podman stop sleeping")) + podman.succeed(su_cmd("podman rm sleeping")) ''; } ) diff --git a/third_party/nixpkgs/nixos/tests/sogo.nix b/third_party/nixpkgs/nixos/tests/sogo.nix new file mode 100644 index 0000000000..016331a9ee --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/sogo.nix @@ -0,0 +1,58 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "sogo"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ajs124 das_j ]; + }; + + nodes = { + sogo = { config, pkgs, ... }: { + services.nginx.enable = true; + + services.mysql = { + enable = true; + package = pkgs.mysql; + ensureDatabases = [ "sogo" ]; + ensureUsers = [{ + name = "sogo"; + ensurePermissions = { + "sogo.*" = "ALL PRIVILEGES"; + }; + }]; + }; + + services.sogo = { + enable = true; + timezone = "Europe/Berlin"; + extraConfig = '' + WOWorkersCount = 1; + + SOGoUserSources = ( + { + type = sql; + userPasswordAlgorithm = md5; + viewURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_users"; + canAuthenticate = YES; + id = users; + } + ); + + SOGoProfileURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_user_profile"; + OCSFolderInfoURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_folder_info"; + OCSSessionsFolderURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_sessions_folder"; + OCSEMailAlarmsFolderURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_alarms_folder"; + OCSStoreURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_store"; + OCSAclURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_acl"; + OCSCacheFolderURL = "mysql://sogo@%2Frun%2Fmysqld%2Fmysqld.sock/sogo/sogo_cache_folder"; + ''; + }; + }; + }; + + testScript = '' + start_all() + sogo.wait_for_unit("multi-user.target") + sogo.wait_for_open_port(20000) + sogo.wait_for_open_port(80) + sogo.succeed("curl -sSfL http://sogo/SOGo") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/systemd-binfmt.nix b/third_party/nixpkgs/nixos/tests/systemd-binfmt.nix new file mode 100644 index 0000000000..2a676f3da9 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-binfmt.nix @@ -0,0 +1,24 @@ +# Teach the kernel how to run armv7l and aarch64-linux binaries, +# and run GNU Hello for these architectures. +import ./make-test-python.nix ({ pkgs, ... }: { + name = "systemd-binfmt"; + machine = { + boot.binfmt.emulatedSystems = [ + "armv7l-linux" + "aarch64-linux" + ]; + }; + + testScript = let + helloArmv7l = pkgs.pkgsCross.armv7l-hf-multiplatform.hello; + helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello; + in '' + machine.start() + assert "world" in machine.succeed( + "${helloArmv7l}/bin/hello" + ) + assert "world" in machine.succeed( + "${helloAarch64}/bin/hello" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/wireguard/basic.nix b/third_party/nixpkgs/nixos/tests/wireguard/basic.nix new file mode 100644 index 0000000000..25d706ae2e --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/wireguard/basic.nix @@ -0,0 +1,74 @@ +{ kernelPackages ? null }: +import ../make-test-python.nix ({ pkgs, lib, ...} : + let + wg-snakeoil-keys = import ./snakeoil-keys.nix; + peer = (import ./make-peer.nix) { inherit lib; }; + in + { + name = "wireguard"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes = { + peer0 = peer { + ip4 = "192.168.0.1"; + ip6 = "fd00::1"; + extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.1/32" "fc00::1/128" ]; + listenPort = 23542; + + inherit (wg-snakeoil-keys.peer0) privateKey; + + peers = lib.singleton { + allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; + + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + }; + }; + }; + + peer1 = peer { + ip4 = "192.168.0.2"; + ip6 = "fd00::2"; + extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.2/32" "fc00::2/128" ]; + listenPort = 23542; + allowedIPsAsRoutes = false; + + inherit (wg-snakeoil-keys.peer1) privateKey; + + peers = lib.singleton { + allowedIPs = [ "0.0.0.0/0" "::/0" ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + + postSetup = let inherit (pkgs) iproute; in '' + ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 + ${iproute}/bin/ip route replace fc00::1/128 dev wg0 + ''; + }; + }; + }; + }; + + testScript = '' + start_all() + + peer0.wait_for_unit("wireguard-wg0.service") + peer1.wait_for_unit("wireguard-wg0.service") + + peer1.succeed("ping -c5 fc00::1") + peer1.succeed("ping -c5 10.23.42.1") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/wireguard/default.nix b/third_party/nixpkgs/nixos/tests/wireguard/default.nix index e3bc31c600..dedb321ff2 100644 --- a/third_party/nixpkgs/nixos/tests/wireguard/default.nix +++ b/third_party/nixpkgs/nixos/tests/wireguard/default.nix @@ -1,71 +1,27 @@ -import ../make-test-python.nix ({ pkgs, lib, ...} : - let - wg-snakeoil-keys = import ./snakeoil-keys.nix; - peer = (import ./make-peer.nix) { inherit lib; }; - in - { - name = "wireguard"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ma27 ]; - }; +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../../.. { inherit system config; } +, kernelVersionsToTest ? [ "5.4" "latest" ] +}: - nodes = { - peer0 = peer { - ip4 = "192.168.0.1"; - ip6 = "fd00::1"; - extraConfig = { - networking.firewall.allowedUDPPorts = [ 23542 ]; - networking.wireguard.interfaces.wg0 = { - ips = [ "10.23.42.1/32" "fc00::1/128" ]; - listenPort = 23542; +with pkgs.lib; - inherit (wg-snakeoil-keys.peer0) privateKey; +let + tests = let callTest = p: flip (import p) { inherit system pkgs; }; in { + basic = callTest ./basic.nix; + namespaces = callTest ./namespaces.nix; + wg-quick = callTest ./wg-quick.nix; + generated = callTest ./generated.nix; + }; +in - peers = lib.singleton { - allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; - - inherit (wg-snakeoil-keys.peer1) publicKey; - }; - }; - }; - }; - - peer1 = peer { - ip4 = "192.168.0.2"; - ip6 = "fd00::2"; - extraConfig = { - networking.wireguard.interfaces.wg0 = { - ips = [ "10.23.42.2/32" "fc00::2/128" ]; - listenPort = 23542; - allowedIPsAsRoutes = false; - - inherit (wg-snakeoil-keys.peer1) privateKey; - - peers = lib.singleton { - allowedIPs = [ "0.0.0.0/0" "::/0" ]; - endpoint = "192.168.0.1:23542"; - persistentKeepalive = 25; - - inherit (wg-snakeoil-keys.peer0) publicKey; - }; - - postSetup = let inherit (pkgs) iproute; in '' - ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 - ${iproute}/bin/ip route replace fc00::1/128 dev wg0 - ''; - }; - }; - }; - }; - - testScript = '' - start_all() - - peer0.wait_for_unit("wireguard-wg0.service") - peer1.wait_for_unit("wireguard-wg0.service") - - peer1.succeed("ping -c5 fc00::1") - peer1.succeed("ping -c5 10.23.42.1") - ''; - } +listToAttrs ( + flip concatMap kernelVersionsToTest (version: + let + v' = replaceStrings [ "." ] [ "_" ] version; + in + flip mapAttrsToList tests (name: test: + nameValuePair "wireguard-${name}-linux-${v'}" (test { kernelPackages = pkgs."linuxPackages_${v'}"; }) + ) + ) ) diff --git a/third_party/nixpkgs/nixos/tests/wireguard/generated.nix b/third_party/nixpkgs/nixos/tests/wireguard/generated.nix index a29afd2d46..cdf1548326 100644 --- a/third_party/nixpkgs/nixos/tests/wireguard/generated.nix +++ b/third_party/nixpkgs/nixos/tests/wireguard/generated.nix @@ -1,4 +1,5 @@ -import ../make-test-python.nix ({ pkgs, ...} : { +{ kernelPackages ? null }: +import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-generated"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ma27 grahamc ]; @@ -6,6 +7,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { nodes = { peer1 = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.firewall.allowedUDPPorts = [ 12345 ]; networking.wireguard.interfaces.wg0 = { ips = [ "10.10.10.1/24" ]; @@ -17,6 +19,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { }; peer2 = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.firewall.allowedUDPPorts = [ 12345 ]; networking.wireguard.interfaces.wg0 = { ips = [ "10.10.10.2/24" ]; diff --git a/third_party/nixpkgs/nixos/tests/wireguard/namespaces.nix b/third_party/nixpkgs/nixos/tests/wireguard/namespaces.nix index c8a4e3bb52..c47175ceaf 100644 --- a/third_party/nixpkgs/nixos/tests/wireguard/namespaces.nix +++ b/third_party/nixpkgs/nixos/tests/wireguard/namespaces.nix @@ -1,3 +1,5 @@ +{ kernelPackages ? null }: + let listenPort = 12345; socketNamespace = "foo"; @@ -13,7 +15,7 @@ let in -import ../make-test-python.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-with-namespaces"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ asymmetric ]; @@ -23,6 +25,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { # interface should be created in the socketNamespace # and not moved from there peer0 = pkgs.lib.attrsets.recursiveUpdate node { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.wireguard.interfaces.wg0 = { preSetup = '' ip netns add ${socketNamespace} @@ -33,6 +36,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { # interface should be created in the init namespace # and moved to the interfaceNamespace peer1 = pkgs.lib.attrsets.recursiveUpdate node { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.wireguard.interfaces.wg0 = { preSetup = '' ip netns add ${interfaceNamespace} @@ -43,6 +47,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { # interface should be created in the socketNamespace # and moved to the interfaceNamespace peer2 = pkgs.lib.attrsets.recursiveUpdate node { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.wireguard.interfaces.wg0 = { preSetup = '' ip netns add ${socketNamespace} @@ -54,6 +59,7 @@ import ../make-test-python.nix ({ pkgs, ...} : { # interface should be created in the socketNamespace # and moved to the init namespace peer3 = pkgs.lib.attrsets.recursiveUpdate node { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.wireguard.interfaces.wg0 = { preSetup = '' ip netns add ${socketNamespace} diff --git a/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix b/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix index 7354dd01a3..5472d21cd1 100644 --- a/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix +++ b/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix @@ -1,3 +1,5 @@ +{ kernelPackages ? null }: + import ../make-test-python.nix ({ pkgs, lib, ... }: let wg-snakeoil-keys = import ./snakeoil-keys.nix; @@ -14,6 +16,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: ip4 = "192.168.0.1"; ip6 = "fd00::1"; extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.firewall.allowedUDPPorts = [ 23542 ]; networking.wg-quick.interfaces.wg0 = { address = [ "10.23.42.1/32" "fc00::1/128" ]; @@ -34,6 +37,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: ip4 = "192.168.0.2"; ip6 = "fd00::2"; extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; networking.wg-quick.interfaces.wg0 = { address = [ "10.23.42.2/32" "fc00::2/128" ]; inherit (wg-snakeoil-keys.peer1) privateKey; diff --git a/third_party/nixpkgs/nixos/tests/yggdrasil.nix b/third_party/nixpkgs/nixos/tests/yggdrasil.nix index 468fcf6712..9ceb797473 100644 --- a/third_party/nixpkgs/nixos/tests/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/tests/yggdrasil.nix @@ -85,6 +85,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { MulticastInterfaces = [ "eth1" ]; LinkLocalTCPPort = 43210; }; + persistentKeys = true; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/zoneminder.nix b/third_party/nixpkgs/nixos/tests/zoneminder.nix new file mode 100644 index 0000000000..a4e1a05ec0 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/zoneminder.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ lib, ...}: + +{ + name = "zoneminder"; + meta.maintainers = with lib.maintainers; [ danielfullmer ]; + + machine = { ... }: + { + services.zoneminder = { + enable = true; + database.createLocally = true; + database.username = "zoneminder"; + }; + time.timeZone = "America/New_York"; + }; + + testScript = '' + machine.wait_for_unit("zoneminder.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(8095) + machine.succeed("curl --fail http://localhost:8095/") + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index f1e652cbca..542a1f8518 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.4.1"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0ddc03dbm4ixy877czmwd03fpjgr3y68bxfgb6n2q6cv4prp30ig"; + sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix new file mode 100644 index 0000000000..de0cae7a21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + pname = "BJumblr"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = "v${version}"; + sha256 = "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libX11 cairo lv2 libsndfile + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sjaehn/BJumblr"; + description = "Pattern-controlled audio stream / sample re-sequencer LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix index 674795dca2..bb45a846b1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "1zz1cirmx4wm4im4gjdp691f2042c8d1i8np1ns71f6kqdj9ps3k"; + sha256 = "1fz0p0ba00b7k7a8q9mxwj01jwl8xwh9a2npn00pbbdrg9zv4fdr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix index a2f96bc288..aa4374c79b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BShapr"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "v${version}"; - sha256 = "0jlq5rjicc4fxlpk869dg0l5bwwz8k9aj2wfk9v89b0qw8l8kaxl"; + sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix index 1438b06606..313c7cbfd4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "denemo"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; - sha256 = "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by"; + sha256 = "145kq0zfgdadykl3i6na221i4s5wzdrcqq48amzyfarnrqk2rmpd"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 3acf8ea1c0..c5661f3336 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "03prdifc2nz7smmzdy19flp33m927vb7j5bhdc46gak753pikw7d"; + sha256 = "0wb7xsc2m9f4q5zsf5ai6h6c0558lkziv30b5a8ic64wp0layr6k"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix new file mode 100644 index 0000000000..77a04221b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, fetchurl +, unzip +, makeDesktopItem +, imagemagick +, SDL +, isStereo ? false +}: + +with stdenv.lib; +let + pname = "goattracker" + optionalString isStereo "-stereo"; + desktopItem = makeDesktopItem { + type = "Application"; + name = pname; + desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; + genericName = "Music Tracker"; + exec = if isStereo + then "gt2stereo" + else "goattrk2"; + icon = "goattracker"; + categories = "AudioVideo;AudioVideoEditing;"; + extraEntries = "Keywords=tracker;music;"; + }; + +in stdenv.mkDerivation rec { + inherit pname; + version = if isStereo + then "2.76" # stereo + else "2.75"; # normal + + src = fetchurl { + url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; + sha256 = if isStereo + then "12cz3780x5k047jqdv69n6rjgbfiwv67z850kfl4i37lxja432l7" # stereo + else "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"; # normal + }; + sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src"; + + nativeBuildInputs = [ unzip imagemagick ]; + buildInputs = [ SDL ]; + + # PREFIX gets treated as BINDIR. + makeFlags = [ "PREFIX=$(out)/bin/" ]; + + # The zip contains some build artifacts. + prePatch = "make clean"; + + # The destination does not get created automatically. + preBuild = "mkdir -p $out/bin"; + + # Other files get installed during the build phase. + installPhase = '' + convert goattrk2.bmp goattracker.png + install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png + ${desktopItem.buildCommand} + ''; + + meta = { + description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" + + optionalString isStereo " - Stereo version"; + homepage = "https://cadaver.github.io/tools.html"; + downloadPage = "https://sourceforge.net/projects/goattracker2/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 095cd79b56..f94d27565e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, faust, gettext, intltool, pkgconfig, python2 , avahi, bluez, boost, eigen, fftw, glib, glib-networking , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, libsndfile, lilv, lrdf, lv2, serd, sord, sratom @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { sha256 = "1nn80m1qagfhvv69za60f0w6ck87vmk77qmqarj7fbr8avwg63s9"; }; - nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; + patches = [ + (fetchpatch { + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/guitarix-0.39.0-fix_faust_and_lv2_plugins.patch?id=8579b4dfe85e04303ad2d9771ed699f04ea7b7cf"; + stripLen = 1; + sha256 = "0pgkhi4v4vrzjnig0ggmz207q4x5iyk2n6rjj8s5lv15fia7qzp4"; + }) + ]; + + nativeBuildInputs = [ faust gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib-networking.out @@ -28,11 +36,16 @@ stdenv.mkDerivation rec { zita-resampler curl ]; + postPatch = '' + # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + wafConfigureFlags = [ "--shared-lib" "--no-desktop-update" "--enable-nls" - "--no-faust" # todo: find out why --faust doesn't work "--install-roboto-font" "--includeresampler" "--convolver-ffmpeg" diff --git a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix b/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix index cfcad390f4..e4df8593ce 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; - sha256 = "051y77swpi9isx275gwzl4fn3igd2dmixbszv9m3h0h9lqhcjrvr"; + sha256 = "0i0c4bmsm36jj1v535kil47ig0ig70ykrzcw2f56spr25xns06ka"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix index 0b9f815330..6c2a7d9fe3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -26,6 +26,10 @@ let mopidy-mpd = callPackage ./mpd.nix { }; + mopidy-mpris = callPackage ./mpris.nix { }; + + mopidy-somafm = callPackage ./somafm.nix { }; + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix index 3dea9156f8..1e5e42ac2f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ stdenv, python3Packages, mopidy }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; - version = "3.0.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; - sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz"; + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-GMusic"; + sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3"; }; propagatedBuildInputs = [ mopidy - pythonPackages.requests - pythonPackages.gmusicapi - pythonPackages.cachetools + python3Packages.requests + python3Packages.gmusicapi + python3Packages.cachetools ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 742c63b3d8..5cc3a957d2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.47.0"; + version = "3.49.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1lvq5qsnn2djwkgbadzr7rr6ik2xh8yyj0p3y3hck9pl96ms7lfv"; + sha256 = "0zddm7286iwx437gjz47m4g28s8gdcxnm2hmly9w1dzi08aa4fas"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mpris.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mpris.nix new file mode 100644 index 0000000000..16fbfab380 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mpris.nix @@ -0,0 +1,27 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-mpris"; + version = "3.0.1"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-MPRIS"; + sha256 = "0qk46aq5r92qgkldzl41x09naww1gv92l4c4hknyl7yymyvm9lr2"; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.pydbus + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification"; + license = licenses.asl20; + maintainers = [ maintainers.nickhu ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix new file mode 100644 index 0000000000..2e3380fa20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix @@ -0,0 +1,26 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-somafm"; + version = "2.0.0"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-SomaFM"; + sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3"; + }; + + propagatedBuildInputs = [ + mopidy + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for playing music from SomaFM"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix index b8e22a41ca..ac16c182a5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ stdenv, python3Packages, mopidy }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "2.0.2"; + version = "3.0"; - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-youtube"; - rev = "v${version}"; - sha256 = "06r3ikyg2ch5n7fbn3sgj04hk6icpfpk1r856qch41995k3bbfg7"; + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-YouTube"; + sha256 = "0x1q9rfnjx65n6hi8s5rw5ff4xv55h63zy52fwm8aksdnzppr7gd"; }; - propagatedBuildInputs = with pythonPackages; [ mopidy pafy ]; + patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; + + propagatedBuildInputs = [ + mopidy + python3Packages.beautifulsoup4 + python3Packages.cachetools + python3Packages.youtube-dl + ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 5284c8af68..c500463425 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.12"; + version = "1.16"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1y7kv889rm3nvaigcda4bglvwm799f3gp0zrivkvrg1lrlygs89f"; + sha256 = "0rbjphhyca71j22lbyx53w3n2mkdw7xflks2knfaziwdkqcfcvp2"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix index 344927bce7..f2ee5eac70 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1hwxdjlzsf1z6xl82s4bdfxa2bfisklrfx361zbzskmg9iymw1gy"; + sha256 = "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index 2e63a3e8c7..9de70d83ee 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, autoPatchelfHook, makeWrapper -, alsaLib, xorg +, alsaLib, xorg, libjack2 , gtk3, pango, gdk-pixbuf, cairo, glib, freetype , libpulseaudio, xdg_utils }: stdenv.mkDerivation rec { pname = "reaper"; - version = "5.987"; + version = "6.10"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k"; + sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { rm $out/opt/REAPER/uninstall-reaper.sh wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpulseaudio libjack2 ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index 36125489e3..7f6762958a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -4,26 +4,26 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20190805"; + version = "20200412"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0qqps20vvn3rgpg8174bjrrm38gqcci2z5z4c1r1vhbccclahgsd"; + sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; }; configureFlags = [ "--enable-dependency-tracking" ]; nativeBuildInputs = [ autoreconfHook python ]; - buildInputs = [ alsaLib SDL ]; + buildInputs = [ SDL ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; meta = with stdenv.lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ ftrvxmtrx ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix index 91acab3538..693de28bf4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1bdcfkfbvvn262p4j0nb4kvjzzgrvn3kxlif48yipqkkykzsgz6g"; + sha256 = "1gdsk620md5nv1r05jysmfhpbcidh15wzyiklkazsb6cppm6qsiy"; }; - cargoSha256 = "13v2ilmfs9468kavlx6wrsp0dscppxbxgygwpdd35p5hq3vnhl7k"; + cargoSha256 = "0irfdmik6nrpfs9yzva5q351cfyf1cijxa2a08prwdccrivdk98a"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; buildInputs = [ ] diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index 1a4d1832c7..f1c0b056c8 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "vorta"; - version = "0.6.24"; + version = "0.6.26"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "1xc4cng4npc7g739qd909a8wim6s6sn8h8bb1wpxzg4gcnfyin8z"; + sha256 = "189kzwdmissg9142cd7wvxa1rvc2y7lysgr7if99zc7ks59mv6dq"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix index 371bf11064..6777e5998c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.8.2"; + version = "0.8.2.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "1w5l3r3pnhnwz3x7mjgd69cw9a18fpyjwj7kmfka7cf9hdgcwp9x"; + sha256 = "02incjr59fv75q6hlrln9h4b5gq7ipd778scbz8b8dahj7x1a6i5"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix new file mode 100644 index 0000000000..bae7326c25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "ergo"; + version = "3.2.5"; + + src = fetchurl { + url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; + sha256 = "0vaq6cqz03ps0fg3rvk298jnbf8mazvmyfcj7zsf1cgw41xdjjcf"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/ergo --add-flags "-jar $src" + ''; + + meta = with stdenv.lib; { + description = "Open protocol that implements modern scientific ideas in the blockchain area"; + homepage = "https://ergoplatform.org/en/"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 15583d0a1e..690731fa12 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.13"; + version = "1.9.14"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425"; + sha256 = "0vqsx4q7jn6vhmrm9kkk810d5nvnmyb6bni38ynkxcwlrp3qs6v2"; }; usb = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; }; - vendorSha256 = "12aw8b8ci7nssidh1yz8d2hk43csdacq5jca9y70rjakpl3zndsz"; + vendorSha256 = "01mbmc8qlp08127dlmcqz0viasmg7mrzqzmyw21an69sabcr112n"; overrideModAttrs = (_: { postBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/parity/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/parity/default.nix index e390b78b86..a2428ed01e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/parity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/parity/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "parity"; - version = "2.7.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "parity-ethereum"; rev = "v${version}"; - sha256 = "09cvqk0h9c26famh3f1nc3g74cd0zk6klys977yr1f13bgqmzx0x"; + sha256 = "124km8c2d7877yzd885wzlcl3gky15isx0z2l1qg1q3cqdsb5mjf"; }; - cargoSha256 = "1fdymy8hvn137i5y4flyhlxwjxkd2cd6gq81i1429gk7j3h085ig"; + cargoSha256 = "0m4pms7agfyqk6gz6fwxdl8jmcyhphhzh3x4vykbi6186y7a8ihq"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix index f973e67599..e89267d04c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dit"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ryvm54xxkg2gcgz4r8zdxrl6j2h8mgg9nfqmdmdr31qkcj8wjsq"; + sha256 = "0cmbyzqfz2qa83cg8lpjifn34wmx34c5innw485zh4vk3c0k8wlj"; }; buildInputs = [ ncurses lua ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 4a9f1e9a2b..b1b33dc935 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.0.1.tar"; - sha256 = "0iqninv4wf4ap8axk9m0gi39j3kq4jpbpdc8hczd34xrp83ml46a"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar"; + sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -1036,6 +1036,21 @@ license = lib.licenses.free; }; }) {}; + eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "eldoc"; + ename = "eldoc"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el"; + sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eldoc.html"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "eldoc-eval"; @@ -1382,10 +1397,10 @@ elpaBuild { pname = "gnu-elpa"; ename = "gnu-elpa"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnu-elpa-1.0.tar"; - sha256 = "0ywwlsyvl2g49k0krk35z15l2drqg3rdf26786rw65vz4ip2j3id"; + url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar"; + sha256 = "0b0law1xwwqa42wb09b3w73psq2kx16lkiwxjxl0sshjcmarhv8r"; }; packageRequires = []; meta = { @@ -2470,10 +2485,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.46"; + version = "0.3.48"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.46.tar"; - sha256 = "1chyhfn90c23awxdmmg9z870ipbdrg47sglgid7n598dx84qyqyz"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar"; + sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv"; }; packageRequires = [ emacs ]; meta = { @@ -2526,6 +2541,21 @@ license = lib.licenses.free; }; }) {}; + project = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "project"; + ename = "project"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/project-0.1.2.el"; + sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/project.html"; + license = lib.licenses.free; + }; + }) {}; psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "psgml"; @@ -3360,10 +3390,10 @@ elpaBuild { pname = "uniquify-files"; ename = "uniquify-files"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uniquify-files-1.0.2.tar"; - sha256 = "1vib79wsz5k94b9z0wiwhbzsdm70y9dla6szw2bb75245cx3kr0h"; + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.3.tar"; + sha256 = "04yfys615ncz3jyh3hx5sg6x6szx028223184zv52skb4j99vkwq"; }; packageRequires = [ emacs ]; meta = { @@ -3674,10 +3704,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.0.1.tar"; - sha256 = "01961apbirdi4y8qx2wb01f04knkw3hyin3ndrkjlkfslqbsnzzv"; + url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar"; + sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q"; }; packageRequires = [ emacs seq ]; meta = { @@ -3694,10 +3724,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.3.tar"; - sha256 = "1vljnhi35vix30xch9mziczg56ss1r615yn2pgdcw8wa8sm14crw"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar"; + sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -3780,6 +3810,21 @@ license = lib.licenses.free; }; }) {}; + xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "xref"; + ename = "xref"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xref-1.0.1.el"; + sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xref.html"; + license = lib.licenses.free; + }; + }) {}; yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix index 2f0112fd92..dfe287a7f4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -98,7 +98,7 @@ sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; recipe = pkgs.writeText "recipe" '' - (haskell-unicode-input-method + (emacs-haskell-unicode-input-method :repo "roelvandijk/emacs-haskell-unicode-input-method" :fetcher github) ''; @@ -136,7 +136,6 @@ emacsSessionManagement = callPackage ./session-management-for-emacs { }; hsc3-mode = callPackage ./hsc3 { }; ido-ubiquitous = callPackage ./ido-ubiquitous { }; - ocaml-mode = callPackage ./ocaml { }; prolog-mode = callPackage ./prolog { }; rectMark = callPackage ./rect-mark { }; sunriseCommander = callPackage ./sunrise-commander { }; @@ -146,7 +145,6 @@ # # Ideally this should be dropped some time during/after 20.03 bbdb3 = self.melpaStablePackages.bbdb; - ocamlMode = self.ocaml-mode; jade = self.jade-mode; # scalaMode2 = null; # No clear mapping as of now flymakeCursor = self.melpaStablePackages.flymake-cursor; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 681ade367e..f228d34a65 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -22,42 +22,50 @@ instantenous and formats commits for you. */ -{ lib, external, pkgs }: variant: self: let +{ lib, external, pkgs }: variant: self: +let + dontConfigure = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + dontConfigure = true; + }); + }) else null; - dontConfigure = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - dontConfigure = true; - }); - }) else null; + markBroken = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + meta = (drv.meta or { }) // { broken = true; }; + }); + }) else null; - markBroken = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or {}) // { broken = true; }; - }); - }) else null; + externalSrc = pkg: epkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + inherit (epkg) src version; - externalSrc = pkg : epkg : if pkg != null then pkg.override (args : { - melpaBuild = drv : args.melpaBuild (drv // { - inherit (epkg) src version; + propagatedUserEnvPkgs = [ epkg ]; + }); + }) else null; - propagatedUserEnvPkgs = [ epkg ]; - }); - }) else null; + fix-rtags = pkg: + if pkg != null then dontConfigure (externalSrc pkg external.rtags) + else null; - fix-rtags = pkg : if pkg != null then dontConfigure (externalSrc pkg external.rtags) - else null; + generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json + }: + let + inherit (import ./libgenerated.nix lib self) melpaDerivation; + super = ( + lib.listToAttrs (builtins.filter + (s: s != null) + (map + (melpaDerivation variant) + (lib.importJSON archiveJson) + ) + ) + ); - generateMelpa = lib.makeOverridable ({ - archiveJson ? ./recipes-archive-melpa.json - }: let - - inherit (import ./libgenerated.nix lib self) melpaDerivation; - super = lib.listToAttrs (builtins.filter (s: s != null) - (map (melpaDerivation variant) - (lib.importJSON archiveJson))); - - overrides = rec { - shared = rec { + overrides = { # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; @@ -65,12 +73,11 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: { + auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ]; CFLAGS = "-I${external.llvmPackages.clang}/include"; LDFLAGS = "-L${external.llvmPackages.clang}/lib"; }); - emacsClangCompleteAsync = auto-complete-clang-async; # part of a larger package caml = dontConfigure super.caml; @@ -85,7 +92,9 @@ instantenous and formats commits for you. inherit (self.melpaPackages) easy-kill; }; - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { + dune = dontConfigure super.dune; + + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' @@ -114,26 +123,32 @@ instantenous and formats commits for you. evil-magit = super.evil-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); eopengrok = super.eopengrok.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; + forge = super.forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + flycheck-rtags = fix-rtags super.flycheck-rtags; gnuplot = super.gnuplot.overrideAttrs (old: { nativeBuildInputs = - (old.nativeBuildInputs or []) ++ [ pkgs.autoreconfHook ]; + (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ]; }); - pdf-tools = super.pdf-tools.overrideAttrs(old: { + pdf-tools = super.pdf-tools.overrideAttrs (old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; @@ -150,7 +165,7 @@ instantenous and formats commits for you. }); irony = super.irony.overrideAttrs (old: { - cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; + cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server @@ -184,115 +199,115 @@ instantenous and formats commits for you. magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-find-file = super.magit-find-file.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-imerge = super.magit-imerge.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-lfs = super.magit-lfs.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-stgit = super.magit-stgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-topgit = super.magit-topgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-todos = super.magit-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magithub = super.magithub.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-svn = super.magit-svn.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # upstream issue: missing file header @@ -308,12 +323,14 @@ instantenous and formats commits for you. rtags = dontConfigure (externalSrc super.rtags external.rtags); + rtags-xref = dontConfigure super.rtags; + shm = super.shm.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; }); # Telega has a server portion for it's network protocol - telega = super.telega.overrideAttrs(old: { + telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; postBuild = '' @@ -328,18 +345,27 @@ instantenous and formats commits for you. ''; }); - vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { + treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { + # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); - zmq = super.zmq.overrideAttrs(old: { + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + + zmq = super.zmq.overrideAttrs (old: { stripDebugList = [ "share" ]; preBuild = '' make ''; nativeBuildInputs = [ - external.autoconf external.automake external.pkgconfig external.libtool + external.autoconf + external.automake + external.pkgconfig + external.libtool (external.zeromq.override { enableDrafts = true; }) ]; postInstall = '' @@ -361,9 +387,6 @@ instantenous and formats commits for you. markdown-mode-plus = super."markdown-mode+"; package-plus = super."package+"; rect-plus = super."rect+"; - }; - - stable = shared // { # upstream issue: missing file header bufshow = markBroken super.bufshow; @@ -374,9 +397,6 @@ instantenous and formats commits for you. # upstream issue: missing file header dictionary = markBroken super.dictionary; - # missing git - egg = markBroken super.egg; - # upstream issue: missing file header elmine = markBroken super.elmine; @@ -395,8 +415,6 @@ instantenous and formats commits for you. # upstream issue: doesn't build eterm-256color = markBroken super.eterm-256color; - helm-rtags = fix-rtags super.helm-rtags; - # upstream issue: missing file header qiita = markBroken super.qiita; @@ -415,9 +433,6 @@ instantenous and formats commits for you. # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - }; - - unstable = shared // { editorconfig = super.editorconfig.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; }); @@ -425,7 +440,7 @@ instantenous and formats commits for you. egg = super.egg.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # missing dependencies @@ -436,91 +451,85 @@ instantenous and formats commits for you. kapacitor = super.kapacitor.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - forge = super.forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); gerrit = super.gerrit.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); gerrit-download = super.gerrit-download.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); helm-rtags = fix-rtags super.helm-rtags; jist = super.jist.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); mandoku = super.mandoku.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-p4 = super.magit-p4.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-rbr = super.magit-rbr.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-circleci = super.magit-circleci.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - })); + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + })); # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { @@ -538,13 +547,7 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - vterm = super.vterm.overrideAttrs(old: { + vterm = super.vterm.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" @@ -560,32 +563,38 @@ instantenous and formats commits for you. rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h} ''; }); - # Legacy alias - emacs-libvterm = unstable.vterm; - - # Map legacy renames from emacs2nix since code generation was ported to emacs lisp - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = - let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' + let w3m = "${lib.getBin external.w3m}/bin/w3m"; in + '' substituteInPlace w3m.el \ - --replace 'defcustom w3m-command nil' \ - 'defcustom w3m-command "${w3m}"' + --replace 'defcustom w3m-command nil' \ + 'defcustom w3m-command "${w3m}"' ''; }); }); }; - }; - in super // overrides.${variant}); + # Deprecated legacy aliases for backwards compat + aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { + "auto-complete-clang-async" = "emacsClangCompleteAsync"; + "vterm" = "emacs-libvterm"; + "0xc" = "_0xc"; + "2048-game" = "_2048-game"; + "4clojure" = "_4clojure"; + "@" = "at"; + "term+" = "term-plus"; + "term+key-intercept" = "term-plus-key-intercept"; + "term+mux" = "term-plus-mux"; + "xml+" = "xml-plus"; + }))); -in generateMelpa { } + melpaPackages = lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super; + + in + melpaPackages // aliases); + +in +generateMelpa { } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix deleted file mode 100644 index 4240263dd0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, emacs, ocaml }: - -# this package installs the emacs-mode which -# resides in the ocaml compiler sources. - -let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; -in stdenv.mkDerivation { - pname = "ocaml-mode"; - inherit version; - inherit (ocaml) prefixKey src; - - # a quick configure to get the Makefile generated. Since - # we do not build the ocaml itself, we don't really - # need it to support any features. - configureFlags = (with stdenv.lib; optional (!(versionAtLeast version "4.02")) "-no-tk") ++ - [ "-no-curses" "-no-pthread" ]; - - buildInputs = [ emacs ]; - dontBuild = true; - - installPhase = '' - cd emacs; - mkdir -p "$out/share/emacs/site-lisp" "$out/bin" - EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags - ''; - - meta = { - homepage = "http://caml.inria.fr"; - description = "OCaml mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix index 4ff1db1c74..4beb575016 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20200504"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20200504.tar"; - sha256 = "1nalr2jafhzfkaf4bn8kscxd7nm1wz7dbw2629j2msxknw76dwk1"; + url = "https://orgmode.org/elpa/org-20200511.tar"; + sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20200504"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20200504.tar"; - sha256 = "1ykw3qspz18jgf3ngsvk2ys282489fcjrbk7pbv3ppxzjha4rmhb"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar"; + sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f"; }; packageRequires = []; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index d6015f4cbb..a10df77910 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -960,8 +960,8 @@ "auto-complete", "yasnippet" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -986,8 +986,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200425, - 835 + 20200516, + 52 ], "deps": [ "dash", @@ -997,8 +997,8 @@ "s", "xcscope" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -1360,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200509, - 1252 + 20200515, + 1854 ], "deps": [ "avy" ], - "commit": "c215d331cf65bf47ad0224480f1f916f64f2a955", - "sha256": "05cvm7zz2c116sr8a2p9rc771i8w4pqkwvwc2hw99g84kf2abaaf" + "commit": "b610dcb99510328d07ab1e1ea67b2f87ecb1cc5b", + "sha256": "0r7cyvrkbqq0dsm5963wn2i1wqgq0md5r8b2afjbr3m9b6v5lnq4" }, "stable": { "version": [ @@ -1817,14 +1817,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20200421, - 1149 + 20200512, + 1207 ], "deps": [ "cl-lib" ], - "commit": "58348d29adf8d2f23da2798badd7f89ff59cd7cc", - "sha256": "1d9hi36ml449x7qqpvcgxqx0r88jpqf1pq9k38af66ny3vd6zwl6" + "commit": "12a64b4e5c1a1e124baa74336738b6ae1972607f", + "sha256": "1pkqjg30l9sjh5m8w4p8qrlw92sxr28c3d7mq6h8sfc8dkgivd33" }, "stable": { "version": [ @@ -1963,14 +1963,14 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20200501, - 1837 + 20200511, + 1543 ], "deps": [ "powerline" ], - "commit": "5ea031bcbdf665afea7e47e519a49e2c33978833", - "sha256": "1jx17g8a6pxkw4zlx3fwhqgxfzcf3019k8fklykamfrkharzsc2l" + "commit": "a6a3bd55baee29bd372869c835aded0f7d5e5f76", + "sha256": "1yg9wdagysfa5xswdrnwngbzf7gmdhjsl40ivqnxxvb74adxcwp6" }, "stable": { "version": [ @@ -3238,11 +3238,11 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20200331, - 1717 + 20200514, + 1801 ], - "commit": "896b2be2ebb1408b8f6a49e12375229fc64fcf41", - "sha256": "047ipsyldkmpn1vw8rsnhqwc7j2cjbwb9nz0ms3r3gmyyrgc3k0g" + "commit": "7b8688c84d6032300d0c415182c7c1ad6cb7f819", + "sha256": "09x4hhycnv4sc472fqv7z8jpjx8viap5hb143yri3wkwa15bqd3b" }, "stable": { "version": [ @@ -4593,11 +4593,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20200510, - 1903 + 20200516, + 1608 ], - "commit": "a87cf772ac4517864bd11e6d053d7dcedd802012", - "sha256": "112hj631m8dv6hfip0s63kr42nwl8l5b1vzqi3dwsg2xddrsws85" + "commit": "f712de72d4618ce6c5d55ba20c848c83a87c5f32", + "sha256": "17dsdfs9l3g4jnna5b2pzifvxv13rr5rja76frl5wwp2brfmq8qv" } }, { @@ -5082,8 +5082,8 @@ 20190331, 2230 ], - "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", - "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -5902,11 +5902,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20200509, - 1902 + 20200515, + 1408 ], - "commit": "d0a0284575764cc9efdb3709fe3c320fd0c0873c", - "sha256": "0wbh06xsq9yqzvdfkmqbjggnfpspykyvahpcgmvrwg4kn3dlk3hd" + "commit": "39d4649f4a179e22fabbef1166afe1725c8dbea6", + "sha256": "0n5kqjcmwfbr58my3yisgfigh77rhy5b18jr4kh2b327r76ssqwl" }, "stable": { "version": [ @@ -6626,8 +6626,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200508, - 945 + 20200513, + 852 ], "deps": [ "biblio", @@ -6637,8 +6637,8 @@ "parsebib", "s" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -7411,16 +7411,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20200507, - 1851 + 20200514, + 1227 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "6427c39ace4a1bd34d573773bc896a863e8503a2", - "sha256": "1gg6f9zaggqrb1cd258p3slv1rx083vpwlkgfgwlf8v8i8yr4bxp" + "commit": "57271ed2ddca96c77b83b282019852d1cffffd26", + "sha256": "0mmyxi75hlg1lkvpk4lq5nagmcsmjijmkcmmkkq25llf7nmik8as" }, "stable": { "version": [ @@ -7444,15 +7444,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20200430, - 2304 + 20200513, + 1954 ], "deps": [ "epkg", "magit" ], - "commit": "067aa52079c49ecca97ca2d5d870a883b040d53b", - "sha256": "1wiaxr529zyk2m2jvags412qx079b0fwdzgw3nrvhvhcs3bwfwkr" + "commit": "f6a2e0cb8c3db5840c717114caba93793f2e9661", + "sha256": "1sa0wk7xj3qsk9fr4z2av80gp8n0804zylx3d27pdwm8bjyfzf7b" }, "stable": { "version": [ @@ -8452,11 +8452,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200412, - 1148 + 20200509, + 2224 ], - "commit": "532d082a363add4f6d9838ca3f924a773ce12136", - "sha256": "10ls012jy8ax43ldlvb86xjn9hsdayvw1k7wg4g8w5hmkd8x98wn" + "commit": "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a", + "sha256": "0avmxbxxsazd14h5avsrqh2yyfnp8jan64sbp5ih2c9hm7xv5p1k" }, "stable": { "version": [ @@ -9571,15 +9571,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200325, - 1236 + 20200511, + 1242 ], "deps": [ "cl-lib", "powerline" ], - "commit": "e6bf9f5257fa5401695e0e33d0376a0821ac2f2f", - "sha256": "1gm06par7pglwj25ydvlp1n2vniq6283mm0g4s53ra77ywsz73jv" + "commit": "57afd81c7fd6449239af7adcda4cd2192976dbb8", + "sha256": "1sa4anfqvhidn7kxqnchk0d8kc2v0l3cxbf0bnwwx7nk04gjvshg" }, "stable": { "version": [ @@ -9706,8 +9706,8 @@ 20171115, 2108 ], - "commit": "57125f74cc91ed6890346eee7948300437b6cb5e", - "sha256": "1131hx3chpl8qsl33xmnmqkb62cwpzfc0dks52mhcx0xy8wzds6r" + "commit": "dc0e180cbaf73e86d22f1d2996c7582dd0eb07b5", + "sha256": "0n9f87syrj30dn5k4vq1l7i02hzwfnadanfjbwv4a9wfjl77xy53" }, "stable": { "version": [ @@ -10305,8 +10305,8 @@ "s", "seq" ], - "commit": "282c338c21d01932049392f271f66e1725562efd", - "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" + "commit": "16f2ca86540001b40725c4099d04154aab0a6ba5", + "sha256": "19z8wmhsqbm12h0vvzfgjmzj7g3mcpa9qgcz3cnmrr4hgkx4b9a5" }, "stable": { "version": [ @@ -10379,8 +10379,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200507, - 1639 + 20200511, + 1025 ], "deps": [ "clojure-mode", @@ -10391,8 +10391,8 @@ "sesman", "spinner" ], - "commit": "3a59fe046c9884573512dff88d140d37c0be7b2c", - "sha256": "0fs4mny2qg73nlnjr6ynaa7vqiyklp7mwfyph2195hrrac0f3dq4" + "commit": "25fb15d915117310069254016391c9d76abcebcc", + "sha256": "1hz2l2ryllwyv1zk0la376klg7yndz9q32pd1vypwymwnac93c0y" }, "stable": { "version": [ @@ -11464,8 +11464,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20190731, - 1009 + 20200515, + 951 ], "deps": [ "cl-lib", @@ -11473,8 +11473,8 @@ "s", "seq" ], - "commit": "e3aa1ded10c079337826b40586111df7114f6379", - "sha256": "1s1z3m3qaf6ayp69w7h95ad3k4bs2iqqzsvjf94h5wd233mqlp2v" + "commit": "a8f9e83848b513f810170988679a9ef455025975", + "sha256": "1dzqqcj9l7hr73cj65rx5iy58bsiif5521d18jym4pajhzj3mkx0" }, "stable": { "version": [ @@ -11501,8 +11501,8 @@ 20190710, 1319 ], - "commit": "c2460c0e63e965c6315db666af27dc39bd5a0477", - "sha256": "19xk1m92kx50jqrbfjhklywlsv0rll9qaywkqkpg9cag1pd86bx2" + "commit": "135b5835a42d6e3c7efb85f80f3fe0885d45d644", + "sha256": "18mgkn5cy14f5l4qajhdphxvw66hhhw2yf12qfvpd2n5bx3b8dcs" }, "stable": { "version": [ @@ -13454,8 +13454,8 @@ "dash", "org-roam" ], - "commit": "b5af6f2e783bfb337c8f0ae33674e0963c71cea0", - "sha256": "16nh58ih73q014crlm3iw55h04klb76g80zf43lmxilbhxyxk9x4" + "commit": "674c2bd493f571c5323d69279557a6c18ccbd14e", + "sha256": "1x88kvxawbpg4sagi0kh4y7inyhy05dxcg8hl0ih4x40cwxyxrs5" }, "stable": { "version": [ @@ -13486,8 +13486,8 @@ "cl-lib", "company" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -13584,15 +13584,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200408, - 400 + 20200514, + 2116 ], "deps": [ "company", "posframe" ], - "commit": "9b59cd679c4396cbfe8118a9dfa8a5acfe038ac6", - "sha256": "1z18libg2nplx8a8dcycdzm354gczqzg8r37agzz0jk1a7frxa7m" + "commit": "4e506d661ed9cd2e4cf16281f3a11009210e9c30", + "sha256": "1h6pls6vg593cbmvq2kh5z67jvcyljvwbdxypqqsls5d22hvvbh5" }, "stable": { "version": [ @@ -14837,14 +14837,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200507, - 2247 + 20200512, + 1130 ], "deps": [ "swiper" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -14984,26 +14984,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200501, - 540 + 20200514, + 1224 ], "deps": [ "counsel" ], - "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", - "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" }, "stable": { "version": [ 1, 9, - 7 + 8 ], "deps": [ "counsel" ], - "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", - "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" } }, { @@ -15280,8 +15280,8 @@ "deps": [ "counsel" ], - "commit": "da451df4c5f0ba32056ec600e8eb6a2c7ca4df08", - "sha256": "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr" + "commit": "719b38ba2242cc1c6d1d79cab106c8c8b1afa775", + "sha256": "1jjgyps59xiyqdi392cfbx19n0znw3kj3fxbc5v3l56i3qm24bd4" }, "stable": { "version": [ @@ -16482,8 +16482,8 @@ 20190111, 2150 ], - "commit": "9e04e1ee5b1ab67391bf461e9d1f0ef8d6049902", - "sha256": "013bhb4yb55525lvplnqhia5wlik807dvvh6zim3zimxzyv4b66c" + "commit": "d6e6de9237bde72e7878f7b1fe0e58fdccd36dd2", + "sha256": "0lac5lqina90w8mdjkqa9qk4b52lmh6kibcph1xcjghqlw7agjfn" }, "stable": { "version": [ @@ -16690,8 +16690,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200511, - 425 + 20200514, + 1655 ], "deps": [ "bui", @@ -16702,8 +16702,8 @@ "lsp-treemacs", "s" ], - "commit": "3b8fd16cda74a4834594f487b7a540cc165470cf", - "sha256": "0jy70lj5krnj87icb1mgy30chr5jxhmiwy6cm2w2n7k8bp63jh6w" + "commit": "86fc65d525e30c0249e7ec6acac5e4e55cd7c3e2", + "sha256": "1jfrjrbjscjsa52wjvvmhcl4cqrw43wz4f34z8yzsxmsalgpf0nw" }, "stable": { "version": [ @@ -17107,30 +17107,30 @@ "repo": "jcs-elpa/dashboard-ls", "unstable": { "version": [ - 20200329, - 1443 + 20200515, + 1430 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" } }, { @@ -17774,11 +17774,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20181226, - 1534 + 20200515, + 1513 ], - "commit": "f54e8a65a7e75a029657364055420374df45656d", - "sha256": "1vas6jgwli0jcxmxmcwvzwv4414q8kkmhqfz5m96r7l4lpgcrhdr" + "commit": "fca9ea05ef4fdac825e2ad3921baa7042f6b82c8", + "sha256": "0h5znwc4sa92l2472204yn60z30ysvkr9hphjga7kn4j4jgvqak1" }, "stable": { "version": [ @@ -20171,11 +20171,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200504, - 2258 + 20200514, + 2215 ], - "commit": "992d14ca51ccc1e27c9c4a09f89b072cd6cb3fe3", - "sha256": "0ajyhric6008ik1mzlcmk0i856a3plhk0bri7chc9w7wz4lwshpv" + "commit": "1bcec209e12200c9b93b0d95f61b964b5de4439c", + "sha256": "03lbsww77vq1wrpj94jdx62zmjjhir9i50g85l8yadlp9696zh3s" } }, { @@ -20290,16 +20290,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200502, - 434 + 20200513, + 1103 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "df56aad083243124cbd346c1b9ae38b5ebdd2340", - "sha256": "0zylvc8nfpgmss1j8rkln3z23vdav1cqfr2c9s59i9fwd9sv7q0k" + "commit": "2b308857677e983ca4eaedc36438ed94aadf9e65", + "sha256": "1c7mk26drz9yldy3kvcxxnabg8ph900pj1g029xhd1407x417vqc" }, "stable": { "version": [ @@ -20324,14 +20324,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200507, - 524 + 20200514, + 2115 ], "deps": [ "cl-lib" ], - "commit": "34f181c290d2c9fb9628e4ec85c16e633931ede1", - "sha256": "161hp69n3zwnyb9f9pxpidx7jw3190v16j1fgsdsa08c1pq46q8m" + "commit": "95463eac68fe88535d9342c7b4c2cbaae3c80950", + "sha256": "0ccq6gzahpsxsgmmd9dl16mfnz1n9sgn0ns62n03s3xgmf4ay3ap" }, "stable": { "version": [ @@ -20536,11 +20536,11 @@ "repo": "david-christiansen/dr-racket-like-unicode", "unstable": { "version": [ - 20161021, - 1211 + 20200513, + 1642 ], - "commit": "a69e364532fffa451d1f12ade8fadb9cdbd8318c", - "sha256": "12pwfv0j54idvn061l3qxf0vrrl56085n517izh8x6jkgxjcx7k0" + "commit": "70bc1caea6b277e49e1cb29e1926a7b0c83c5ebc", + "sha256": "1an4hk9cjg1lhis0japdr371mnf1p4pl5mzl0l1cfkvprbxhzy65" }, "stable": { "version": [ @@ -20560,11 +20560,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200429, - 1947 + 20200514, + 1527 ], - "commit": "e5cbc350f49a30ad78a84e68b4e1682d018c9b7f", - "sha256": "1gakipj027mncv3g18ap6lshj89s8cg5wscabr3afs9gavkp52py" + "commit": "c162aff5025a7e9f55785d7177d59f4a3aa60183", + "sha256": "11wlrvrz3q054nqkdbd4525kh50cspszrgmqd74plah6jc95wpa3" }, "stable": { "version": [ @@ -20890,17 +20890,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200423, - 1658 + 20200513, + 2014 ], "deps": [ "dash", - "f", "popup", "s" ], - "commit": "d760aa880fc1052570ab0fd7e586eeffb7636af6", - "sha256": "0a27fv2yi4c19g78hgflrp8vx135v74q6n8ak3g3b2gh66vkvq7p" + "commit": "194bfdbe305e21d8e6d29893d449686c85273207", + "sha256": "0lz5kajhkqh18xyg07bshvl0v5j5g5xj4q8p6min1mapm8shnv2i" }, "stable": { "version": [ @@ -20944,8 +20943,8 @@ 20191016, 1241 ], - "commit": "73a70c02aa569f92e7c7bda21ff1728e37af53cf", - "sha256": "1ifya6ri0yz8bbncs1qm5ip9pjzq6ykgv1ilya51hggxwf3fs1db" + "commit": "e5bec1a57fd4ebeedc848e76e0cf991db7e22fd0", + "sha256": "091z6p93sv3aqf7bcw41nwh4kvvpsfncjny2fwcv3vv7zlyj2px2" }, "stable": { "version": [ @@ -21411,8 +21410,8 @@ "popup", "request" ], - "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", - "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" + "commit": "2dfdcdbcd8eb81c3fd631372d7dceb4f432d5f1e", + "sha256": "19j7r14qxh2cl4zi4vssbbqjhp6r53gjavnwyihk52llxcgrxrr7" }, "stable": { "version": [ @@ -21613,26 +21612,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200419, - 2017 + 20200513, + 2326 ], "deps": [ "parsebib" ], - "commit": "87920ab793e6e854903eb101b80a0746f588dab6", - "sha256": "0mw5spmjn8yyjbdpas06rf9cmfsfa3k2z0yfrs7xvmaalpxz55xm" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" }, "stable": { "version": [ 2, - 22, + 23, 1 ], "deps": [ "parsebib" ], - "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10", - "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" } }, { @@ -22409,8 +22408,8 @@ 20200107, 2333 ], - "commit": "9b17c3a0033d7a4dbcfb48e8fbc50a0d5e073057", - "sha256": "1f3sz0wfx60qv9b0ciqiwnvz46f8xbpnb5x3c9531mfccfhx71ix" + "commit": "1809fd4c001a4ae2fa5e2b721b67c1059fb8e9b8", + "sha256": "0ssh0chavas524jwj3r9bywkd8rgnbjz4xcgxhbnjfcl786pmyw7" }, "stable": { "version": [ @@ -22430,15 +22429,18 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200507, - 2251 + 20200516, + 1013 ], "deps": [ + "eldoc", "flymake", - "jsonrpc" + "jsonrpc", + "package", + "xref" ], - "commit": "bb51d47dd6e59e5bef1bfb393a39a73a7811d0ee", - "sha256": "0rs15c1biaqjpkxx32dc59w1z9gnd31n13qb80gb9ib8li1cgnr1" + "commit": "bf75312b8e7ea5136905d7a55a6d705b51b2b6c9", + "sha256": "1xbisdraj04jns0vcpcvnqqiwib3b8jpbian1nnmllvscfdz6c7l" }, "stable": { "version": [ @@ -22461,28 +22463,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200508, - 1552 + 20200514, + 2034 ], "deps": [ "eglot", "julia-mode" ], - "commit": "65c70b8203684a34de16868583e2424de41b9ab6", - "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" }, "stable": { "version": [ - 1, - 3, + 2, + 0, 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "65c70b8203684a34de16868583e2424de41b9ab6", - "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" } }, { @@ -22555,8 +22557,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200508, - 1712 + 20200514, + 2040 ], "deps": [ "anaphora", @@ -22567,8 +22569,8 @@ "request", "websocket" ], - "commit": "e39a48334607cacd42011f21fa56ebf291258a1b", - "sha256": "1fk9aryjwh88jmb2a45rs0z7h6sy4r53h1qpairl5bi1jllgg3lb" + "commit": "ec3aa36bf37a78e99723563e38f81ee24b855524", + "sha256": "0pr14dv4bbxgpki8kd1z9i07x1khb0v2wr82483qf3hhqafv6lrm" }, "stable": { "version": [ @@ -22642,8 +22644,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200502, - 36 + 20200516, + 1604 ], "deps": [ "auto-complete", @@ -22652,8 +22654,8 @@ "direx", "spinner" ], - "commit": "4aca86cea6b3120b10af52eab26cefdef2965574", - "sha256": "07gn75njy0hmiddymj4khw59mrnzwml0dqpzm0g5il697v4rpqgj" + "commit": "b02e0bbc6df08a4ae44d16ac57886e56cfb8095d", + "sha256": "0vs4kcdval7klzbs21jq2rcxs013r7rskpxgjc7lrq1qrsgyyq9d" }, "stable": { "version": [ @@ -23126,11 +23128,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20200510, - 1521 + 20200515, + 1905 ], - "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", - "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" + "commit": "a76712621a4851fdb0bc3d76f454898afefedf6e", + "sha256": "1jc6l0pcsyv9wgp58ij9wvjj4x4a3zz4svsna2aq86pf8bbbyng9" }, "stable": { "version": [ @@ -24178,20 +24180,20 @@ "url": "git://thelambdalab.xyz/elpher.git", "unstable": { "version": [ - 20191212, - 1858 + 20200516, + 1232 ], - "commit": "c9175aedfaf3daeca6b2414f74ef703f2f6cbc1f", - "sha256": "18jps4rn9nmjxlkg2849rh7bp7pg5zfx7yhhmq078jkvnygv3m2l" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" }, "stable": { "version": [ 2, - 5, - 2 + 7, + 1 ], - "commit": "12629c283e0e3e62561d1456a2f8842b3524df57", - "sha256": "023ih6bgqf98jgzqy03nplwxhabaj9x9dqk3c8bmd50ndgrspc7q" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" } }, { @@ -25294,15 +25296,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20200503, - 836 + 20200513, + 1627 ], "deps": [ "ht", "seq" ], - "commit": "20d4fc0ea45a53f7edbe99c83317a3e048e398ef", - "sha256": "1snlx70dy8kjknrydbpf3vkrdrzwsy0mb5vlj273vhm3nmjbs2mg" + "commit": "dfa3c6d060914c6082d6837da32df0c337330ee4", + "sha256": "0m963cn916m0xa8cb1yslkcla86a34dchwy3ism62a2r9swa7p6s" }, "stable": { "version": [ @@ -25813,25 +25815,25 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200510, - 429 + 20200511, + 2235 ], "deps": [ "cl-lib" ], - "commit": "8165a5f1e0190a45029d610dc442c9eaa6e82c11", - "sha256": "0icrrps06j27v69pqglv3j7h4nc5mpcqqwziasv403lpm4bb8hcz" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "0a820043490c47c60d2fc968a5120308eea3d7e7", - "sha256": "1427hlavz6j232clrh4vbgwjahm328kvj7hls3s6hziicf2kdczx" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" } }, { @@ -26150,14 +26152,14 @@ "repo": "mhayashi1120/Emacs-erefactor", "unstable": { "version": [ - 20160121, - 959 + 20200513, + 1252 ], "deps": [ "cl-lib" ], - "commit": "bf68085e5635eb94fd85709f8e1355c1f5534745", - "sha256": "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng" + "commit": "bfe27a1b8c7cac0fe054e76113e941efa3775fe8", + "sha256": "1071gqli1qd498syhysyj2wzyw1nya5070m82xd9qalqdh11b8is" }, "stable": { "version": [ @@ -26235,18 +26237,16 @@ 20200313, 1030 ], - "commit": "9639877ea11d6a32ca6e46410b8a48db245b72d8", - "sha256": "19sdribjxzn13drqv0jcjwbmddkjvnm1iyx1njdlfaaq0625q8w3" + "commit": "e5d476b5f22927d341caf1774355d9e69e390cfa", + "sha256": "1kcdl56qybvq4m5dp65n3nbg6xijb793xi25yckk5nc17n1nwrzb" }, "stable": { "version": [ 23, - 0, - -1, - 3 + 0 ], - "commit": "9f17d424ada5353db1e5b31296484d95679f8ca8", - "sha256": "0012fbf9a1whq2bzii73m645bvf4vww403fcd54j9k27916vcfx5" + "commit": "7a8d04dbcb388a5d837a213ad249c1b96e19e998", + "sha256": "0hw0js0man58m5mdrzrig5q1agifp92wxphnbxk1qxxbl6ccs6ls" } }, { @@ -27036,14 +27036,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200503, - 1654 + 20200516, + 522 ], "deps": [ "julia-mode" ], - "commit": "2e7d36dc9b500ce21c5cb8534ea573669f93ee0b", - "sha256": "1kjpgspjpipirc48acb3d6bfsrmd8yrz35ck1sx0id7y8nni1d8k" + "commit": "8f04fa92a11cdb4a3777755fdbaaa65e076f04ef", + "sha256": "10cg90aqlr5y3vmp94zhkwj3l178l9f32igpl38bzxm9hmdgikfr" }, "stable": { "version": [ @@ -27368,22 +27368,22 @@ "dash", "paredit" ], - "commit": "0fe2d3fa0fd1739ec096f149dc067b586e05c75c", - "sha256": "0gswgn99pqikw44mp4v6b4bxvh6bj132gq5x3swvkmi3f56l0bry" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" }, "stable": { "version": [ 0, 9, - 6 + 7 ], "deps": [ "ace-window", "dash", "paredit" ], - "commit": "7e2b42570b449b2a3c2922f3036a027d1e393a60", - "sha256": "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" } }, { @@ -27492,16 +27492,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200417, - 1238 + 20200516, + 1740 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "d243eae8649272799ec3864fde14c1164f036940", - "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -27526,15 +27526,15 @@ "repo": "emacsorphanage/evil-anzu", "unstable": { "version": [ - 20170124, - 718 + 20200514, + 1902 ], "deps": [ "anzu", "evil" ], - "commit": "9bca6ca14d865e7e005bc02a28a09b4ae74facc9", - "sha256": "1y0jiglcazxnvggs5ljys2iizljsihlgr46svbbwgf45ibdrw392" + "commit": "d3f6ed4773b48767bd5f4708c7f083336a8a8a86", + "sha256": "0ribvnw2slaad4xlcyxhg3linvd810qqn52qpyrjsq0dnqrpmwyl" }, "stable": { "version": [ @@ -27695,16 +27695,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200509, - 853 + 20200513, + 804 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "d062cc206d671fb5aefb1e0e679a9cb1d6c73e33", - "sha256": "1zizfqmfrxx3shgggwa74rg2qqbrs8704wf94ajx0k11dbm1dbrp" + "commit": "e998952dfe73d296259905e1bd8f96659bfe2661", + "sha256": "1r896jbshniaxxh15iw87yklnr2hq5as3a8w6xb202gxz5pvc4ym" }, "stable": { "version": [ @@ -29029,8 +29029,8 @@ "deps": [ "evil" ], - "commit": "d243eae8649272799ec3864fde14c1164f036940", - "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -31410,8 +31410,8 @@ "string-utils", "tabulated-list" ], - "commit": "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084", - "sha256": "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic" + "commit": "5cddb64e0d52635e9a1529d80cb5cefa6f829341", + "sha256": "0kl2b4j93kk9lzw0qclib55ghcwznag3p022jkr0bq5z30m2gdj4" }, "stable": { "version": [ @@ -31944,8 +31944,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200509, - 2127 + 20200516, + 1719 ], "deps": [ "dash", @@ -31953,8 +31953,8 @@ "pkg-info", "seq" ], - "commit": "33db306f3b8733592c170a5f7d7445465f47c10d", - "sha256": "0pl0ywg2aaifhj5gzj3ka5pklbbag2aa28gn7faaqwjhkknbka8n" + "commit": "309d37286729994094b931344c9a664dd7c6c08d", + "sha256": "1gsa4lik5f0dzn897lh369nmcn7n61if80ll5jc5qiymm1fx16cr" }, "stable": { "version": [ @@ -32821,25 +32821,25 @@ "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20200510, - 1334 + 20200515, + 1120 ], "deps": [ "flycheck" ], - "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", - "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "flycheck" ], - "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", - "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" } }, { @@ -33697,15 +33697,15 @@ "repo": "flycheck/flycheck-pos-tip", "unstable": { "version": [ - 20180610, - 1615 + 20200516, + 1600 ], "deps": [ "flycheck", "pos-tip" ], - "commit": "909113977d37739387c7f099d74a724cfe6efcec", - "sha256": "0rfbhvl8n656a9d58bjyzki9r3si3ypylbyjn67rnla4jzzi22v8" + "commit": "dc57beac0e59669926ad720c7af38b27c3a30467", + "sha256": "15h4m5cfk0vh1g630vlwfxmcpa1jdalrrldnvijsqla99mb2jm1w" }, "stable": { "version": [ @@ -35317,8 +35317,8 @@ 20200215, 1408 ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35345,8 +35345,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35377,8 +35377,8 @@ "flyspell-correct", "helm" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35402,15 +35402,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1503 + 20200513, + 708 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35441,8 +35441,8 @@ "flyspell-correct", "popup" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35999,15 +35999,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200422, - 1731 + 20200513, + 1930 ], "deps": [ "cl-lib", "language-id" ], - "commit": "c157b57e963da0b44a079b0477d6c742e9c5a10b", - "sha256": "15pqff80ydcvkvbiyi50aix5mnwgrhvvajk60i6cwgkb2xghs20r" + "commit": "0227e1aadeb18db397f03368d54cbefe4afd6112", + "sha256": "0p04xgswp269a17jpiwpj8qfj3c2zvkmr4vn0wa1dfrw5f5bfj2x" }, "stable": { "version": [ @@ -36144,14 +36144,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200416, - 841 + 20200516, + 624 ], "deps": [ "seq" ], - "commit": "5998d977ca84930e124558007dc65370164ed960", - "sha256": "1hmc3pacscr0f02cw6hbbv444k07k5gf1909lyz8jpfr5r5wi2in" + "commit": "83d308b6fd26662bc8fb204c4d634616e03dca44", + "sha256": "0a068qfc969bvxyynrk2yakv2l3y31snnvcpdsbxd4m4m6drv3lw" }, "stable": { "version": [ @@ -36737,14 +36737,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20190611, - 1350 + 20200514, + 1516 ], "deps": [ "cl-lib" ], - "commit": "484d564b5d2a5e6dd9c3f522b35cfeef2164c437", - "sha256": "105x7mrip5xbyhimgqx1nb0lkyi68j5fpfhc6y0dzm4c4bf77jfm" + "commit": "68f6eeb3adbc7d9f71d24761600bf8538775c969", + "sha256": "16iz2wf8bn4mjcgbc5vj50snlgiqqdc495kxbd9mcld5rjhfs45q" }, "stable": { "version": [ @@ -37289,11 +37289,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200510, - 1813 + 20200513, + 1219 ], - "commit": "95950e3bfb8407f8925dd8717053bf688bb4df7d", - "sha256": "03jhqzd22swyvg1ry4b4ssvyjqqq5sqh0xa9q3zs7cgm9jjhxbkg" + "commit": "7a39c8eb7ca2a0a4fe0ad307ea55578e11e6dfdd", + "sha256": "09lv9ixgrkb351nb67nas5yfa8vk0rz4ljhc1hxxn4g451hbd14f" }, "stable": { "version": [ @@ -37331,14 +37331,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200425, - 1425 + 20200516, + 50 ], "deps": [ "cl-lib" ], - "commit": "42e38034cd2305fa7432866323c923979d8f9b06", - "sha256": "0aalp4x5gp0yhv037ymspsj4n3vqzxld0c1nk8ihl50k6krl4kxy" + "commit": "a0b17d207badf462311b2eef7c065b884462cb7c", + "sha256": "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv" } }, { @@ -38113,8 +38113,8 @@ "transient", "with-editor" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -39198,11 +39198,11 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20200427, - 1637 + 20200511, + 2146 ], - "commit": "8a273c9bfa57776b00095a648c2aa053cc418e91", - "sha256": "0msd5ffvhd44m129i03f04v7x6x0l667nxi435c4kp6m8h0za603" + "commit": "5239c1ba873eb907d5665964820b4a7ddbf75b5c", + "sha256": "0yp1hq849drkkbypaaak36i5s1q9ff549w21qswmi60nmiikabsg" } }, { @@ -39526,8 +39526,8 @@ "org", "s" ], - "commit": "053a4303b8e9d3b8a67fe58e6f87ba6c76c90a97", - "sha256": "1lygfkgmzvy7iwc8d55j6ypfhf5wfybch1ksqcndyjklhd2n0v5j" + "commit": "c5c057263ecc86f60b62a1e811e63cfb1c394c15", + "sha256": "1rfkc6pp2kkin87hbjz1192hb6hf24ygiyd6zigs3bfaxja313rp" }, "stable": { "version": [ @@ -39547,20 +39547,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20190423, - 1146 + 20200513, + 1038 ], - "commit": "d9375cfad0054a05c910c1210f0f37aa601aebba", - "sha256": "19ggfisfxq2bk62axdi0nipwxymrvnnvmijcrwc9yglbnhiigdb5" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "df85e5810c02f613bfa6e236674de969d6e00ae1", - "sha256": "0hvsp9y0vzcr9c2wglh0wdavjmp2n2hbhlsr1bfvnfxk97ka0y5r" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" } }, { @@ -40488,8 +40488,8 @@ 20180130, 1736 ], - "commit": "95d408ee1120e7b7a32d9e79dbdceb77e5787b7f", - "sha256": "05c7si8hp1n2jhcknab4qkdv9wkzpzb7355vr4cvh6l5aqi4qryr" + "commit": "7a59e424c8e641605e30eed68197859533ea6aaf", + "sha256": "1w9hf7bcdd5ddjavhj0ggnxipf5f5w3cfj52n9i46jmm6g2x2b5g" } }, { @@ -40851,8 +40851,8 @@ "magit-popup", "s" ], - "commit": "d3d5c59428e3f27a166d29641651b68690ba41d3", - "sha256": "1ixzjcca432xsi3f8pd7hs7js63xh84h3472xnd0qjk97bxhn995" + "commit": "0c56c1e833bc9e21b603539a19bdfe4836a197ed", + "sha256": "0iaa34hh0zpy9alf0d6bad7qwk565l9k5k09ig342pwnmigz1scs" }, "stable": { "version": [ @@ -41665,14 +41665,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200505, - 852 + 20200514, + 740 ], "deps": [ "autothemer" ], - "commit": "6e2fcbdb0608e6381ab86287ef84451d672bd3ef", - "sha256": "1z3dl9d6v1bl6b7mai8b6i8i2ywxjzbmfqjdhanb926mrkn5h22k" + "commit": "f1dfcd8bd50e4885cab71b174bbc6a620c2b9d7f", + "sha256": "106vkpm75s3s52bkmcnjlw8gx3qlh5hffwvj2bvkmqfcgnxpzgx0" }, "stable": { "version": [ @@ -42571,19 +42571,19 @@ "url": "https://git.spwhitton.name/haskell-tab-indent", "unstable": { "version": [ - 20170701, - 958 + 20200513, + 1950 ], - "commit": "b921c076c10ba996bcfb3b38654363d30567bfa5", - "sha256": "046wiccc4kg81jcqmxzxh5karfbdg2z1d8i4nzcbz7q3n27x0l5f" + "commit": "0482f0de774c58bd7f2e079f5bf01781eed709a3", + "sha256": "05hgxrmsrmg5i50zxs7pa2xnfn2sja09hdk8xjsalnbbjvn4mmxx" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "6d3b878765b9ef7a4b2c1f5dfd47309d4ab7c419", - "sha256": "07pcn244alqaiqwj9a5jcyh4hp5n71bsnhpilqy3xv0sn6ci1v2q" + "commit": "1127f46eca40a48be9cd2380df2cfc5f0b694e63", + "sha256": "13c2z1i7icpwv60njn83qbla9i0qlq3m0yz88ach1mlvmsdfj9jz" } }, { @@ -42851,16 +42851,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200510, - 1345 + 20200515, + 715 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", - "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ @@ -42974,14 +42974,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200510, - 223 + 20200516, + 613 ], "deps": [ "helm" ], - "commit": "429d3d9d8d90d3b7e8d35032c42206e930f9e481", - "sha256": "0kl6x6igbynzl1x36nqz5wyrqq4wchw2qpvp3lm80av6bncx6i2s" + "commit": "ae1dbefa151544035272d04e56e0147185a847c5", + "sha256": "03q29x63v500b3h4mj99h619ayifb12rrqiyyihm84i9lmgp5r28" }, "stable": { "version": [ @@ -43126,8 +43126,8 @@ "cl-lib", "helm" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -43733,14 +43733,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200504, - 544 + 20200514, + 644 ], "deps": [ "async" ], - "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", - "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ @@ -45826,8 +45826,8 @@ "repo": "alphapapa/helm-org-rifle", "unstable": { "version": [ - 20190809, - 1831 + 20200512, + 1943 ], "deps": [ "dash", @@ -45835,14 +45835,14 @@ "helm", "s" ], - "commit": "abc14bb85427a6585aa354894eaef6926881d585", - "sha256": "1ggj84b8wgd8xj6a442wfccvyaqg605zpikx19vqzwymaqbay85f" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "dash", @@ -45850,8 +45850,8 @@ "helm", "s" ], - "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", - "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" } }, { @@ -46057,15 +46057,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20200118, - 2302 + 20200512, + 1146 ], "deps": [ "helm", "posframe" ], - "commit": "7970f9397ba7d148e590e4ffb340bf6c7c0602fc", - "sha256": "0106fsdzp3911spylrixqkgpnjnfg491f0rmbqmn4hc1shnc2sbk" + "commit": "b107e64eedef6292c49d590f30d320c29b64190b", + "sha256": "09y98ij4wkqh771ahwi3b7nsg6yb2b69n94v3ad41kp4q0c2rscd" } }, { @@ -46906,14 +46906,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200321, - 231 + 20200515, + 417 ], "deps": [ "helm" ], - "commit": "069dc0b3970f1e796e34b7789ae51b1b7979ee30", - "sha256": "1jf1573r8v4mda1xiszrz51qarb1ii31cyk0v3ci16bi9dpp8swb" + "commit": "2efc552591102ab8b4408ad60a3c4be991bb8e93", + "sha256": "0fbahbcgdcbmnhv3m2pmxy8n01qab5x0468bikygs80krch84qh5" }, "stable": { "version": [ @@ -47070,8 +47070,8 @@ "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "55e56975fe1456591a293bf60c183c3dda9f788f", + "sha256": "0py1k0r15frj67mazfjkdwi8sx5a51ykrrbzvfb73kakq2f55jap" }, "stable": { "version": [ @@ -49526,14 +49526,14 @@ "repo": "conao3/iceberg-theme.el", "unstable": { "version": [ - 20200510, - 552 + 20200515, + 934 ], "deps": [ "solarized-theme" ], - "commit": "50dc87567d450e32f91436badf25b45708126edf", - "sha256": "0r2v3x6gsqvvky66qcdzc7z1b4nj8wdz9nzhag2qv683sh1g82mg" + "commit": "9615307cbd37e698d6939a04128162ef893313cb", + "sha256": "02lsbzk5215z1rdvs6idnv2yff2487i4pqi1ljdjfn3g43ly5lr2" } }, { @@ -51177,19 +51177,19 @@ "repo": "dieter-wilhelm/inform", "unstable": { "version": [ - 20200510, - 1325 + 20200512, + 1351 ], - "commit": "9f9b98ead8aea4a50faf2bb4d60b28cab521c70e", - "sha256": "1i7ki31acn3y1mvsyn0rcnipmbj72n6s4n2fp8zy6228ss8kan18" + "commit": "54e0c51960c7f50de31a6831c034ea6adc5a8892", + "sha256": "0j3hc3f7yx9dklbvvwpcq0d2n3lp0z47l5066ngvmm52aihhhiyd" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "3f0c6e05964ba65e6f452bf043feb1f0b9fd3eee", - "sha256": "0gmj64zskb7misz1l7ymjlh984l8ykp7g93vrjm5bq7xmg2726bx" + "commit": "5e096549632b2691fe1f975394d07a31cf603fc6", + "sha256": "0bs0z957cs240cacl3bl72dp1sqcpd0j60yrv972w6p1j9v0f3rn" } }, { @@ -51354,11 +51354,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20191218, - 2038 + 20200515, + 421 ], - "commit": "8b648afaaab5eaddb7afcd602b8a76cbfb12412b", - "sha256": "0zfv4cnj11i7lagfyqmy4ch01szj450458yqffjn84hfikbf4q78" + "commit": "0f289a3f465728ed41d532674166eef09ac7209b", + "sha256": "1bchvrmmcbw8ird7i1klz0ds2xkfmwccz2pp59ixgys0j8cxnq4b" } }, { @@ -52132,11 +52132,11 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20200510, - 1355 + 20200512, + 2111 ], - "commit": "e2d8622343cb4bbbd6211533007eff2f417034eb", - "sha256": "1808dsc2zyzsbqm7zkz0zkpidgkw0vz8klmy2354ggjhb1klmxwj" + "commit": "b87c1e8ac50f728e8d33b5b69bf4124ef90b88ba", + "sha256": "09yasj1vfakryjvs22a3gd27wwa866b2pkvajwp8hlngk11sc3p3" }, "stable": { "version": [ @@ -52211,11 +52211,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200504, - 1931 + 20200515, + 1845 ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -52243,8 +52243,8 @@ "cl-lib", "swiper" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -52525,8 +52525,8 @@ "hydra", "ivy" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -53892,11 +53892,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200510, - 1041 + 20200516, + 1606 ], - "commit": "8525416b6d166ea022192e6f694c8405edc94160", - "sha256": "180rlz6fzb947kxwpp37v244py5fapxfiag4ipxmf3ld8g55g3mn" + "commit": "85214664a9f20faab7c45087b28bedd0feabb560", + "sha256": "0kvi1cqn4hdcs2mc4lsddy01yyixvm2ykqq6j4yb9h07lixrxih6" }, "stable": { "version": [ @@ -54626,8 +54626,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200505, - 1504 + 20200515, + 2010 ], "deps": [ "cl-lib", @@ -54638,8 +54638,8 @@ "spinner", "vterm" ], - "commit": "e2f1e60098b1a2b3e166130e989489f7b845f8e1", - "sha256": "1l9w8404jwj6dsr9q4zx5ij6mbyp9qyj8116hs83s6jxgidi6fp6" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" }, "stable": { "version": [ @@ -54647,7 +54647,7 @@ 0, 0, -1, - 3 + 4 ], "deps": [ "cl-lib", @@ -54658,8 +54658,8 @@ "spinner", "vterm" ], - "commit": "483d088853584a9f1603a062bce5705f0a7d99fe", - "sha256": "0k3lwq6r1y23gmlqx7a70psgzncf4k1zcykc7plzl79xas28rbrz" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" } }, { @@ -55549,11 +55549,11 @@ "repo": "chuntaro/emacs-keypression", "unstable": { "version": [ - 20200114, - 750 + 20200514, + 822 ], - "commit": "9ce977dabd8355ebe35d9d06821e4edb09060d2b", - "sha256": "0wrm5k1a9j90qqfx2w844nc9xd9a70x9krp1x3qm4zhal6mf0kzn" + "commit": "1e00bbdb451fd88bde9917526fd0b13b2a1bd26c", + "sha256": "06j8pqss8izhyahf0nw95mg34lbclhzk4f5vzfg35qcmjmbmqzg6" } }, { @@ -55842,8 +55842,8 @@ 20180702, 2029 ], - "commit": "db44e647c5e51251f0318b9b14e2c194163b4929", - "sha256": "19y8y66x4r4xmi3l1w79rp31pw17mmrxc8vcv6c49hd3js9jrx06" + "commit": "c0227c5ce4011033b5f0cf2815c352d123a13305", + "sha256": "1l3fjljm7abk29ibbbvds7nq72yqrgcsy5bv42s1czbffw62zcn6" }, "stable": { "version": [ @@ -55865,15 +55865,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200503, - 2312 + 20200512, + 1321 ], "deps": [ "cl-lib", "request" ], - "commit": "7fda4115d5f762f9a2c1db10406ab2562119050e", - "sha256": "0pz2gzf7czh0jfwal1bzpx3vi1iqycbv9s3nmb2z8i497zg42gw7" + "commit": "dd02284149027694e4cf16d6f4daf1f6dd011249", + "sha256": "0zhg9467id0jd516hnz4c6aqmjp5q1s95fkhjxbk3g9j11cnfjf0" }, "stable": { "version": [ @@ -56405,15 +56405,15 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200508, - 437 + 20200513, + 1043 ], "deps": [ "eglot", "math-symbol-lists" ], - "commit": "f54599fe7656515320bec1e5e5fc16f7ee9c7a64", - "sha256": "01wvq0lpmsqffp1vxra4mj2g75k4lyblsb5mn0acwhhni369pa28" + "commit": "a3d4ae8863e268c88664ce869e9469c8a42d2e05", + "sha256": "1v8w70x1jnald6k22ipa7d9z1ggcf2imr97wbw3i48dp4iv21zqd" } }, { @@ -57362,11 +57362,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200505, - 1811 + 20200513, + 1742 ], - "commit": "f25e4011fc30a35983ab08041f4e972daad4b106", - "sha256": "1vvqlmwmpzhqkhawabhvl6ns5083fk9g5ya7zzzrgqm7fxljnp16" + "commit": "afda2d80b0bc98d431a3ac7c1563c76b8ace3a65", + "sha256": "0fapzkjnm3w4fgc5464a9bz2sld3m81zzls7sy4h0yxq9rpb284d" } }, { @@ -57514,11 +57514,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20200223, - 1431 + 20200515, + 1759 ], - "commit": "6c3b89276a149b2d009882f756a9edf866671f05", - "sha256": "1r59bw0dggjf6ry2vbl0vddd5hxxh1mshr5h2bk9z74gy04cfi4y" + "commit": "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a", + "sha256": "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f" } }, { @@ -58958,8 +58958,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20200509, - 1700 + 20200515, + 2152 ], "deps": [ "dap-mode", @@ -58971,14 +58971,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "16d7568f1a7993d32319002a3880af8dba97cc8d", - "sha256": "0yqdzkw6nd97x0llsbf1aay50xz8k955kqjd8850vmd5x8kza117" + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" }, "stable": { "version": [ 1, - 8, - 9 + 10, + 5 ], "deps": [ "dap-mode", @@ -58990,8 +58990,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "922389a2cc849852246c9f7e8bd7da1a907172d4", - "sha256": "01zqwqzkf6ib6b2wb306kyc6vm9xdjbxd65aa23n13a6kzk6c9m9" + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" } }, { @@ -59158,15 +59158,15 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20200408, - 1412 + 20200511, + 1444 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "9f158a290168149fd301a1c1c2016600106ad5be", - "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" + "commit": "b342e5f74f9b815d2a7db9fffee7b9c46850d293", + "sha256": "13haa9jvcq6wvj8g1bnqrrczg1j50lwk41pr4n7q0i7313r8f89v" }, "stable": { "version": [ @@ -59220,8 +59220,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200511, - 424 + 20200515, + 2000 ], "deps": [ "dash", @@ -59232,8 +59232,8 @@ "markdown-mode", "spinner" ], - "commit": "232dd55a9790691a1598150c2396e8d4256a59cc", - "sha256": "1h19fda1p9cqkdqsjkvmnjf9wmj1xmq6c897fwi150qkknic2zjj" + "commit": "17614737b6ae881d0e94ad6f0b87a01950062dba", + "sha256": "0zh2mllm7n3gj0w5rn4y6491kx361mrf6w0fa46jgdck26fkazfw" }, "stable": { "version": [ @@ -59375,8 +59375,8 @@ "cl-lib", "lsp-mode" ], - "commit": "324a0bf50be2ebbdafcfb532c573ac22d5170d10", - "sha256": "08ysclhww0jc9fbxqn59qy05m4nsfgdgjzdb7pwfxp27p5c282a4" + "commit": "97ad997c6c2e3bc8d12c02b2809960d47ad316b0", + "sha256": "11jad58shbrxd1r2r4amlvddx0qlx3ikbmq598sfwz2253ndzny1" }, "stable": { "version": [ @@ -59469,8 +59469,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "ab55e306af9dd9eb62fe7463e4e05d948ad3dfc6", - "sha256": "0z0pgp25hac6m2c58im05cqdyj3383672b3hnirxl5ky45c4rvhn" + "commit": "271b47cb33f11915295911f7cf8575f8a82a5e1c", + "sha256": "181j9anm3h5sfallls3sxik6cd7dw1fbi3q9mlfhk979wk6varjk" }, "stable": { "version": [ @@ -59498,8 +59498,8 @@ 20200508, 1316 ], - "commit": "a3a71b155ab63a64c077a48d1f83596b388bd564", - "sha256": "1k7i7vwn7nnia9dlgh7d3gqyzmvf1i3ipjlbfw8lwcdlzsly940y" + "commit": "35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c", + "sha256": "1bwyyp9fbvy0p4f3mmbqc0plxrcm0ag2r3zb74gb5k2vcxi2vdw4" }, "stable": { "version": [ @@ -59916,8 +59916,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200503, - 1905 + 20200514, + 1330 ], "deps": [ "async", @@ -59926,8 +59926,8 @@ "transient", "with-editor" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -60254,8 +60254,8 @@ "libgit", "magit" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" } }, { @@ -60403,14 +60403,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200425, - 2044 + 20200513, + 1503 ], "deps": [ "dash" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -61277,11 +61277,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20200509, - 1525 + 20200514, + 16 ], - "commit": "f47a2e9796dfdde6fae7920af23647fe027dc34e", - "sha256": "0rz7gk7hwvi9ialkhbvh7lmxvjks1yp9ihrdx2kf4k3jyf1sb9s9" + "commit": "705c77b9533970a425b09fb4c2fabf3b406117c7", + "sha256": "0i40pp0157azw2jkkr08f4cbal9ansp9dbscdbdzmlp9lf27kqjs" }, "stable": { "version": [ @@ -63058,11 +63058,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200321, - 1331 + 20200511, + 2052 ], - "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d", - "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684" + "commit": "1cad46fddf741ed7ec5fc477d70e079e908e9ce6", + "sha256": "062np4d7blbwjc1kciqcp6hngmwr8i540zsv5f8p2qki4804b8ng" }, "stable": { "version": [ @@ -63100,11 +63100,11 @@ "repo": "Mulling/mlso-theme", "unstable": { "version": [ - 20200329, - 1516 + 20200513, + 1751 ], - "commit": "a4bb7b55ce81d8dcc0ad8d92acbde309c7cc1ea0", - "sha256": "15fmzsf5rpgx5f1fr45j24hgzmz95zxkj1jihdb64p049ak2h5a9" + "commit": "059c5773403b73a14a1b04d62d1d5b077a3f6e06", + "sha256": "1a00mybf269hlfzfhpcvlkkqgwck73hz5w1qsspg5w9w78qlymkn" } }, { @@ -63495,11 +63495,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200510, - 1103 + 20200513, + 601 ], - "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", - "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ @@ -63519,11 +63519,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200507, - 1718 + 20200513, + 601 ], - "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", - "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ @@ -63821,11 +63821,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20200113, - 2321 + 20200514, + 1946 ], - "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", - "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" + "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", + "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" }, "stable": { "version": [ @@ -64504,11 +64504,11 @@ "repo": "cdominik/mu2tex", "unstable": { "version": [ - 20200506, - 754 + 20200512, + 704 ], - "commit": "fef2f2390c002e21811375ce4d7a1c7a308248b1", - "sha256": "1119l71z00syg0zcp330z1757hjf0p06cwc8a4id6alkmbk70jba" + "commit": "4b84cdac955cb36a8c44a2be48f3310252e3d3ad", + "sha256": "05rgx0nb028k1kmb9gbv4b0s20ksbjl0nksyrva2zpvd7xc1nyz9" } }, { @@ -64786,11 +64786,11 @@ "repo": "manateelazycat/multi-term", "unstable": { "version": [ - 20200112, - 533 + 20200514, + 428 ], - "commit": "7307ddd456db44045206253e5a905d3d8c143d5c", - "sha256": "0cqq6y7whx4zwwd8360vdmbvsmkrvmxnn7cvz6hafrh5mrcfqmvn" + "commit": "017c77c550115936860e2ea71b88e585371475d5", + "sha256": "043dqd8i8h6hbcg11rzprxin2yq5lb902zlrb7mxah44vyp8wrdi" }, "stable": { "version": [ @@ -64912,15 +64912,15 @@ "repo": "matsievskiysv/multistate", "unstable": { "version": [ - 20200506, - 1536 + 20200514, + 2206 ], "deps": [ "cl-lib", "ht" ], - "commit": "e1175bae0cac6c16e3533c7e82347f0f15796afa", - "sha256": "1qv3n2bhw2jxc9bg0q4c3mpj19k97bkp4zp78r1k3b6r1is7bjgb" + "commit": "eadd0df2745bf10500a9ad4ee8f66f3cb470bef0", + "sha256": "081rangw4iqk1lcahk01skh518ljdp6g4ww7zydjr813x7jzv2kv" } }, { @@ -65869,8 +65869,8 @@ 20161029, 2023 ], - "commit": "ae60dc55822ea1715b203775179080c5d62700d8", - "sha256": "0q46r9r2vc50vn3bh321l317lgbbmmbylhgbxllbjpyaidfqzvb9" + "commit": "f5fe5832889d7b6eab7d45724e051f4edbe1983f", + "sha256": "15ljrcmmpfwqxvci0ilmn3xgjxj19wq638zvij0wh2g0n6nil6xx" }, "stable": { "version": [ @@ -66292,8 +66292,8 @@ 20181024, 1439 ], - "commit": "9a77d919525a6f844a5c18a1bcf2c2eeb9393ad7", - "sha256": "1x5qwp8f12szfvw0x0qxlfz4ds0z9nc7fmsaaqqhsj9p2yzvkcd4" + "commit": "c6148b0c3377a7d12b679f99f35e09cc7f36e940", + "sha256": "088znrs8hygsfx0ndqhpfdgra3l3jf6dyfwz2l6h4s7w4kc8mlnk" }, "stable": { "version": [ @@ -66391,20 +66391,20 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20200510, - 212 + 20200515, + 410 ], - "commit": "32b013cd622a37cd553c8899332064397c90105b", - "sha256": "0cg4kj8g08kiid6w5n55kc7kffl8rhccpa4xgs68d13isd70fdv2" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "2f4bd0f09c829c2c5f49be2c5455352eaa4c2e3d", - "sha256": "04xpgg9nba5m1bl7ci5l456whcb8nfhsbvgxyx89bp0zqgr005q7" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" } }, { @@ -68660,10 +68660,10 @@ "version": [ 1, 8, - 1 + 2 ], - "commit": "05bf3e4b39b765658a5be95d1db2a30084d1f564", - "sha256": "0h4ysh36q1fxc40inhsdq2swqpfm15lpilqqcafs5ska42pn7s68" + "commit": "9e26c0a2699b7076cebc04ece59fb354eb84c11c", + "sha256": "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3" } }, { @@ -69731,14 +69731,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200510, - 1834 + 20200516, + 1343 ], "deps": [ "org" ], - "commit": "ed99f7e38dd687800fb898f8934a0da0541ebcd9", - "sha256": "1pb9l4gxjm8bfw2xny06iwbd7yfvdjxsvdj4lydpa0z0kgdwd8cs" + "commit": "3ce2a33b81ce611695ad74bf21cb911ef90d9a1a", + "sha256": "0br8mqhxfx9pf1nslvlqk4x5rdlpjagixi6il0i0xpxhca7z3fya" } }, { @@ -69836,14 +69836,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200427, - 1413 + 20200512, + 2102 ], "deps": [ "org" ], - "commit": "e8b4ba8a10b8f356a712a75a87f1fe38dac32d9f", - "sha256": "0q505lxzakbv524ychswhlp650fym86l9j0sjsh7idasnz01sc2q" + "commit": "1dd73fd3db0e9382fa34d3b48c8ec608e65f3bdc", + "sha256": "0wfl416hd7f42j1fidap0f9zlcm3vhgjs12k99k672fggl0459h1" } }, { @@ -70501,28 +70501,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20200509, - 1615 + 20200516, + 1339 ], "deps": [ "dash", "org" ], - "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", - "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" }, "stable": { "version": [ 1, 3, - 7 + 8 ], "deps": [ "dash", "org" ], - "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", - "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" } }, { @@ -70557,20 +70557,28 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20200413, - 1609 + 20200516, + 1343 ], - "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", - "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" + "deps": [ + "dash", + "org" + ], + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" }, "stable": { "version": [ 6, - 1, - 3 + 2, + 1 ], - "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", - "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" + "deps": [ + "dash", + "org" + ], + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" } }, { @@ -70636,14 +70644,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200424, - 1917 + 20200514, + 1648 ], "deps": [ "org" ], - "commit": "8bf06b28d6f14f52d4968123e2b4b91930c8f947", - "sha256": "0k70k07c4lq20rqljmfkx1pfp8gq4qr0y46n8mh1smzxdznk9nlb" + "commit": "2c43b10eed0659f8e47797e5e53d2973f939284d", + "sha256": "1ppzq6hx7nc2iy6pnpgxd39znc701mgqbi2v4v71a0yp8zl6kbgs" }, "stable": { "version": [ @@ -70901,8 +70909,8 @@ 20200128, 1208 ], - "commit": "8f9f4f978a3c40adf2ff00eebb56bccfe4caf4e1", - "sha256": "0v0q3qzz6fwh0y9c9ci46284msr0x69jfki2ng89hpz8aab90bli" + "commit": "4fb77d9bb876e368e596d18324115cef6c1c71f3", + "sha256": "02js518d8h2qp8dxmw479gw61bdj3019j183hz6x1nn49ljx000k" }, "stable": { "version": [ @@ -70922,14 +70930,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200507, - 2043 + 20200513, + 1617 ], "deps": [ "htmlize" ], - "commit": "2d0540cbd659e6aaf1899f1e0b51f3850c83d5a6", - "sha256": "1slcg8mgdkn7cndmv5pkwqni0wm26jg3j0mds0rxf04w44ifvlql" + "commit": "d8a571c720b2b7dec9115fd85b114ae46d4ac4b7", + "sha256": "094nrd7fy7m7m758gks14kz7yfdcclcwvbz8p90dwg3dv311hii2" } }, { @@ -71586,8 +71594,8 @@ "deps": [ "alert" ], - "commit": "4f7677af740e8f3f7cfaf630ae2e594a125af760", - "sha256": "1xk4vp2138p58jdxn51vnmpnij5bzc2jbpq7y8avdcv0p7618fdc" + "commit": "a019c7186ec60c8c7c3657914cdce029811cf4e0", + "sha256": "0jyd7cbri0bmi0qzwm7d4fxdfa1224bg6izd63pqqg1x7s67x99z" }, "stable": { "version": [ @@ -71630,28 +71638,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200413, - 856 + 20200512, + 1701 ], "deps": [ "htmlize", "org" ], - "commit": "61549f4c00284a30e34caa3d76001b233ea5d2ad", - "sha256": "00r324nnci2l0jwx4jhzcrbyai5wmj5cjrav4253c23aqdn5ny96" + "commit": "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b", + "sha256": "0lkqq5n4dspnpiywaparn95wriwh7ffypdykz0a3mmlnv96rizyi" }, "stable": { "version": [ 2, 12, - 1 + 2 ], "deps": [ "htmlize", "org" ], - "commit": "14df7542f2a675f65501962e344e03d798cf0d39", - "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf" + "commit": "fa6f656f561ebb8377bfd904795aec90b4332bbd", + "sha256": "19nz77f2r49hqavz50ri222prhrd5890vhvc7jfazbascbcdjbqv" } }, { @@ -71902,8 +71910,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20200510, - 2117 + 20200516, + 1203 ], "deps": [ "dash", @@ -71913,8 +71921,8 @@ "org", "s" ], - "commit": "ad5fca5440e5c8a6b8078013684df43b3e43d773", - "sha256": "118dhbxf71cmx345hpi0lq7ycb75qg7bdvyqqqdkhl4v9fl9nxyy" + "commit": "265182a698be6babcbb11718c2821c747b1cff52", + "sha256": "159zi0a392p1f8bzlxvfkwmx12xm749cia5m0b3paz23mvvhgzgi" }, "stable": { "version": [ @@ -71942,7 +71950,7 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20200510, + 20200516, 1742 ], "deps": [ @@ -71952,8 +71960,8 @@ "org-roam", "s" ], - "commit": "4f82a8de96ea1f31c24a3cc2acf3bf26e85269ff", - "sha256": "0pqamdc03l5zzdc7dcqwylhw45mzijfgd9070wv93qys9qs1b1ph" + "commit": "4d60c7824e028b4bcdbe5dd589e416ec682a63c8", + "sha256": "010vgf2dlafx3673dpcpy94273i65pffpn5rz5vqvh0k3wwxhqyn" }, "stable": { "version": [ @@ -72955,20 +72963,20 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200501, - 1447 + 20200516, + 1341 ], - "commit": "9f180f037d632906a3043c4e14fafc8e6ed007a8", - "sha256": "0yczj42hl29snbh6g6r0w3ldr3vjg3i7448j55k3crm8b61rmwwv" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" }, "stable": { "version": [ 2, - 1, - 6 + 2, + 1 ], - "commit": "d6fff111930befa52a5cce128c986b0162ddf8c4", - "sha256": "1s9rqjn6c52kvz4v1ma6icdykvkvrvbyllpy5i1mg0pb4acbbwym" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" } }, { @@ -73091,8 +73099,8 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20200510, - 1951 + 20200516, + 1727 ], "deps": [ "dash-functional", @@ -73100,14 +73108,14 @@ "kv", "s" ], - "commit": "cdec8aa327096c63e0342d36a707165e518b5d18", - "sha256": "0jji70c38cssnmgsd9pmkz2mwfs413baxzr13f2mf98z52j6izf5" + "commit": "36d7789b7b3dfa2f4739a83692d322b601a0f4ea", + "sha256": "1j1cckvvghz9656bjkdxrc3gsfpz1wjvq3hlh6zblmnlbhhvbsan" }, "stable": { "version": [ 0, 2, - 0 + 2 ], "deps": [ "dash-functional", @@ -73115,8 +73123,8 @@ "kv", "s" ], - "commit": "24878ed965287d446af1289c33d50f639608d61b", - "sha256": "11f0nkyv3k6wra2753v6wa9jn38wrdkf0h0filliy40hqm7qqkfc" + "commit": "7be4a71ce55f2fdc7fe7f6414f03d58f19d43410", + "sha256": "0cxhmbbznvv9d3nmqfn0ggr164fa6yjbfac9wqi3c58vm3zri00k" } }, { @@ -73356,11 +73364,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200511, - 618 + 20200516, + 1344 ], - "commit": "5847b4af6205de31bfd29c5fb11c49e2fec63063", - "sha256": "088xqmk5fwdf12pvfarp9b69km605a52iqmb3042kn0ci5h0ibjk" + "commit": "7426df13512f5eee921c26aa68cfc6e32e3061fc", + "sha256": "18n2xzwpqq8159qwqy7hy0b93a5qxdb5rjh0ls4jk8lmahk5jrqk" } }, { @@ -73386,14 +73394,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200511, - 636 + 20200512, + 721 ], "deps": [ "cl-lib" ], - "commit": "f88f8c09929b1780b8e4b3bbeb27c68389130209", - "sha256": "01z5vvcl3pmd3agcbi9bkc0g9ah1vi7qwlprss64vffh08l5cw8j" + "commit": "5bfe2f6d53798d0fe071f9990e03d7428623e4a7", + "sha256": "16xcps2qlzh5z8c20sl0cnc0mlj8153vk6j1dnfd6l3a6kni88af" } }, { @@ -73454,8 +73462,8 @@ "deps": [ "reformatter" ], - "commit": "5d991188b511e9d650c84fc578f2f49c9f995693", - "sha256": "1x5nx064cgcjj99xwp7drcvhfmmav1f72jnwwlxllhas2is458m0" + "commit": "3141f9b65f8a68b4cbd6df4e08c64d98ce3aa3c9", + "sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn" } }, { @@ -75432,14 +75440,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200424, - 1524 + 20200514, + 2047 ], "deps": [ "autothemer" ], - "commit": "766efdbd444cbefd9d01e7c6f55956d4c9a8db6c", - "sha256": "1jz9vf8wfjnnbbsnxzcpfvj19556w1z9887xvvwn6rsiqqlxgray" + "commit": "4fa14adbc043497fc942568fdb78505ca549e5b7", + "sha256": "1ply18yzdf1lxyia8knn6fk8wb4yzwicgdiscr2z87bpk8p5d2pb" }, "stable": { "version": [ @@ -75693,11 +75701,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20200303, - 2324 + 20200513, + 2352 ], - "commit": "6537b4d2a8cf34455b769b95dfd65de6a4a0e1d3", - "sha256": "1gy5rqnfnyhfa44vxy7qqqh7xada1d1gg34msczcalhhy6lm59if" + "commit": "3497b6068d78ae15ba1eaf94e4315d18e9ae6b00", + "sha256": "0vf9qrkc4dna2f9l0ry1qhfxy7yw1dlilgh38dlp42kqdyp5qny8" }, "stable": { "version": [ @@ -76456,15 +76464,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20200427, - 2136 + 20200512, + 1524 ], "deps": [ "let-alist", "tablist" ], - "commit": "d9712989fc4715443f674459199bdffa987054ac", - "sha256": "0lrh1c37vfgjafsp3j73rjqlz0mbginwbw25vak1l6vycb3s6122" + "commit": "c510442ab89c8a9e9881230eeb364f4663f59e76", + "sha256": "17z3cpn76g9dp62drjrgrqpp1bgf4gl5k5gspylskpvd4kj4bq4d" }, "stable": { "version": [ @@ -76863,25 +76871,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200418, - 1815 + 20200513, + 1416 ], "deps": [ "cl-lib" ], - "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", - "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" }, "stable": { "version": [ 2, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", - "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" } }, { @@ -79114,11 +79122,11 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200506, - 1041 + 20200513, + 1054 ], - "commit": "f93b09ee8e5420e728cb8be199ec06504d2df97e", - "sha256": "1b63w9fvgvmw8hr6s8ckhg62psd68rxgsii71kgis1j4v0s6l0sn" + "commit": "308a438550173685cb852a8aadef75c25701513e", + "sha256": "1w4sds6h6q80drqzkmiz51nvy942a88s99zfrvmyvfrvwv7wlqqb" }, "stable": { "version": [ @@ -80414,8 +80422,8 @@ "deps": [ "pkg-info" ], - "commit": "768f0570cad57b6885c4472df803906d097cbc1a", - "sha256": "15855a99as5xmqdzckway0rvlg81wq6fhi5afr7hli62mrc8sgxa" + "commit": "f650faecf699e4b4659374cf5a949f6927feff3e", + "sha256": "142is55cbyya511zp0yl5d1x6i8mvxqjn8zky4gxif15rmmqrk9n" }, "stable": { "version": [ @@ -80967,19 +80975,17 @@ 20170526, 1650 ], - "commit": "bf3eef94c1fc5470407c4f69bb17cbed2c75b508", - "sha256": "1fi8hvxd2nfkqg6s5yz0npbhhclpsqmyfd6jd0d7ivqqglk5h93j" + "commit": "63da77bc971e08c2241cc1d9e65ede4bf335c421", + "sha256": "0b0shac978n6djxid6z9h4mfb2ah4hc1vvb0rg8rf65gs4cxjzlz" }, "stable": { "version": [ 3, 12, - 0, - -1, - 1 + 0 ], - "commit": "ef7cc8111676076d8c2b6f9929096477cc868dc3", - "sha256": "0i06nk5v3nl0xgmi6pxyqgcps8h16a6mcdg2bnjnrrmz6cnq97j2" + "commit": "0dd036d675508a4ecf69e61626fd0c88235a661d", + "sha256": "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a" } }, { @@ -81653,11 +81659,11 @@ "repo": "mattharrison/pycoverage.el", "unstable": { "version": [ - 20190607, - 2004 + 20200513, + 2047 ], - "commit": "01bd47171eefcab2e19d7cffd9a2dd3bd9bd6812", - "sha256": "1c7rdx5a7za0yg9c58255p4spq3zlc5pdgayrgv1mm80f3nc0sdk" + "commit": "3c69ed312121368f1b24cc04d54a29ce4ed4f743", + "sha256": "0vcg8sq8pbzary19xxdariz3kws93qd2agzssl9znw38sayj71wz" } }, { @@ -81947,8 +81953,8 @@ 20200503, 1624 ], - "commit": "f00144fb8faa81e1ce42516c2f58eb9fc797f7bd", - "sha256": "1hmrg1si9lf1xknfl4j4p2dg6iskaripy8k2askc8g0jjgmscq9f" + "commit": "1fc490c0a1d0df5d4d6a64da0ccf2dd711b9bf67", + "sha256": "0fkcn6dk67ljx73ww1zxxkmqp551xsshhz40z2fh1dxw00b470ga" } }, { @@ -82536,11 +82542,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200329, - 719 + 20200514, + 1242 ], - "commit": "a3c4490a3bb08ee7819b330a93a284b2fd4cd70c", - "sha256": "1rm27y9zni9nscrvsmvi653nwkrlr4gd4cy5pyrynh3q32yhkqik" + "commit": "9ece62efa829c6b89ba61cb674f337764b266482", + "sha256": "1mvrpyiw53lrz6i7r7zlcfvksh8lsjb4vib6gnj5b849njzcjwhm" } }, { @@ -82649,11 +82655,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20200427, - 337 + 20200514, + 1506 ], - "commit": "2e37ce9e4b13359344dbd67fbfd7e39d46b2c6b6", - "sha256": "0w9y8b76ias2dgzjsggd7z1mhv9dsaxrf20f95rq8zanfw2vr0pq" + "commit": "a8752887b81fc2f4f4e4bcd3d2cf8abafb85edbb", + "sha256": "0zjhpgg6zkqx8v0gv7h7z73i64ipzszm9cqs4wwaldlz228316ra" }, "stable": { "version": [ @@ -82811,15 +82817,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200509, - 1405 + 20200513, + 1519 ], "deps": [ "faceup", "pos-tip" ], - "commit": "204845665cc4ec13edc59106b102fa251458e737", - "sha256": "0n376a48yjsd1ic8l31sg76aww3j1p5lriakljklzhf5s010vkss" + "commit": "0f1efa4a3cdcd26de1d2b002868ffc851cff25ac", + "sha256": "1zhn50apdrysm9d6ynv92slah78i39cismj88ym4ahrllwr1jnj4" } }, { @@ -83460,16 +83466,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20200418, - 1721 + 20200513, + 418 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "e03446f54c7ee0b4ed3ec7300597046cf1de2bb8", - "sha256": "160pv9jx66ygl3z1g8yrw7f786403lbb182nz972yl4nyjchbdw7" + "commit": "1238d8e72945a84bb06cd39d7ded75f37105d4d2", + "sha256": "0gx5fivzksanyp9a0ijdzrcbgg8nw94mbilhdh1jkra5mw3ndr63" }, "stable": { "version": [ @@ -85049,8 +85055,8 @@ "deps": [ "helm" ], - "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", - "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" + "commit": "88e6577a0e50f523f7da04de9f939b0bc168b514", + "sha256": "1k8330bgc9m7pnpvz3kjyjpjsmha43v4srnhns85xi0nv328g1iy" }, "stable": { "version": [ @@ -85073,16 +85079,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20200507, - 1417 + 20200516, + 1412 ], "deps": [ "s", "transient", "wgrep" ], - "commit": "4774ab1517f59fce998831671ef571a7b7ccd526", - "sha256": "1nyji041p0jxhzkz88p4x13l04sprw5736f7s45w8768iw9fqivf" + "commit": "f5456e006f22b6bc947e799261b36d55b075c5a2", + "sha256": "120n4vkw3c1l130932pziz9ivw85wyh6b75836w82dhx9d41h4cr" }, "stable": { "version": [ @@ -85357,14 +85363,14 @@ "repo": "thornjad/rivet-mode", "unstable": { "version": [ - 20191230, - 1842 + 20200514, + 1617 ], "deps": [ "web-mode" ], - "commit": "ac15de8c76978638e129c26869123c75d5b1f8c7", - "sha256": "19pv8qpcm0cllbbckzpjxrbkdavirq6b8p8jm274klkf4b7k32f8" + "commit": "9f2e6c4f777dbe306b715ab42663a6fc82a7e431", + "sha256": "09rsyq28caz4mrwm32i1f8wdzz35grigp7dilzxxqg0y4fpsf81f" }, "stable": { "version": [ @@ -86173,11 +86179,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200509, - 954 + 20200513, + 812 ], - "commit": "eca55c068eb90aa5e1f36c6b31de589ce1df2ff1", - "sha256": "00vb53jzhnmwkw9bzcadyicplvp3x1jdcf4d0jnvfkhl4ln5d9j0" + "commit": "bfe40565753295a4cf8403f4124710acd2827d21", + "sha256": "1bx0hfilw48cz8n58lf427yg6sfi50wr91vcmj0w0m4s26zbdrr2" }, "stable": { "version": [ @@ -86220,8 +86226,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200502, - 1247 + 20200516, + 759 ], "deps": [ "dash", @@ -86235,8 +86241,8 @@ "spinner", "xterm-color" ], - "commit": "cb2bfde237fd941f8c512e4d4f59ab5be53a5382", - "sha256": "1hv9py1jqn2pphcpdw1j4i1q4idm2mwz3gkyvimjm9w858sn5var" + "commit": "52b632d161b64bdca3f35e35180af63b668ce9fb", + "sha256": "1pcqm8463hjlv70bn6cpl2sv3z2h992yvkzrcz0w2rpz6jgrcfg1" } }, { @@ -86271,11 +86277,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20191017, - 1323 + 20200515, + 1703 ], - "commit": "3a54312eea7023a86ca3f8eb3c03c872554bff2f", - "sha256": "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95" + "commit": "5d988e8b3a5d3d6f2f58d97031d2f500ef55473b", + "sha256": "0p7f02h5vsf4500gf4nl95myvh7pha47rdllscgs3b9jcx1kgyz2" } }, { @@ -86532,11 +86538,11 @@ "repo": "djcb/sauron", "unstable": { "version": [ - 20181216, - 1200 + 20200516, + 1406 ], - "commit": "e20eb21c93492a7c9e89579409ae5a07f77aa9fd", - "sha256": "0sm69gr05y44zxmdzyydbyf5yw4lhxszq3zgz4mflcnb544kkrj3" + "commit": "d2e06866d1045fa16015d135b8964d9caacc2985", + "sha256": "04z3hn46m6xy3jpfd00c7x24h27dgv5zcysci3lxzmmq9k4iqsg3" }, "stable": { "version": [ @@ -87398,11 +87404,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20200510, - 1557 + 20200514, + 1440 ], - "commit": "fec02b6e0c10dc865e22be8f46649f7078d2b137", - "sha256": "1mk60xp66xrrkarz48cm4cjr0vzrgsqi1s04cfg1zrqchh8408v2" + "commit": "392fb1ba8a594a291854c27d2b6824b04cd0c2e7", + "sha256": "1rr7w8jlxsfn2kpryb1ywn066qlc31px1dbwd42hafp6k5cl870n" }, "stable": { "version": [ @@ -88200,15 +88206,15 @@ "repo": "mhayashi1120/Emacs-shelldoc", "unstable": { "version": [ - 20151115, - 325 + 20200513, + 1206 ], "deps": [ "cl-lib", "s" ], - "commit": "5df2264eb60e45066f3633df4f34834751667346", - "sha256": "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i" + "commit": "fa69f67b6229fad3f31d936955ca8d1982009b77", + "sha256": "0ma5j74vkwax9ha945dcgbmf3r4gajj4nvl63pbfyvxvy6svn84r" }, "stable": { "version": [ @@ -88717,11 +88723,11 @@ "repo": "webframp/sicp-info", "unstable": { "version": [ - 20200421, - 242 + 20200512, + 1137 ], - "commit": "3efcd37eb7888845c5f3292beeb18219f9993e92", - "sha256": "1qlgg7r9v62mcw07svdkzrf5ccm6n9vg64h4p704rfzkxys1cwfs" + "commit": "4002d83083d520c6b5ede2df36cc2cee885d450a", + "sha256": "0c9lknrhwhi4v3qnnzmy0k24d8pr3d3mpxi9xzcxq97f5w1x4fsk" } }, { @@ -89266,8 +89272,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200402, - 1656 + 20200512, + 1702 ], "deps": [ "alert", @@ -89277,8 +89283,8 @@ "request", "websocket" ], - "commit": "d53a57a18fb7034182c3d02503f937761e6a2a64", - "sha256": "1xcfgyw9cky6msai2ap9fgcdasvmvn3k73rjmvnwcj4axh6vjvyx" + "commit": "b30525d63bb46882240de6f86e951305bcc7af10", + "sha256": "1f35lr19g5ci1jba6b9hkl7vajg4iy1yw6wb8bhg8dyppdkwnmvy" } }, { @@ -90331,8 +90337,8 @@ "deps": [ "org" ], - "commit": "0a6374493363d10826a8151d37fc461b08cc9b9a", - "sha256": "0vfhcnlz0p4dsnn7ac0fjqbk6xklanaa6jk0zbqcrlf2ww926v29" + "commit": "531957d7356f623b026aa45923e536421f682c1a", + "sha256": "0rb8vjnkn9pp0lrmmvsfslmw7xya4n18s82vs98545phwc4bjga5" } }, { @@ -92053,14 +92059,14 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200504, - 2101 + 20200512, + 2217 ], "deps": [ "cl-lib" ], - "commit": "778bacc31773749dd76878e070051d49b7e6c450", - "sha256": "1sasnm0s3i1pj7r6bssgznfxiwlvvjgc0ijyk7xkv4n4588zcbcy" + "commit": "fd64b75f1051c4fe59209412f00a28625371588c", + "sha256": "1rh3nhwh75b698aq45cwmflv97r0596fq36w1rj08syfhmy3aari" }, "stable": { "version": [ @@ -92452,8 +92458,8 @@ 20171130, 1559 ], - "commit": "d185495d1ef2f8f1e343dc5a0d37e1fdbfd143a2", - "sha256": "0g39jyzrq451mh0k1ahs2svpddm5611lvj4gxcaz9iq02ich0jhc" + "commit": "fb180610de78c68736c963236afb28ee3ac952b4", + "sha256": "106jjrbjdgxp1s41h9vn877rq7a3m1jj9brlgdz1mrjgay266gcc" }, "stable": { "version": [ @@ -93337,16 +93343,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20200321, - 10 + 20200516, + 1836 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "e58f26b8ab9cf0522d52fe9890d39dc9e645577e", - "sha256": "1yx73wgvaf01wi26ahc9cblsk3sj98rgljb19dxc9ab7hjyncd46" + "commit": "e990ea6f5ea932763d002c3794dd9589add1532d", + "sha256": "1a4yrj3yjqgd5jssxd38dvx06cigsszrvs6hv7slfl60p729i0lw" }, "stable": { "version": [ @@ -93460,8 +93466,8 @@ "deps": [ "ivy" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -94385,11 +94391,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200416, - 2114 + 20200513, + 1728 ], - "commit": "eedf6a465b8ccc865c108a6f2715769300f5a499", - "sha256": "1p7wlv5i46f3d9kn3yiw6rga8mkln9m5xknzimzym2pyaclva41m" + "commit": "45625bd90cf5dbdcaed02b57baaa995e240ceb4c", + "sha256": "1s2xxscj675ps93hqczw1xcs3jsixblfzjcfpz74vbz9zkmq1ygm" }, "stable": { "version": [ @@ -94585,14 +94591,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200423, - 1038 + 20200516, + 1007 ], "deps": [ + "rainbow-identifiers", "visual-fill-column" ], - "commit": "50ef9bf06cc162b39cf3553b89b02faf5bc87835", - "sha256": "1h5100vmgwy52zp7ryarj4xw3gb9paj1qpm39mc9h62s6n1zysw7" + "commit": "e2fd3b1b34ae659d306749ab3129ed498b3a2720", + "sha256": "0h851m3p9cqblr5wpl769g8dl5vxjgx62c6grkdk2g0ip2cm4vcf" }, "stable": { "version": [ @@ -95595,18 +95602,18 @@ 20200212, 1903 ], - "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", - "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" + "commit": "81d2abd9097fc3497f77d830ebf8d8386beb7127", + "sha256": "0k9yr3dx12cl07dlz0zmaaf4zfr4zh54w5ix74b0kj1ny299f9q6" }, "stable": { "version": [ 2020, 5, - 4, + 11, 0 ], - "commit": "0580a039d7fe51d1c8f160985057e770c2cc7ae1", - "sha256": "1a4gdmcwn7msr2j98y4drlal2sk3fbs5jsy56b3j2njdyp7b5b98" + "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", + "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" } }, { @@ -95662,8 +95669,8 @@ "deps": [ "haskell-mode" ], - "commit": "4a63723555fbbd427dba0606e6ba9e48afbc93da", - "sha256": "1hmdrx0wnv15gks432xa0ic971m39kj3fbhvjx14k1xh3zp010zp" + "commit": "f68e58cd7f8c483307573a96307f1f872a1921a0", + "sha256": "1rwc1vk0gl1sjnvzvwz4x25m6c61r8ghf6wrjclgifrm8zf1na5d" }, "stable": { "version": [ @@ -96142,8 +96149,8 @@ "deps": [ "cl-lib" ], - "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", - "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -96762,8 +96769,8 @@ "repo": "cyberthal/treefactor", "unstable": { "version": [ - 20200131, - 621 + 20200516, + 1631 ], "deps": [ "avy", @@ -96771,14 +96778,14 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" }, "stable": { "version": [ 3, 2, - 1 + 2 ], "deps": [ "avy", @@ -96786,8 +96793,8 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" } }, { @@ -96798,8 +96805,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200506, - 1600 + 20200516, + 1204 ], "deps": [ "ace-window", @@ -96811,8 +96818,8 @@ "pfuture", "s" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96848,8 +96855,8 @@ "evil", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96879,8 +96886,8 @@ "cl-lib", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96911,8 +96918,8 @@ "pfuture", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96944,8 +96951,8 @@ "persp-mode", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96976,8 +96983,8 @@ "projectile", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -97844,11 +97851,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200510, - 425 + 20200512, + 19 ], - "commit": "ea41b40601e44409a0e1ee138fab628952cdae4c", - "sha256": "1wcqfrdy1iz6vb6m9qadd7x75iclrrry7il2w49a04dpqb7hcx99" + "commit": "2b1e53285a55ce50ca6fd60b050f2171e235d8f9", + "sha256": "0x7i7aj9fh8j0944xbym3hijr33mc0kfadl7v657k0d8nx00x3zh" } }, { @@ -98644,8 +98651,8 @@ 20190715, 1836 ], - "commit": "aa832e280cce7c5a7cb92e65609285932650bf49", - "sha256": "149a0h6mbgvkqcnkdz3npmkhr6qgnr1vjbyidajvi1agkxpfz7cl" + "commit": "952f97a46062bb3315d3ae20ecbfd58747019c25", + "sha256": "0bfi325y5yzjbwnmdww0l5bpf4h9ynwz4mwg60k8q3p3f82pkrrm" }, "stable": { "version": [ @@ -99283,11 +99290,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200506, - 1850 + 20200515, + 1734 ], - "commit": "825baa8c241efe8d567bf096bb60f2543738c006", - "sha256": "1dmy3rngjpah6g5qlnii6yzf2b20brfcrdadx36d4prw5fzp2vnw" + "commit": "af1f250fd34d53ecdf31be1756c8693b4182d452", + "sha256": "0zk52ddlf11rwsd1f70i6jjc9z81jddqapfr2dv1d4ghn6j382x5" }, "stable": { "version": [ @@ -100024,11 +100031,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200510, - 1856 + 20200515, + 1412 ], - "commit": "3decc51156e1b022955dc1333c3e358e20d94228", - "sha256": "1wqb3ajgzcwsvcvb6g6lmx3g2x4pi8g3vzp73a02h3lm52ljh6d1" + "commit": "8337e77520bcdb136eebb74837dc71ac8ec67601", + "sha256": "1wf8w8w0690mkih7c9xkk11i9f7r47abvfpyw4y576ansxlr5g1f" } }, { @@ -100039,14 +100046,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200402, - 1516 + 20200516, + 1117 ], "deps": [ "vterm" ], - "commit": "15901e1e1eebd957ef18d38c920f944558ebd4fb", - "sha256": "1dcr242i9r7r4mr43qfv5ij254dnhf04gfi71y507zfpdr17zdix" + "commit": "fd55be72e8ad19e2284c8f73d5707c033dbde46d", + "sha256": "0q3459vpj5fp2i7nbk67mfd0nf78mpkgz771nhdj4a7xwghk6xgq" } }, { @@ -100970,8 +100977,8 @@ 20200217, 1030 ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -100997,8 +101004,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101027,8 +101034,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101057,8 +101064,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101087,8 +101094,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101776,8 +101783,8 @@ 20191114, 2340 ], - "commit": "33b4fcdd8a17aa19d57971e4f6db5fcb7758843c", - "sha256": "09rrv89b17s4sklkqgci1pmzlnkjlrira22884dh10sbfij42vbp" + "commit": "91ec8dc32652811861116e6f750f0fb41b21b771", + "sha256": "0nc9c1agzhmlbh4ijjrsa9yx19hvxzk06gv6p4pgrlx1yg2khnli" } }, { @@ -102198,8 +102205,8 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20141102, - 1922 + 20200516, + 1451 ], "deps": [ "anaphora", @@ -102207,8 +102214,8 @@ "dash", "f" ], - "commit": "bbefbb2579d463b243dcd4ecbfce82e1bdac3882", - "sha256": "0md6i2sawrzqza2br1g11zhhrda286abhlx0v9pgf65mafc4ilwi" + "commit": "239a5a3ba3b210be5d8fe527546d09241bd3185c", + "sha256": "16lzv61scc1iq1vsbfvyzla91cnxh5a7s84wx3x3kq9jggzh6hbs" }, "stable": { "version": [ @@ -102447,20 +102454,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200421, - 441 + 20200516, + 1526 ], - "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", - "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" }, "stable": { "version": [ 0, 1, - 0 + 2 ], - "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", - "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" } }, { @@ -103099,11 +103106,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200510, - 1712 + 20200514, + 1932 ], - "commit": "137dfecedfdf6aff69b0f9b1c299aa0ae868fca0", - "sha256": "127lq50q62x06kd1xrf8lyc4rkqbfhfy86gsx1x4x169am2xk397" + "commit": "3d1a24ca84d26ad4507a79260107b010a1d6886b", + "sha256": "1qppbf4jidq6q8c7gby0syp4560xqc3kzgbdgdwl1jc5k08ln3cl" }, "stable": { "version": [ @@ -103306,11 +103313,11 @@ "repo": "drdv/yahtzee", "unstable": { "version": [ - 20171022, - 1412 + 20200511, + 2005 ], - "commit": "1ae37b1a949a6afcb6521e452588bf8a058f9e81", - "sha256": "0ya3injviifhrcsdfm9hkfw8xqfaa6hqvv5z0cfvfj7rcwjnbx9p" + "commit": "63b9b698fbb547603c3f66932c6d3e3bb217c443", + "sha256": "0v0lp2n0xdxfiasr3lcydj9q4krfvzqi568iyngq6zxlryc75wi0" } }, { @@ -103366,11 +103373,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20200511, - 952 + 20200512, + 2141 ], - "commit": "41adb32b886352827c4d4b4ad15cdf18a00c8c50", - "sha256": "1sp507iphis91581f51j3kc29vn5qkwjfiv7ma06scg22fps9qis" + "commit": "0b33131664719c61f834e77ff3b91ded3de2cd3b", + "sha256": "0ig5hpk0wb46yz6gml6g7x9am0l3cay1bzxldms0g2qjh5swxrq4" }, "stable": { "version": [ @@ -103981,8 +103988,8 @@ 20200510, 1405 ], - "commit": "adea3fa881baebed4fd6a4e6653c9a1d16a1ed52", - "sha256": "04xmvc7i4p7s9j3dx55vcakps50r5a95n5j6vzby9qm6rc3vss3m" + "commit": "828323f9acb654d8f61ccbca510b471fb00879ee", + "sha256": "1zixqicpdywzdc2pkx9h08y3kphmn9zcx44bj2rqg3h8xsmjayk5" } }, { @@ -104245,14 +104252,14 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200509, - 1040 + 20200516, + 1108 ], "deps": [ "deft" ], - "commit": "c0d36c5d1129a600bee51e0913ae2f851cc56b7b", - "sha256": "1l8lrgy3i0h174zvfcpc4h1v5h4vpxnmh963v32dh8jnj1vs0afx" + "commit": "f3503ec8fde88d733b7bbbd4431e85de396a3fe8", + "sha256": "0843k0i6szjvc7f51q0pm7vmxpfz68911d75m75rg54k1jbynazq" }, "stable": { "version": [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay index 26d2482e7a..fc5657e441 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -7,9 +7,13 @@ set -euxo pipefail curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "elpa-packages: $(date --iso)" -- elpa-generated.nix +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix +nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace +git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix index 2d48da0eb2..570dc28c68 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -11,6 +11,10 @@ , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , siteStart ? ./site-start.el +, toolkit ? ( + if withGTK2 then "gtk2" + else if withGTK3 then "gtk3" + else "lucid") }: assert (libXft != null) -> libpng != null; # probably a bug @@ -23,12 +27,7 @@ assert withGTK2 -> !withGTK3 && gtk2-x11 != null; assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let - toolkit = - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" - else "lucid"; -in + stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; version = "26.3"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix index 33a3213293..695a13eeca 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let - version = "3.32.0"; + version = "3.36.0"; pname = "gnome-latex"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jdca9yhm7mm1aijd1a5amphgn15142kngky3id2am379ixrq1hg"; + sha256 = "1869kr1zhcp04mzbi67lwgk497w840dbbc7427i9yh9b9s7j6mqn"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix index 107be43383..34800d7f02 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lite/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lite"; - version = "1.03"; + version = "1.05"; src = fetchFromGitHub { owner = "rxi"; repo = pname; rev = "v${version}"; - sha256 = "1h8z4fav5ns9sm92axs3k9v6jgkqq0vg9mixza14949blr426mlj"; + sha256 = "0xh29ddl5h92n1c4nlh4kx9mchwkzn4r3l16kklix3a1jm1c878a"; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index b4ce588050..e2f041d0fd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "4.9.1"; + version = "4.9.3"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0v5s58j3lbg5s6gapl9kjmzph7zgwaam53qspycy2sxaxw65mkaj"; + sha256 = "1d2i3wvsq5lvpxxinq51dcvd58xx7j0d0c2csz9hgvd06gq3hd3f"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix index e28b2b4306..ed08954f8b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nvi/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation { homepage = "http://www.bostic.com/vi/"; description = "The Berkeley Vi Editor"; license = stdenv.lib.licenses.free; + broken = true; # since 2020-02-08 }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index bee9934a9c..07a8e7619b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0q3x1v88szxm8177qcnynfiyc7w8sn07ig6c7fjd164q7w30y24m"; + sha256 = "0d1bs909vga1k494xnggq1mcjfxjrwa4acc0mj5rv73xqkc9mb2s"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index f254230111..c227416b02 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.9-0"; - sha256 = "1w7ci7v5qlayd7a5z69px94fz3fshvn1diqw7k1ymsyvz5888d39"; + version = "7.0.10-14"; + sha256 = "1qcsq5884iqis1adpfbx3cwki8v4q9wwh70fpcaqnwwmznmqfq4j"; patches = []; }; in diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 0ded57b1a7..56f88fc4ef 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.10-71"; - sha256 = "0c69xmr8k8c4dplgzxydm30s2dr8biq71x07hc15bw196nsx3srr"; + version = "6.9.11-14"; + sha256 = "0x51vf48g75cfp0mbwf3ckmlwa6v00592xx3gvrqzjzx7vlayjyg"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 9981e8a439..d72d52f3c2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1ldvscxfvwpsir8vr1ca9ra0841m6xy331ys31dngcp77nwncjqc"; + sha256 = "1s8i82963fdx5q4wgh0cn211h0p1r1mzyss0g99bplp8d9ll40kw"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix index a6b35b1d8e..a6cfd256ac 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix @@ -6,13 +6,13 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "cq-editor"; - version = "0.1RC1"; + version = "0.1RC2"; src = fetchFromGitHub { owner = "CadQuery"; repo = "CQ-editor"; rev = version; - sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax"; + sha256 = "0zima4pmn34s8b2axxwy6qd1f1r5ki34byq4x3rrd7n3g0hagxz5"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix index 877328e882..cd0ee8e662 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "126diirhmm2igxdpgfv1l20wnz5q8hadgq53d0j83ka72mfd3qg6"; + sha256 = "1gyi80j2c38j62miv8a8nsx1pad169sa4fx0b85m2yv0x7fz492w"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix index 46be8d1453..8660f6f218 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ifm8hmxpf9nnxddfcpkbc5wc5f5hz43yj83nnakzqr6x1mq7gdp"; + sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix index 88b4a84766..dd03c2c0bb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/eXeC64/imv"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj markus1189 ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index f0d9329bc5..67e95aec75 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -18,25 +18,15 @@ mkDerivation rec { pname = "nomacs"; - version = "3.12"; + version = "3.14.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; + sha256 = "1vms13kyg7cpqi2hxvrrhlnl7cq92ijr7dm1kl5ryglpcagqv811"; }; - patches = [ - ./nomacs-iostream.patch - (fetchpatch { - name = "darwin-less-restrictive-opencv.patch"; - url = "https://github.com/nomacs/nomacs/commit/d182fce4bcd9a25bd15e3de065ca67849a32458c.patch"; - sha256 = "0j6sviwrjn69nqf59hjn30c4j838h8az7rnlwcx8ymlb21vd9x2h"; - stripLen = 1; - }) - ]; - enableParallelBuilding = true; setSourceRoot = '' @@ -65,7 +55,7 @@ mkDerivation rec { meta = with stdenv.lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; - maintainers = [maintainers.ahmedtd]; + maintainers = with stdenv.lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch deleted file mode 100644 index 53224e0260..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/nomacs-iostream.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/DkCore/DkMetaData.cpp b/src/DkCore/DkMetaData.cpp -index d195757e..affec7be 100644 ---- a/src/DkCore/DkMetaData.cpp -+++ b/src/DkCore/DkMetaData.cpp -@@ -42,6 +42,8 @@ - #include - #pragma warning(pop) // no warnings from includes - end - -+#include -+ - namespace nmc { - - // DkMetaDataT -------------------------------------------------------------------- -diff --git a/src/DkGui/DkNoMacs.cpp b/src/DkGui/DkNoMacs.cpp -index 6a412f70..bbfba233 100644 ---- a/src/DkGui/DkNoMacs.cpp -+++ b/src/DkGui/DkNoMacs.cpp -@@ -96,6 +96,8 @@ - #include - #endif - -+#include -+ - namespace nmc { - - DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix index 62e9fa06ab..8ff4d6f27e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -58,6 +58,8 @@ mkDerivation rec { mv $out/bin/*.app $out/Applications rmdir $out/bin || true + wrapQtApp "$out"/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD + mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \ $out/share/openscad/{examples,color-schemes,locale,libraries,fonts} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index bcbdfb9980..e667f7c0f1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4"; + sha256 = "09z4z2csp7ld47q36x2id5zadaihisbnk7bkdvci826hwm8km7sl"; }; vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 010e9ae7a5..22cbb0ec4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -34,8 +34,16 @@ stdenv.mkDerivation rec { install -D op $out/bin/op ''; + dontStrip = stdenv.isDarwin; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/op --version + ''; + meta = with stdenv.lib; { description = "1Password command-line tool"; homepage = "https://support.1password.com/command-line/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix new file mode 100644 index 0000000000..c165003d8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, unzip, makeWrapper, autoPatchelfHook +, zlib, lttng-ust, curl, icu, openssl }: + +stdenv.mkDerivation rec { + pname = "ArchiSteamFarm"; + version = "4.2.0.6"; + + src = { + x86_64-linux = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-x64.zip"; + sha256 = "05hx6q1lkbjbqhwi9xxvm7ycnsnpl1cnqzyy2yn0q4x27im399cn"; + }; + armv7l-linux = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm.zip"; + sha256 = "0l8irqrpl5vbjj84k4makj2ph2z6kpny7qz51zrzbgwhrlw0w4vg"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm64.zip"; + sha256 = "0hg2g4i8sj3fxqfy4imz1iarby1d9f8dh59j266lbbdf2vfz2cml"; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + + nativeBuildInputs = [ unzip makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc zlib lttng-ust curl ]; + + sourceRoot = "."; + + installPhase = '' + dist=$out/opt/asf + mkdir -p $dist + cp -r * $dist + chmod +x $dist/ArchiSteamFarm + makeWrapper $dist/ArchiSteamFarm $out/bin/ArchiSteamFarm \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ icu openssl ] }" \ + --add-flags "--path ~/.config/asf" \ + --run "mkdir -p ~/.config/asf" \ + --run "cd ~/.config/asf" \ + --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ + --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ + --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ + --run "[ -d www ] || cp --no-preserve=mode -r $dist/www ." \ + ''; + + meta = with stdenv.lib; { + description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; + homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ gnidorah ]; + hydraPlatforms = []; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix new file mode 100644 index 0000000000..902bef5f12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix @@ -0,0 +1,115 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, libuuid +, libunwind +, icu +, openssl +, zlib +, curl +, at-spi2-core +, at-spi2-atk +, gnutar +, atomEnv +, kerberos +}: + +# from justinwoo/azuredatastudio-nix +# https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix + +stdenv.mkDerivation rec { + + pname = "azuredatastudio"; + version = "1.17.1"; + + src = fetchurl { + url = "https://azuredatastudiobuilds.blob.core.windows.net/releases/${version}/azuredatastudio-linux-${version}.tar.gz"; + sha256 = "0px9n9vyjvyddca4x7d0zindd0dim7350vkjg5dd0506fm8dc38k"; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + libuuid + at-spi2-core + at-spi2-atk + ]; + + phases = "unpackPhase fixupPhase"; + + # change this to azuredatastudio-insiders for insiders releases + edition = "azuredatastudio"; + targetPath = "$out/${edition}"; + + unpackPhase = '' + mkdir -p ${targetPath} + ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} + ''; + + sqltoolsserviceRpath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc + libunwind + libuuid + icu + openssl + zlib + curl + ]; + + # this will most likely need to be updated when azuredatastudio's version changes + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/2.0.0-release.56"; + + rpath = stdenv.lib.concatStringsSep ":" [ + atomEnv.libPath + ( + stdenv.lib.makeLibraryPath [ + libuuid + at-spi2-core + at-spi2-atk + stdenv.cc.cc.lib + kerberos + ] + ) + targetPath + sqltoolsserviceRpath + ]; + + fixupPhase = '' + fix_sqltoolsservice() + { + mv ${sqltoolsservicePath}/$1 ${sqltoolsservicePath}/$1_old + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${sqltoolsservicePath}/$1_old + + makeWrapper \ + ${sqltoolsservicePath}/$1_old \ + ${sqltoolsservicePath}/$1 \ + --set LD_LIBRARY_PATH ${sqltoolsserviceRpath} + } + + fix_sqltoolsservice MicrosoftSqlToolsServiceLayer + fix_sqltoolsservice MicrosoftSqlToolsCredentials + fix_sqltoolsservice SqlToolsResourceProviderService + + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + ${targetPath}/${edition} + + mkdir -p $out/bin + makeWrapper \ + ${targetPath}/bin/${edition} \ + $out/bin/azuredatastudio \ + --set LD_LIBRARY_PATH ${rpath} + ''; + + meta = { + maintainers = with stdenv.lib.maintainers; [ xavierzwirtz ]; + description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; + homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + license = lib.licenses.unfreeRedistributable; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix index 3a8aea913c..ec4d71a0dc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "1rrhll1i5ibxdchpdifajvsm697pilf82rbq7arn4f4pw5izrhy6"; + sha256 = "0indvycj972wng979mvia8mrb7bwdfay7wxq3lnj05qyxqafj5h2"; }; subPackages = [ "cmd/cheat" ]; @@ -17,6 +17,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' + installManPage doc/cheat.1 installShellCompletion scripts/cheat.{bash,fish,zsh} ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix index bfa6f2ea85..c5083f2379 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "0cskxy3xsy187in5vg8xcs3kwcx2s160qv009v0ahkcalp29ghz4"; + sha256 = "0pqnn52nn22k49f5cw4jcr8vcbff28n56i8fizg1mmfshy8pn891"; }; # dbus-1.pc has datadir=/etc diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix index ec2bd6b32c..fb177e8278 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1wx6nqcyzknbw71sliwq4cb5qq1gy6pr9867s6x3vpg3n8g2czkf"; + sha256 = "1xxf8d220pa77195d9f3l3scvvyqsh1pvlrbw4cq6ydj9qbp5kf0"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix index c058e6d5a9..fb81bbdd40 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses, curl -, json_c, libcpuid, pciutils, procps, wrapGAppsHook, nasm }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: stdenv.mkDerivation rec { pname = "cpu-x"; - version = "3.2.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "03y49wh9v7x6brmavj5a2clihn0z4f01pypl7m8ymarv4y3a6xkl"; + sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; buildInputs = [ - gtk3 ncurses curl json_c libcpuid pciutils procps + gtk3 ncurses libcpuid pciutils procps ]; + postInstall = '' + wrapProgram $out/bin/cpu-x \ + --prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} + ''; + meta = with stdenv.lib; { description = "Free software that gathers information on CPU, motherboard and more"; homepage = src.meta.homepage; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 8aaa7faa54..75edce66b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.4"; + version = "7.0.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1d36d2rzsr8c048w0jyacvmgh46jamr9nzs22rmpm7xbzlnvdg4k"; + sha256 = "082a0dszdlynpf7lrkwijwcs2x8xmbzrjr8rrwmrmkznhzj50gqf"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix index 69e2d3d559..d4e015f31d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.16.0"; + version = "0.17.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1r0d52rlhg7dz6hziplzy7ypsfx9lgbs76j3ylinh2csplwkzv69"; + sha256 = "0lyjv8rknwbx5b5nvq5bgw26lhkymib4cvmv3s3469mrnn2c0ksp"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch new file mode 100644 index 0000000000..b52aeafb5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch @@ -0,0 +1,69 @@ +From 76c25147328d71960c70bbdd5a9396aac4a362a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Wed, 20 May 2020 14:19:07 -0300 +Subject: [PATCH] Fix paths + +--- + fbmenugen | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/fbmenugen b/fbmenugen +index 46a18dc..0c8eb08 100755 +--- a/fbmenugen ++++ b/fbmenugen +@@ -214,9 +214,7 @@ my %CONFIG = ( + + #<<< + desktop_files_paths => [ +- '/usr/share/applications', +- '/usr/local/share/applications', +- '/usr/share/applications/kde4', ++ '/run/current-system/sw/share/applications', + "$home_dir/.local/share/applications", + ], + #>>> +@@ -232,7 +230,7 @@ my %CONFIG = ( + force_icon_size => 0, + generic_fallback => 0, + locale_support => 1, +- use_gtk3 => 0, ++ use_gtk3 => 1, + + VERSION => $version, + ); +@@ -252,7 +250,7 @@ if (not -e $config_file) { + } + + if (not -e $schema_file) { +- if (-e (my $etc_schema_file = "/etc/xdg/$pkgname/schema.pl")) { ++ if (-e (my $etc_schema_file = "@fbmenugen@/etc/xdg/$pkgname/schema.pl")) { + require File::Copy; + File::Copy::copy($etc_schema_file, $schema_file) + or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n"; +@@ -570,7 +568,7 @@ EXIT + $generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER"; + [config] (Configure) + [submenu] (System Styles) {Choose a style...} +- [stylesdir] (/usr/share/fluxbox/styles) ++ [stylesdir] (@fluxbox@/share/fluxbox/styles) + [end] + [submenu] (User Styles) {Choose a style...} + [stylesdir] (~/.fluxbox/styles) +@@ -580,12 +578,12 @@ EXIT + [exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg} + [exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png} + [exec] (Run) {fbrun} +- [exec] (Regen Menu) {fluxbox-generate_menu} ++ [exec] (Regen Menu) {@fluxbox@/bin/fluxbox-generate_menu} + [end] + [commanddialog] (Fluxbox Command) + [reconfig] (Reload config) + [restart] (Restart) +- [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center} ++ [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center} + [separator] + [exit] (Exit) + [end] +-- +2.26.2 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix new file mode 100644 index 0000000000..fcf8191d3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, fetchFromGitHub +, fluxbox +, gnused +, makeWrapper +, perlPackages +, substituteAll +, xorg +, wrapGAppsHook +}: + +perlPackages.buildPerlPackage rec { + pname = "fbmenugen"; + version = "2020-05-20"; + + src = fetchFromGitHub { + owner = "trizen"; + repo = pname; + rev = "ed9a680546edbb5b05086971b6a9f42a37cb485f"; + sha256 = "1fikdl08a0s8d6k1ls1pzmw2rcwkfbbczsjfx6lr12ngd2bz222h"; + }; + + patches = [ + (substituteAll { + src = ./0001-Fix-paths.patch; + xmessage = xorg.xmessage; + inherit fluxbox gnused; + }) + ]; + + outputs = [ "out" ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ + fluxbox + gnused + perlPackages.DataDump + perlPackages.FileDesktopEntry + perlPackages.Gtk3 + perlPackages.LinuxDesktopFiles + perlPackages.perl + xorg.xmessage + ]; + + dontConfigure = true; + + dontBuild = true; + + postPatch = '' + substituteInPlace fbmenugen --subst-var-by fbmenugen $out + ''; + + installPhase = '' + runHook preInstall + install -D -t $out/bin ${pname} + install -D -t $out/etc/xdg/${pname} schema.pl + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/trizen/fbmenugen"; + description = "Simple menu generator for the Fluxbox Window Manager"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index 1b892c7f53..c1104eb0a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.4"; + version = "6.4.5"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1smbydwfjq29a2l44g6mgj0cd412fz40gbq6vq0klm7pmgd606si"; + sha256 = "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix index 2d3c3f799e..2b0fc88ccf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "057f9kp8g3wixjh9dm58g0qvzfcmhwbk1d573ldly4g5404r9bvf"; + sha256 = "08h14bf4z2gx9sy34jpi2pvxv3i8g9ypl222hzdjsp2ixhl0jia9"; }; vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index a3135c4bcd..7fe94cd2ff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.70.0"; + version = "0.71.1"; buildInputs = [ libsass ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "14g1x95jh91z9xm3xkv2psw2jn7z6bv2009miyv727df4d58nh6m"; + sha256 = "0kx3q2i5p8k1dfkh02ns5ns97aqqvdcs0kx4bl9d38jk3lw3jrgh"; }; golibsass = fetchFromGitHub { @@ -27,7 +27,7 @@ buildGoModule rec { ''; }); - vendorSha256 = "1wl9pg5wf1n5n7gq6lyz0l5ij4icjpfinl4myxwj93l2hqqyx2lf"; + vendorSha256 = "1fz1wvw0jy3rj6pl1w6vpr0xr1v8pnpf76bwdalacqy6r85lxmkl"; buildFlags = [ "-tags" "extended" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix index 1515b4b0f9..0c2abbd9f5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix @@ -2,7 +2,7 @@ , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null -, bazaarSupport ? false, bazaar ? null +, bazaarSupport ? false, breezy ? null , cvsSupport ? false, cvs ? null, cvsps ? null , subversionSupport ? false, subversion ? null , mercurialSupport ? false, mercurial ? null @@ -12,7 +12,7 @@ assert docutilsSupport -> (python != null && docutils != null); assert gitSupport -> (git != null); assert monotoneSupport -> (monotone != null); -assert bazaarSupport -> (bazaar != null); +assert bazaarSupport -> (breezy != null); assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null); assert subversionSupport -> (subversion != null); assert mercurialSupport -> (mercurial != null); @@ -39,7 +39,7 @@ stdenv.mkDerivation { ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] - ++ lib.optionals bazaarSupport [bazaar] + ++ lib.optionals bazaarSupport [breezy] ++ lib.optionals cvsSupport [cvs cvsps perlPackages.Filechdir] ++ lib.optionals subversionSupport [subversion] ++ lib.optionals mercurialSupport [mercurial]; @@ -64,7 +64,7 @@ stdenv.mkDerivation { wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} - ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} + ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} diff --git a/third_party/nixpkgs/pkgs/applications/misc/img2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/img2pdf/default.nix index 972e3b7e7b..b9c06d5122 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/img2pdf/default.nix @@ -4,15 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "img2pdf"; - version = "0.3.4"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "0jgfk191vvxn2r6bbdknvw5v510mx9g0xrgnmcghaxkv65zjnj0b"; + sha256 = "1yx0ljbg7phpix507wq584qvspp2jgax7flpp1148pxpc2d51mcc"; }; - doCheck = false; # needs pdfrw - propagatedBuildInputs = [ pillow ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 9e244fb44b..8731ed2683 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -24,17 +24,17 @@ GEM http_parser.rb (0.6.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jekyll (4.0.1) + jekyll (4.1.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (>= 0.9.5, < 2) + i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) kramdown (~> 2.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) @@ -64,9 +64,9 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) pathutil (0.16.2) @@ -76,7 +76,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.18.0) + rouge (3.19.0) safe_yaml (1.0.5) sassc (2.3.0) ffi (~> 1.9) diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix index a02ec1f16c..8c1773f19d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326"; + sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gw05bh9iidnx2lxw0h5aiknbly818cmndc4a9nhq28fiafizi82"; + sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; + sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj"; type = "gem"; }; - version = "0.3.6"; + version = "0.4.0"; }; mini_portile2 = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -353,10 +353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; + sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; type = "gem"; }; - version = "3.18.0"; + version = "3.19.0"; }; safe_yaml = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock index d5588438ae..8b771bc1c0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -35,17 +35,17 @@ GEM http_parser.rb (0.6.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jekyll (4.0.1) + jekyll (4.1.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (>= 0.9.5, < 2) + i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) kramdown (~> 2.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) @@ -90,12 +90,12 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0425) + mime-types-data (3.2020.0512) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) multipart-post (2.1.1) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) @@ -110,7 +110,7 @@ GEM ffi (~> 1.0) rdoc (6.2.1) rexml (3.2.4) - rouge (3.18.0) + rouge (3.19.0) safe_yaml (1.0.5) sassc (2.3.0) ffi (~> 1.9) diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix index 8c2b1ffaf9..5f54a4f738 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326"; + sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gw05bh9iidnx2lxw0h5aiknbly818cmndc4a9nhq28fiafizi82"; + sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -457,10 +457,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; + sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj"; type = "gem"; }; - version = "0.3.6"; + version = "0.4.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -478,10 +478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2020.0425"; + version = "3.2020.0512"; }; mini_portile2 = { groups = ["default"]; @@ -498,10 +498,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; multipart-post = { groups = ["default"]; @@ -602,10 +602,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; + sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; type = "gem"; }; - version = "3.18.0"; + version = "3.19.0"; }; safe_yaml = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix index 12aece3ba5..e6a140ec7f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jgmenu/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "1wcmx2yhm6n54w6nymgb8pgfjv411i3zj1vk79q9vr052y1622z0"; + sha256 = "00q4v31x4q7nm61wda4v0gznv18bm3qs8mp04pcns60qacdv9lkk"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 3c84588530..6515b3132d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.0.201"; + version = "1.0.216"; desktopItem = makeDesktopItem { name = "Joplin"; exec = "joplin-desktop"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "060dkgamsv59vgslqyjfh1g8wg3nldrvfb9lf0y9sxjlbsv8bc55"; + sha256 = "17rb7h98h9i2p5kw5gznx5swpz6yxqdxwc9x5cgbkc31vk10iszn"; }; @@ -42,7 +42,7 @@ in appimageTools.wrapType2 rec { ''; homepage = "https://joplinapp.org"; license = licenses.mit; - maintainers = with maintainers; [ hugoreeves rafaelgg raquelgb ]; + maintainers = with maintainers; [ hugoreeves ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index 1d668e039b..3a1393913e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, - unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }: + unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }: with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.40"; + version = "2.45"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1gldl74wz2lvsci6rn71d6q1zmnhr52z6fjib9nsragsazq5byz9"; + sha256 = "07wyp3k2kiprr47mc4vxb7vmh7g5kshcqw0gq3qr87gi78c9i66m"; }; sourceRoot = "."; @@ -20,6 +20,9 @@ with builtins; buildDotnetPackage rec { xsel = "${xsel}/bin/xsel"; xprop = "${xorg.xprop}/bin/xprop"; xdotool = "${xdotool}/bin/xdotool"; + uname = "${coreutils}/bin/uname"; + whereis = "${unixtools.whereis}/bin/whereis"; + gsettings = "${glib}/bin/gsettings"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch index 318f8a3589..0a99f506b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch @@ -1,8 +1,23 @@ +From 830d0db80f2fce09e12c117f8338b8e4b05866ff Mon Sep 17 00:00:00 2001 +From: Pascal Winkelmann +Date: Tue, 19 May 2020 10:28:31 +0200 +Subject: [PATCH] fixpaths + +--- + KeePass/Native/NativeMethods.Unix.cs | 2 +- + KeePass/UI/UISystemFonts.cs | 2 +- + KeePass/Util/AppLocator.cs | 2 +- + KeePass/Util/ClipboardUtil.Unix.cs | 14 +++++++------- + KeePassLib/Native/ClipboardU.cs | 2 +- + KeePassLib/Native/NativeLib.cs | 2 +- + KeePassLib/Utility/MonoWorkarounds.cs | 4 ++-- + 7 files changed, 14 insertions(+), 14 deletions(-) + diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs -index 7495a1c..4ef4727 100644 +index 4c47258..79cfdb2 100644 --- a/KeePass/Native/NativeMethods.Unix.cs +++ b/KeePass/Native/NativeMethods.Unix.cs -@@ -128,7 +128,7 @@ namespace KeePass.Native +@@ -130,7 +130,7 @@ namespace KeePass.Native try { Application.DoEvents(); // E.g. for clipboard updates @@ -11,10 +26,54 @@ index 7495a1c..4ef4727 100644 Application.DoEvents(); // E.g. for clipboard updates return (strOutput ?? string.Empty); } +diff --git a/KeePass/UI/UISystemFonts.cs b/KeePass/UI/UISystemFonts.cs +index 08d6134..2bfa4a2 100644 +--- a/KeePass/UI/UISystemFonts.cs ++++ b/KeePass/UI/UISystemFonts.cs +@@ -188,7 +188,7 @@ namespace KeePass.UI + + private static void UbuntuLoadFonts() + { +- string strDef = NativeLib.RunConsoleApp("gsettings", ++ string strDef = NativeLib.RunConsoleApp("@gsettings@", + "get org.gnome.desktop.interface font-name"); + if(strDef == null) return; + +diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs +index af02803..8a32c9d 100644 +--- a/KeePass/Util/AppLocator.cs ++++ b/KeePass/Util/AppLocator.cs +@@ -429,7 +429,7 @@ namespace KeePass.Util + if(NativeLib.GetPlatformID() == PlatformID.MacOSX) + strArgPrefix = string.Empty; // FR 3535696 + +- string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp); ++ string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp); + if(str == null) return null; + + str = str.Trim(); diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs -index e93a22a..3fd9a2b 100644 +index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs +++ b/KeePass/Util/ClipboardUtil.Unix.cs +@@ -42,7 +42,7 @@ namespace KeePass.Util + // string strGtk = GtkGetString(); + // if(strGtk != null) return strGtk; + +- return (NativeLib.RunConsoleApp("pbpaste", "-pboard general") ?? ++ return (NativeLib.RunConsoleApp("@pbpaste@", "-pboard general") ?? + string.Empty); + } + +@@ -50,7 +50,7 @@ namespace KeePass.Util + { + // if(GtkSetString(str)) return; + +- NativeLib.RunConsoleApp("pbcopy", "-pboard general", str); ++ NativeLib.RunConsoleApp("@pbcopy@", "-pboard general", str); + } + + private static string GetStringU() @@ -62,7 +62,7 @@ namespace KeePass.Util // "-out -selection clipboard"); // if(str != null) return str; @@ -51,20 +110,33 @@ index e93a22a..3fd9a2b 100644 return; } diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs -index ddd8f57..150eb82 100644 +index 291c51d..3c76380 100644 --- a/KeePassLib/Native/ClipboardU.cs +++ b/KeePassLib/Native/ClipboardU.cs @@ -27,7 +27,7 @@ namespace KeePassLib.Native { internal static class ClipboardU { -- private const string XSel = "xsel"; -+ private const string XSel = "@xsel@"; +- internal const string XSel = "xsel"; ++ internal const string XSel = "@xsel@"; private const string XSelV = "--version"; private const string XSelR = "--output --clipboard"; private const string XSelC = "--clear --clipboard"; +diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs +index 2d227a3..243f4ee 100644 +--- a/KeePassLib/Native/NativeLib.cs ++++ b/KeePassLib/Native/NativeLib.cs +@@ -145,7 +145,7 @@ namespace KeePassLib.Native + // Mono returns PlatformID.Unix on Mac OS X, workaround this + if(m_platID.Value == PlatformID.Unix) + { +- if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( ++ if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( + "Darwin", StrUtil.CaseIgnoreCmp)) + m_platID = PlatformID.MacOSX; + } diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs -index 0da7019..f6a1022 100644 +index e20bb3a..4fd875b 100644 --- a/KeePassLib/Utility/MonoWorkarounds.cs +++ b/KeePassLib/Utility/MonoWorkarounds.cs @@ -41,7 +41,7 @@ namespace KeePassLib.Utility @@ -76,7 +148,7 @@ index 0da7019..f6a1022 100644 private static Dictionary g_dForceReq = new Dictionary(); private static Thread g_thFixClip = null; -@@ -303,7 +303,7 @@ namespace KeePassLib.Utility +@@ -335,7 +335,7 @@ namespace KeePassLib.Utility // } // else { Debug.Assert(false); } @@ -85,3 +157,6 @@ index 0da7019..f6a1022 100644 "-id " + strHandle + " WM_CLASS") ?? string.Empty); if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"", +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch b/third_party/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch index cde6e7252b..9a7e3fe998 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -1,13 +1,25 @@ +From 4cb0b18f5326a07927453897180289a4b254ac4f Mon Sep 17 00:00:00 2001 +From: Pascal Winkelmann +Date: Tue, 19 May 2020 10:43:49 +0200 +Subject: [PATCH] loadplugin + +--- + KeePass/Forms/MainForm.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs -index 3d5fca0..4c3f3d4 100644 +index 347eaf5..b92e1e2 100644 --- a/KeePass/Forms/MainForm.cs +++ b/KeePass/Forms/MainForm.cs -@@ -406,7 +406,$OUTPUT_LC$ @@ namespace KeePass.Forms - m_pluginManager.Initialize(m_pluginDefaultHost); +@@ -440,7 +440,7 @@ namespace KeePass.Forms + ToolStripItemCollection tsicT = m_ctxTray.Items; + ToolStripItem tsiPrevT = m_ctxTrayOptions; - m_pluginManager.UnloadAllPlugins(); -- if(AppPolicy.Current.Plugins) m_pluginManager.LoadAllPlugins(); +- m_pluginManager.LoadAllPlugins(); $DO_LOADS$+ - // Delete old files *after* loading plugins (when timestamps - // of loaded plugins have been updated already) + m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); + m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 73b51e4adb..784656b8b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0hqc11vz24b6nfpfzsjwwmaq0sznwwqpzmd48q5wpdl0kz1309gj"; + sha256 = "1zv8yazhdyxm33vdn0m5cciw7zzg45nwdg4rdcsydnrwg7d667r6"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix index 0b3d65e21e..28157d6153 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "00lkb1w536jyhka2znxmgbyss13j4h75yvl42z4hlgz31wljcin4"; + sha256 = "13klasvrndwsmpcxkgy7kvsl2jqmp2cl52vb4i0hk18lr004scgy"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix index 7adc777c00..95920362a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "0wvn3jbxjcpdg9jzxkhx5dlc0zx2idky6mb75fpha8ww1jg7qf1g"; + sha256 = "13p3379c26l57121ymx0kw7afh51zv614p57di311d2a41jaz5cw"; }; configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix index 90b42ba72b..348ea4b991 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1xrg25w175m2iz7q9v7c05a0p0v5rr71vd4m3v6p0lqvij3sih4s"; + sha256 = "00xxrssa3gbr5w2jsqlf632jlzc0lc2rpybnbv618ndy5lxidnw0"; }; - cargoSha256 = "17rw9wp9mfv38h0azdjwl60bxdknb5q84ia0a2r1vi91gz6275cs"; + cargoSha256 = "1ji64h0f8f2sq12cx33kymypzar9swhaj903gclf3jdwgna77326"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix index 4d2576aaad..c43ae1de9a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "0n4jw0dsqw929a34ff077kz8w89vkjkqf8dy4c356zh6gf23cdxr"; + sha256 = "0a9ap7p8iw57sn5nmhim7gp5as8gj6ir6l3p0bpmg4iqjsr4169h"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index 52a4795477..3882debd99 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "050cx9ncs1hfb14llly0wm3h5s4377s3sinmkjc52xm2z2gc7m5f"; + sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; }; - cargoSha256 = "1hw0y6c1ypp470cca3yw6fc7xvligy3av8hsa9bhdm5can46hyzi"; + cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 4f046e34b1..3dfda8b9c5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -11,13 +11,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.24.2.1"; + version = "3.24.3.4"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "1g295gljq051x09f4d8k586bkg3vs8z22dn3rxj6xrm6803z8zw2"; + sha256 = "0hv9050srrq7fm1fqla8b52mwpilsvr1jriz4ay633s63svss3zz"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/qmapshack/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qmapshack/default.nix index a3238f7cba..edb5a9b378 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qmapshack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qmapshack/default.nix @@ -29,6 +29,10 @@ mkDerivation rec { "${src}/FindQuaZip5.patch" ]; + qtWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ gdal routino ]}" + ]; + meta = with lib; { homepage = "https://github.com/Maproom/qmapshack"; description = "Consumer grade GIS software"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix new file mode 100644 index 0000000000..0fe0e03060 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "rmapi"; + version = "0.0.11"; + + src = fetchFromGitHub { + owner = "juruen"; + repo = "rmapi"; + rev = "v${version}"; + sha256 = "0zks1pcj2s2pqkmw0hhm41vgdhfgj2r6dmvpsagbmf64578ww349"; + }; + + vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is"; + + meta = with stdenv.lib; { + description = "A Go app that allows access to the ReMarkable Cloud API programmatically"; + homepage = "https://github.com/juruen/rmapi"; + changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; + license = licenses.agpl3; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix index 070a81167a..04ceed6354 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.9"; + version = "0.7.91"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "117gcc41rd24y5hpm3drqxfcfz52smpcr8w76xnykx8wb1ac50jf"; + sha256 = "071vfx7bdf7hfa4784xz97vrj9x5aipgjbp30r00kg2zhg8wa2ls"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sleepyhead/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sleepyhead/default.nix index 0753045cc4..17c5ec9be2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sleepyhead/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sleepyhead/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }: +{ lib, stdenv, mkDerivation, fetchgit, zlib, libGLU, libX11, qtbase, qtwebkit, qtserialport, wrapQtAppsHook }: let name = "sleepyhead-${version}"; version = "1.0.0-beta-git"; -in stdenv.mkDerivation { +in mkDerivation { inherit name; src = fetchgit { @@ -13,21 +13,30 @@ in stdenv.mkDerivation { }; buildInputs = [ - qt5.qtbase qt5.qtwebkit qt5.qtserialport + qtbase qtwebkit qtserialport zlib libGLU libX11 ]; + nativeBuildInputs = [ wrapQtAppsHook ]; + patchPhase = '' patchShebangs configure ''; - - installPhase = '' + + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -r sleepyhead/SleepyHead.app $out/Applications + '' else '' mkdir -p $out/bin cp sleepyhead/SleepyHead $out/bin ''; + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" + ''; + meta = with stdenv.lib; { homepage = "https://sleepyhead.jedimark.net/"; description = "Review and explore data produced by CPAP and related machines"; @@ -37,7 +46,6 @@ in stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.krav ]; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 01d1891dd7..7af9053553 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -39,6 +39,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; + # No tests are available by upstream, but we test --help anyway + doInstallCheck = true; + installCheckPhase = '' + $out/bin/syncthingtray --help | grep ${version} + ''; + cmakeFlags = [ # See https://github.com/Martchus/syncthingtray/issues/42 "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5" diff --git a/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix b/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix new file mode 100644 index 0000000000..28c1be4219 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, systemd }: + +stdenv.mkDerivation rec { + pname = "systembus-notify"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "rfjakob"; + repo = "systembus-notify"; + rev = "v${version}"; + sha256 = "11zq84qfmbyl51d3r6294l2bjhlgwa9bx7d263g9fkqrwsg0si0y"; + }; + + buildInputs = [ systemd ]; + + installPhase = '' + runHook preInstall + install -Dm755 systembus-notify -t $out/bin + install -Dm644 systembus-notify.desktop -t $out/etc/xdg/autostart + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "System bus notification daemon"; + homepage = "https://github.com/rfjakob/systembus-notify"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; []; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix b/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix index 1a21bb4386..25cd3a5367 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.2.0"; + version = "1.3.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "0ci8kb7gdp1dsv6xj30nbz8lidrmn50pbriw26wv8mdhs17rfk7w"; + sha256 = "1aijh1ad7gpa61cn7b57w24vy7fyjj0zx5k9z8d6m1ldzbw589cl"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 408ef0a323..7ecaabe9a9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -7,6 +7,7 @@ , udevSupport ? true, udev , swaySupport ? true, sway , mpdSupport ? true, mpd_clientlib +, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl }: stdenv.mkDerivation rec { pname = "waybar"; @@ -21,7 +22,14 @@ nativeBuildInputs = [ meson ninja pkgconfig scdoc wrapGAppsHook cmake + ] ++ stdenv.lib.optional withMediaPlayer gobject-introspection; + + propagatedBuildInputs = stdenv.lib.optionals withMediaPlayer [ + glib + playerctl + python38Packages.pygobject3 ]; + strictDeps = false; buildInputs = with stdenv.lib; [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] @@ -46,6 +54,13 @@ "-Dsystemd=disabled" ]; + preFixup = stdenv.lib.optional withMediaPlayer '' + cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py + + wrapProgram $out/bin/waybar-mediaplayer.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" + ''; + meta = with stdenv.lib; { description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index b564c5c530..8fb07b1ae7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.11.1"; + version = "5.11.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "04wsz7hcmzm5dv9q1wb26nvcz5gxdcgkf00cp5bpbr3y9vc6dyz6"; + sha256 = "1mhqa9jb4475phhqnkc7k1mwgkan7zp7y4z2c7n2x43r48ghxpfx"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 82247d02c6..524e2a99ae 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "5.10.0"; + version = "5.10.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1p8bxp2nv30c3j3kb0bpby86378h6m7nv2vvzw06lqsj5fqbw4g5"; + sha256 = "1mkamkqhqj7nbvaxdim1rbc3f5sw410wzly4ln73ackzlvdwn319"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix index 2fffee0f0b..c6a1022288 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "yubioath-desktop"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "1g0jd7mmch6a6n8k5pp3w27qd5cijnvzk05lwraf0i96m68h7x1k"; + sha256 = "1aw88xvg6gjsfwmmlcrdcgyycn2cp7b8vxjzj14h7igcj02xh84h"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index 6616f7e429..d88d7296fd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "07zg4ia983rgvgvmw4xbi347lr4rxlf1xv8rw72cflc74kyia67n"; + sha256 = "137ak9gzcn3689fmcb90wa4szw43rh2m51mf26l77a5gksn5y6cn"; }; - cargoSha256 = "13lnl01h8k8xv2ls1kjskfnyjmmk8iyk2mvbk01p2wmhp5m876md"; + cargoSha256 = "0v40bcqh48dlhdc0kz7wm3q9r3i1m6j9s74bfiv237dqx5dymmsg"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 151ce5edc3..b3261431cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -18,6 +18,7 @@ , gtk3 , libpulseaudio , libuuid +, libdrm , libX11 , libXcomposite , libXcursor @@ -29,6 +30,7 @@ , libXrender , libXScrnSaver , libXtst +, mesa , nspr , nss , pango @@ -56,6 +58,7 @@ rpath = lib.makeLibraryPath [ glib gnome2.GConf gtk3 + libdrm libpulseaudio libX11 libXScrnSaver @@ -69,6 +72,7 @@ rpath = lib.makeLibraryPath [ libXrender libXtst libuuid + mesa nspr nss pango @@ -82,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.7.92"; + version = "1.8.95"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1f262xh88c83m6ixqxc69z8kvkl3qbjc6jnv2g8n0flw8s70hs7z"; + sha256 = "1mlffg2v31b42gj354w5yv0yzlqc2f4f3cmdnddzkplw10jgw6f1"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index fdb8584f08..8ce7c89bf7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -154,13 +154,10 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build: + ] ++ optionals (useVaapi) [ # Improvements for the VA-API build: ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) - ] ++ optionals (versionRange "81" "82") [ - (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") - (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") - ]); + ]; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 25ef76f331..df1dcb413e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -22,9 +22,7 @@ }: let - llvmPackages = if channel != "stable" - then llvmPackages_10 - else llvmPackages_9; + llvmPackages = llvmPackages_10; stdenv = llvmPackages.stdenv; callPackage = newScope chromium; @@ -36,8 +34,6 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; - gnChromium = gn; - } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index defb58822a..13b501d269 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0z9p4v5mkinf7hbdagh4bz6ymqjxg3df3wjpvm201ilzzngmjqz1"; - sha256bin64 = "1srvlirhnynh0q2a17p8z13p7r54z0cchh1d1h07hqljnwmsf8qj"; - version = "83.0.4103.34"; + sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9"; + sha256bin64 = "0lkjl09vnj2bd1jry3awbg4z34vjnzd88p73a6x7pyrfq079l6vb"; + version = "83.0.4103.61"; }; dev = { - sha256 = "178fc112bsbrgj2hss78y8rhnz8hl85fr33gawk9fz88zk5qz7xd"; - sha256bin64 = "06qra245l2bbgxc3k04aabkgq1qnzybnrjhrjb25vriv31ji36b1"; - version = "84.0.4128.3"; + sha256 = "0f7m57acv79yzq3yg2xkchqqwisdgjv8h5xngp2i2v2md9jkfkbq"; + sha256bin64 = "0b0w0nwa64gf99d617idjjgrjym3qc6p9h41kn5r9j2x46lxzply"; + version = "84.0.4143.2"; }; stable = { - sha256 = "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l"; - sha256bin64 = "0sl4wv7npc3rhi7jgn679hi7j5ykzwpx5dahy78h87yfg4fx84wx"; - version = "81.0.4044.138"; + sha256 = "1g052h8g458qx04wbkz93j7hciw12b2b3w93x2849ag69q6g4qa9"; + sha256bin64 = "1wji1ak6gi2a7lynxwvgpqsaz7zma9h2b9qbb5x3gzbv2dj37fmd"; + version = "83.0.4103.61"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index a0a0b7003b..56910dd1e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b8"; + version = "77.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f4b15745610d97f3919b644ed47b515eadfeb654eb81c5a890a2d225f1223f2f554612a5df14c4514f0f835b25f44649a923d09fdd199db4b052384075df89ad"; + sha512 = "faa837577f00714097bdec079b1df8cef64047fc9225df81e3531c6e0adfab4abdd82cd7184155d13eab152cd117804ccdb7c43f2893b6f3ff3bc1077e125e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a39343493647a46579ea6f37e5da14ed59ab5ef91a4e47b9b7f43cd3f469110b9544ef660b214b7a5f3df6373a9f6bf9b55656586a96a7f2991b4fb9a66abe42"; + sha512 = "32a963ca337c71702c5a6da5b3131af4b83fff24a27236a2cdc04bf191f1fc877869ae3ad3762e78a5d0f384bd104f89a019d405f875df1984667449fe31155c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ff0655c7fb043f01c8c4cbde006a7835a6f0271133a9dd07b90b3e0bf369233f9dc0ed0caf38421ea9b1870f1daaa598508865a239f5f2391eccfa6c0341c94e"; + sha512 = "6729c589b1ec63e0dda604a138016d37507479205ac477d12e63859c3937e1c82d10c72b0bf419ab516d9ccb60a86e0b60cc7d3f595ee90c10f7200201c5bc39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b89d38b6a44ebe00806cf7b16a29264c324d6afecf4d83e20ae4b35c502b13ee04a052a879d1c68e084e99ebd9850a9b597b6d4ea19350e0005c8d006d5cfbc3"; + sha512 = "c03744d53d95663133696f277aca2e6d22f07eef1c61c94c478893cb09605169bbc34d0558842444a454e31921e6d29349dd6cc410a9276051df5a03c1c7d6ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "34a6db5926e8bc90e47e8ed8c413e3c47fe35d119aa3c2315c01b0ea38a04a8acb44551e689b798dc030902b9d3dba3f62971b2d927ed4cdc0f965657a189af6"; + sha512 = "a361ecf02bc85ca44ba6a8e86f91ef11013b86fa9f093d330ae43e2347e560d5112b8012a5af8940afb0e34fdcd6003030149daf33dab1ba8f8717855e50d6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3a1bd479e251ad695dd397d019b3f492915f8051984ba399fd93035455070eb9a2b05bc43d87506e671ff80c4b2e4f17808f37e959d94dcb6a3067f8761f617f"; + sha512 = "7a6baa17135213be0a21257ec9f0bd1522f0e402a3746f58bb605cf2cc4b947163696313fa60cb6148c073456e3b4bfeaf5d7c948905657c1517ba6cb4976b4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0c53c0abf67079d254b5da7c3d7edee506678bc3be55d24b61865e18f8e81b9e26f8ec98d08e7e8aacfb47a231460cafa52e065a4d216cadfaae70ae0a9202f5"; + sha512 = "45f3af3d2378f48da55d2793f5b9c57835fdd2f94ac2f15614db1cb0b7b717c9ff744ea101646add604867e6ede53f62d191a12f48df071b46b57ef114dfd3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b608676213c5ce9cae42d18af0f6a836586d990d58042ac8bdd0112590f3aed30abd4272d4581a0cbb633043b4f0cadca7a90ac40777e5fdb7afe807fff1c2ac"; + sha512 = "f01e95c639dd864de6dc7742260b29a4f7b9aea0f1c404d1f00068ca5ef67fb85fccefbe443ef7fc13ee58031ad3d1d38d1c71592e8b1aca7fc215f4314f50a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "44fc7a158689424b3c781812e46b38efefae4f49098bce533c1abfcf9cae78a6be2369fe21f6be12c96fd85afab875b8a6f77af399348f82a1cce3ad4b0279f0"; + sha512 = "507c26d022d1935e007131252ee0798759ef93df65b789f8aee0ad1724929524f23f0a911d7ce5a8a82f6bf7ed2dc845da06b465ba23ab51103584655db12e2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f9f3bc634fe7c21e1cf9800f8875979e9f77764f71861926b67e9addd604e88b22f90cf31da5dc93b3ebb2dfac8c04ad423b9b21416732c9000e9747ab588a11"; + sha512 = "070b062286944c8be2b11d81206f18e5ff9e35373dd70e222d7ed252c5e42bdced507bb31cdaca8f9130ab5f012282555d4c7c54a6d216e0ac2c9f222f338358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "3558b3eb7da562ba50f1273ae461f753a95d42eca3714eb1e044bbca3e63de16ce1f040f5b34709c8a0e86fc59ac6c9d65f1dccf3a0fdc30e96c0f7490867d7d"; + sha512 = "fea2e69feb05419faab82623296845673434f269d391d52b0bc4e0b1d4c3d55ce9b6b8b7ced70414a5a1266ef5cd55faf9c31c3dfbbfe7c08c609f821293b199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "b79f0e814ce7df9de0f2a488a3a798ce9a33c840c7a39efc6a749a07e568ba881bd2e42b4a49fbe7ccee0ddbb3e7768382181ce16379a6b24551ad555685a792"; + sha512 = "d2dd835fd2a9b179ec44963df2aa38b0e8bcb46ee55bca312b6c59cb3f82857039239e51cbd224f8c66f2760214ed52da9021b9895682897231c8e7d3733e89e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "69a6c978b4c896091f6118b55783988fc505c819d74cd455ec6274d54fb6994a012f41d09d9b574be90bc10e47b8d186b8021421d86d05db6945ecda1e51d127"; + sha512 = "14f626b4aa9096334d563fc853afad428d2de8d2cd7f80d512464c219f1326568530be08cb318e0edce0489c9686364471e92455db9ceabb97e497f327acecb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8253f68114e9bb035edb0d718439f0d28f04e6afa7ea33d1001a1457723c4cbcd17362c0b517a23ca78a53ad2dfc847be396e28beb3a302f2380a6dad5eedee5"; + sha512 = "ab25fd7b09a8c46a452a57e3e5586188a9a614bc884cf7d133460c730c5cc20945e4d29d54229be17ac5101f1c2aadb937a0a116d2f0fa8fe83e18b3bda003d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1413cbd3345770ce7597ef139242b72fcc9b7c53bca4b7cbfa707f00bc3d2778305f617047ba24fa22f808c0168524166a6fe7cc7db6ea0c5cd30b609e80d404"; + sha512 = "bf62968ad7aab66d7b931b33953aaabae004de2b3224d099ca8a600ada0cb7c1e7703ab7e4fc3699942cc2a0b1b37a1af0b93aa3134fec7c6aa8e79e9eb19c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1628a73872c268d4aa8ac78bffe6ab49341735c6abd5c8f805c86129ca0fcf5d03251e962fcd4c9ecdda6af125b8d4f9d095e42b2ff5c185267cd41f3090acd0"; + sha512 = "0bac8d012df7364429f656e8b20e94b18ec1629111e4c3675c2f4d8b9104de929ab1833bb28ac5ebdbd20f3e8f0b0b393ad1857308c57a76b8d465e0d2c731f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f51f300911731acd439068bcbbab712ce4920345b481b8db80b3f6ca1c1cf18fd201a9e639abc78db97933d4872c7241324591a9c045bc1c6d71898e2a2fca93"; + sha512 = "990899501c4fb0228817288f06c9af9f295101af053412a3171f2c3a368cd7047388b43c07e4fa205c3c9d4e2a19dd7232742e46bbcfa128494c274a98e01f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "196ce93a18112d7e0df8a8c1e444d503d3b0a2d11e70907963197760c2127c4f827ae9a0eb79fa7745190c92be10c7828a42414d33ec9ccea1f0b7194ffcc325"; + sha512 = "c093c2304f95151eccdd694f714541d92c99327534645ae3b9219b779776aea0478d5a7539cecfac4c22e6e49b02ca2e92442343a9b818a79fee6a3c100887da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "da6f0afd218345ffa1bc0b037ca20c9aa6b18597471d35d5cc8f4fcbd4f39f91e2839fe35f186577ed4445d34e76d4c8175f2df24f7bc0795f606cc6ab47db7f"; + sha512 = "ea83c7500ed8c59b6edc128bdd77fb4ab608f25f020d91bbe1b76970f7a054fd4c5492ec8d3bf4ddb3105957cb89deca16eed82895435998233731c658c1bc1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4ea4754aa0b337e94f3fec5b108c703ac80827d514e64e3e6c890e050107249367c4167b58f21177c3071c11301c37de08703136f03edc0aa901a22e2126b279"; + sha512 = "c6c32e780edb3feb57874efb61a0e155ea3dd011008db47ec9fae19fa035d01657a3b4fae05407dab5ebfb72ae00dee9680023c9d2d2f572a4f59e3f7e42cbe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "f6f59d13148c7e5510a03e93644b38a788911ed904e088be48cd1bde071ac372b4b047f988714ed44d1f64ca6a32502564f01780be80f6c49373119ff7021454"; + sha512 = "6a9a96205a2edd93c08d10ff0b9456a7964a167ac20e881b37e21cfce169455ecf3f6aab39719574f102d7f1b3322b829a20399601b156d0f9cd465a5f0a9a60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "fa42017d8111e96c4d81ce515577e1307e187493866c04f3687746647904f2f89a3f0df822ffdc2004bb0fa06aeba102e29b660e250737b2264b5015010ab869"; + sha512 = "94bedfeaf71fc9f8a4d0e0d79e47790e0fa70838fc2f3759255e4f5466cb26924e72aa044de2d8ba238569eb1a77092f5dc03ca4e7267f745b26689355056fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "5f47dbf433ab20c2db027542eb0a3dcff7fb0b526ec93908f182e1dadde112da327f84edbaf44ccb26d36c120a414d64ebb9b10a77501644d9f1c9c3d34b7346"; + sha512 = "fa03a78389ecb11ff3c76e182bc1b84cdc9043eeb9d9648e38a7b3362e22f7ce2cf1fc0af9fabce3a2d103f169f74e946cae4cb655a868ae26cc765e25155dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "3cd5e9e99b73694aeded24d9acc7c594bcc582eafca5867a7123c5067e34f7e96781164fd7db2b53366bd0d0d66fc495931cad42b1e3d56726c8e5f82c8aea4b"; + sha512 = "afd6821d1a76097f7cb8285355c554d05d694e7c5bfed2cbde0b9d5c25512d2ff5d4c338a342fe546c3094152fe0f196f4826a859ea4eeea9a69a91198660c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ae43f7147a3ce843488623c4558d9088690fe6ecf7153ff30da09051e9e9fe90df28bf6529a469b8d799554c8ee3ef92006e73a2cb9e68a5b71ab392a977e849"; + sha512 = "90a821a4db378e64c74f2a30b951febf1d56fc91dd1746ccfe789614f9b5ca61d78b4374cc01eed4b776445a00956eba14bfe402dbd360241a6542cf37a64e5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6ccde441b5c44514da5bf7cb9aa959f818d5c499fa8d33487102cb1a1cb98a501b1575ecc28f8288cbc4b69dc70bc76f365e9b52d4329b685f25a1ba9d1ff063"; + sha512 = "ce7c9a90de740aaf21c23404f335c16edd0647dc44167e5cbd55491f7edd4135ba8c8c220cd65a76fc7ec91972b1b53d0c9f61b571aefc920049f590074b776f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3800ba267d51d9046999c931b5bd9a743d2a3481486a7ee713f76c003c863b8579d44ca53ea56f5b32c8022ffd9ee0184b7c734e5671b412f60d04653ca2c8fb"; + sha512 = "7c3fc75ac74feff0ef0862cff2b476d2ed847dbba717889d848bd9d9265cfdbd0c8238337f116bd9976955d51d0e1165cfdb643e6d67e85137d8481abc323d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "600a1aa9a0b97fe66947107ee9018740e2f7c07bd3ac51b03c0c6d52728d72f93062c9dfebb97042c9a23a85631c88502feaa6a8cee395953ef23c2addf6a99f"; + sha512 = "c5f8b98ae9166fac5c9da9d39008bbd43aa3548ab451f0d47e096a2e22e5b5ad4acba5aedc1ae0e1d67dca8c1789a2e1e9e65124a3fa816b0eb31eeaa22d050b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "498f59dc3a6faf067c8c3d23eb5754dc8cf0478b50379359122b7a8e6ead6d7c6c39856cb34f3510f7fe1a11af3e0533a3805821ba49cb7cbf1d40b1caf36b3f"; + sha512 = "3ba3213746a3d22c3d332946c4a98702689b2a7427fe5742e47cb696fc04817bf9fb3511188983050e14ab33135661e7104c75e7ae1439048f3762c08b34a0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a5d58868468f9ccf22afe78734121e1f81961efc9c7add2a065ec9b9d5d68d8fe96b5f563a85b960ea7ff94c70e1c3aa3a9f0f1bb23cd175df549375c1479072"; + sha512 = "433eec6c2b3d03e6c4d549dd09017d04685c2079c6bd3d34773ac424c871013bcfe57f872083ee5c3e5578208cae79c151b3bc1d5943568827f6edd8de196460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "02a5d946542aff81bea82ec73fe30919fe4a1d1acbd18ef194a7c8879d9b70e319abaee2e4d8b3a2671cecd28fffaa37a182f7dfa06884f83d765b8701c60a9c"; + sha512 = "5cbcf27f43ac79f802fd05c90d7fd0364be88acbce0e994bb7a867f378b5aad146a1c667426d736dafe0ade86a5d91abb2de4ac1a0a897dec6d3c38a94cb62c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4ab405c47fbdb83eace54b0db61c734941d5ae6c5735d50dc6800271dc59cd82de9df9e1e98f238c4726ff9319c31a8879b2f0330792289db5e4b01cd3caf3da"; + sha512 = "4a0416ed025073d5a41ebfd9432ee1451917c3b1ff94403011c381170c558be4f1ed7fc052473f806be4d035c7e16c266a2d2db5b2d7a2bb2b9de1d236280077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "82f95d6462097fb2975285326ef6b35a572b4c25bf07517f3ad680a978aea95f5cd4ab946275dd74cd6aa98566d1a4288761c985c39e1cb3d9e963b892a37544"; + sha512 = "3560e1528fd40497e5e16ee7c0f4ab76fe71e77e8e8f938a09e2b89fd8c6d1fb3389d4b95807267101a7dcc361f47d227e5831e5bb7416e45d0b1435bd728f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a6df8eea8918292c18b281f5118a0373bc69aabc585d3a711ff77355a1aa95f5049d31df3bdb72087931dfc347050f4ccd791a9729f7bd3d95cab20c78da8a59"; + sha512 = "d0e7ab281050f7d2cc8804660e5bc5e507c3dfe4fc493c3082bde5f6d6b41d596b92903f821e5d37ab94c819cc97d55f2a266627b6be42e492dcb8d2d99f826c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d5cbb68867369a82d84ade5a847d8574ff687c0cada8714c8a072291aa02eef748dc109b42f1b246980f1ca14060b799098885bff2d7e4c55e7ff644ccc01e9f"; + sha512 = "5995b510a737396700316f32ac7484545c93f8957ca8faa0c40678d0271ca650ed28014e301c00b721144f386ac37c0410f28f550381f6561b1f6754a1f8df79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8d9a299c49949609f162f9bba7db369fe7c34f2b29d3075c607afd3c3bdb5ffa0ae0d9bb9d5ff5a5f0cd28556eeea5265b8f9809a2db36ae11209b9cbcb5b8c6"; + sha512 = "11416a57a298db37407f1c0998833f16bb580a00a51902fe6efb7c38e6ed01806ef9007f871331882253880ed277ebf87266c0723228d5a747537be910f64858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4431eeb86c0e3920bd08db00c10185941bc7fb3f5b055b8ba114e63bdfd7b64ccb8cdffcb754453557bec011d08d87e08b6a2ce022c77fe32add49269f3ac6d6"; + sha512 = "3128f71da4e849307fad30e0531a891f6de58a61641e7b641e5b0b8dc3c4e0d0883ac1581f5d1cd09c28130fb1d087c4f1a25582672b6af3efc70a2390af2884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0963628808ab6f6ce65f70e09c12ca38c524992c82446a2654eb42917ee2d32dc1dae94b15578ac5209e12e0fc4cbd2f56265ae8c259336415d4a56b560be96e"; + sha512 = "e0297f754c9599491d5e0f18c45f3570a0589f6b8750c2500b973b176ad963f56f5e44eeecebf23faae2d1cf549e9b7ff6a02a2b403e7cc3a05694315ed7d4c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1b19d9ca238eb05709007ddf00ff40596b49ec771839f6b1ac21162796101701fb523c0b8ff18dc6d3428eca3ed2ac0fd3bf17c5ea91efac998ebe4b8ece6c9c"; + sha512 = "c84d8f600b84e5c665e7acaa36e640ce7e2a6758a210a55e0a3b4d0b43890ec0d39269029d480ad9b2c4cebb2491784c99313632a3e7858d73fffbb16a77e425"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c0d2fa00166926927e1985ce112a035980ad24771d4ede83143c4bb9012006c811aed2612fb1f2c4b1bfc852a7c7799309f4b579aaf86fc5b11ab216239911b5"; + sha512 = "2ee2ef40e4ec35eb36c639e0b5caaa9bad57e3ecf5056c99c6d3e5d4bc12dc116a0dda02621f06924131097d921987364d7db5beae5f1707525af251ca922ad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b2a5440b57ef85a3e3ee607e9e497e6b70e3652c7f258a2c7e98e18b5a95c8d34de908d64e464be9ad224aac7869efde785e38462fad3c284649bb9c524574b9"; + sha512 = "1cd2ba19b79b94044c7da3072936e5d2c663e965bab9e7a2fe04ead68c0de1e94e4093f4321d1b07342fa10ceb6d079e0ea2dd1d818b289c6b4a8a935d3d3006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2ffeeb8d559097e9d67f7603c34585d8b4d1571a23ef5a9d04c47407b03c4db2d4633637e8352ad96989facbacf6796aa48eb94ad81b70b0be3f0955b8a0e32a"; + sha512 = "09249512d40303a35acf62d7ac5dfb5f25d5aade17f163b7abed95f08eac9e7bc5f67c4939a539ba7c2fa521aa67d05690b08d1c7541abc329467861292d556a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "91ef9459edcf44b88e9bb6c5bdf1a1d5689c99e5a44f14f4700d0821e0274e9f8c3f79388c7a97e0aa235b8ffe1099ac80a523b4d62420eba5163a608d48aae6"; + sha512 = "b2fc193b0017b81155db010ccfebb37b0f631526b18a8061ed626654d0d3f49cb973aeb0112da9e099b7dcf232a9967e2a7ae81ca2d76a6329c62d1f72d0e5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8173f8c47566f7aa486266b8c0e83eadc11c484f597334aa48eebd3ed353f5910eef527bde508e98f082240d01804006ca4771aa7992290b254601d2eec6a206"; + sha512 = "7a7ace8330802da958189d06e51b61eaecc536c8808421ceadfc9599547c7314927b08e1c595ec1e73651d5e74863a1d5ecbbc09cc11879fc9ff4dd16c6baae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7ceb26c11204ce6b1e6c3596d9dc3e6146422cc3eb0d1ef9c06251430e32f2353ee42b4363204852d6374cc845f8b84997958d2e66af3e770aad679d0ad3e66b"; + sha512 = "4a79b19ff66417f61abb12ae77068563a493c4983d41bcea198f3ea9b646550cc43061e49a5c641d56fd030de99154c37767098dfb36209ed2287afbe8014812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "cbc66db54c574aca15f8e2726ff68910d19a67cbbed9e2b63518976e3f614b4f5f6928bb7cdfd5c357d7152ef04ffe1a311656125ff5cb62e471ae59213b79e9"; + sha512 = "4d0ce5ab930e49bae189e3bebb84f3a05611b13b674cc0cbe71eb3760827115c24a27457a2dc4ca4277007733a785093742e331dd961edc2feebe98f6f74dc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "19325c8a1aa3067fa8df803b93f124427519020903ace8cf12585711634f8d546662166f11b3944880dca5eb79ae87a9e2d0e4e273d95543a4641e9cf4324ebd"; + sha512 = "2824698f01cfe336f2e292387c0044f7ae15949ae561e0944f6ab6a44603e73b62b95eb7fb0dfe8ceaad958b111ebb0a709b5efd07ecd13644d4c6334e3bc1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b74338470d7eb1aecfc75ead675e2408df33fd4841ab4953cadadfb9a7f6169f8a10c4896d4d48fe86113d3f1ff312c4298976ef8b997c26d6406f8598b19a5e"; + sha512 = "8c126ffd553fe98919a307e654321385598aa21343ee7bb4e7241b3bc59a825faa9b7e13ee1a98f3d322205d124fc19cfe53e0503f53794e01b1b28a5ed2e1b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cb3cae07b27f0d485f9eb70805671ae50325491d622dacace2a39606efd7a72e46220e4981ff012f115183641b8e00271ab06c5ab2e8bcf3baeda040546c8b12"; + sha512 = "d6885c9858853d882664577748fe5d3cc0ccde79867ec21e080b1fe799a895f0b93de2456e1332e5600ecf5286975b7d170dfd4ebaf66cdd276b7fb7d5a3f415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "83b7175ff91bad6733db2cd095172ef943867aa2dd911c6ec857dbeaad8cf4cd906278f3b8fd488e8905cd5d5574f727066ae73e92948d22804dabe16b4a11cf"; + sha512 = "249a07a88d7e6c9fa779956547a4709fe8cb75113a40aef9f8261709aeb8412ff0a2ac776096ad043c7d00d7cc03599cdab11df021d2b7a926f8fb8261fae8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b97a3c637b1632b6a6285af946eb0a2c178d8fd901cb3a9b0fa5b62d14e3bc314acedd504153ae111557b78a2edbb056bd4a255f5971e1ebad3e335879dec40b"; + sha512 = "a71922abcb69e483a84aab49893caf580b6cfcc2cf25138342e45fae6a925c4ce8b71ca3be7c606f6d4bb56c5a0e32d2b8305171a45ad90285b04e4f59be7e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2f5ae830c52bcdef8fb47880c6941d5aaf4830139b77c59c8e188e82036d315f57732633ea785c54a950d086ea02423e97ea2ac01105b5d2990821c7a15036be"; + sha512 = "2af6292101878bd056844ad8bd98c1c200004faf83bb40206b979439718c2c652ac15cc5be7713648b0821aed6876bf16e68964273c307c17c38d7c7cdf4c997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4be9c49a6b6203f2f3b3aa3b5ee2c3246d77409da5a7b7cde2c14a3fa592eba87715199447df96688e95d9905d6f1eadaf867ffe1d01be9a12feb03255848c84"; + sha512 = "bff8278ae5c4fe87daa0a04613b979386aee97ebe0aec8d80a6ac79ea13de791fc9f8ebf46d6b200d282c0fa9a6bdb3923051824ebede1a1d7ff4623b6511731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d15c5f6fbbe9b16510e94d1cf49f36fb758a97af5e75069f38b33aab8be007812d88babdb8aa365fe3e4c17a822be234111885a2d71ff335bd7ec6703e81434b"; + sha512 = "9e94630f949d32e0f53cd8a9658d777ded9fbad464de542ec4f606c4befb1ade55efc56afe692c6c15ceb969b1c8b5196e342e795eae5de6eeb27744989c8d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "351facfee64d07ffedd0e5509e8b796d0432c7b44ad29d109c50668adb8fb13f408026166a49f37a92f99bdbf7e032929a22088d4bc42c14169449234841dc90"; + sha512 = "8a38c0ba6ec5a37a02f7d24419cc43cef75f9549d3db8c5eaed8e5a00e534877c63c71fbdc5853a4886ea787d5a513406a73c48d9d9d8e31fbde39016551992c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "dab3f1437cea072c466c9407fdf647f368838bbb7c30177642bc1247a8002874f832d0661e8a3aa32df8c0017f8c664caf6125b6989a113cd08f9c874753dfa2"; + sha512 = "9a4b93057dc9ccaa3bf14074629e9f31e18ad188fdbf1195e6daa4c6ec31509f7e417723ddda909ea0eac121627cce716c9b6ad74bb59ab9274370141af2256d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b62dde501b06b4d825d9ffa8008b45a40bbfc93123df07136128f22c7f6e1f1cc42a0ea7e97c1a962a7b1a1a23bccd5eb66785a246781769b22bb43b8ef451e3"; + sha512 = "0de01ecf0815f1046c7d24fb5561dc7602dfe24d0f3d9a23cf934e6087a7b190635738f7d08c84d3dd368c62776f003db6b2cd90a9249090d479784758ecb61b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9fe6488ed61c360ec1ba0d784409938159637c96abff94ebe18f198a8c0a72b052b5b0e6b5946339cdc5b5b3288c8e76811704366a4e9f9c498a9041955f7df8"; + sha512 = "d659155611ba762a2c8a670c2d77b7ba693816d062bed08834251c56b8c4727c580cf6b38c1e7807deb4e65b2da7db940df4c9cddabfcc1b99d1d8e00f056170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "804c3639ec0275d844f9ea37b1ccf5f259c50301cd5ee719b6be07a5097218937b5337a25d375c0d534d59143af3fdb338809fd9490a898d226e9cbddf39b6c8"; + sha512 = "487c1d0be32fbed5c4ee7c5a3c8964acca6402fb03dac2e8a32534d8a2737129d06aaa69b1747e40aae18874b5b5b74aed682d59618765d7b248d388a4b4fe36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "14b263e7abfdad1ce738d58bc30f054f80099a7513ae443d32aa8dcde6b12f2daac56aefe9d3cbc2db9f9cab573a5ef2b046b8e8df9d5417cffea44d109d1403"; + sha512 = "c87501dec3fda705c7bc50d14b733cd8516d9a3f83228bb7a5805ef6195ec52e57da626c698460ba09bdeafc2e373f5b890a0d77f6b36aaa3b4603f97d87cf48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "068eae194df8e756a668b8e372a0790ab8fdcbd5c54b823c82106230a9cba32b5b6e530de7a981273c67af25e5d329da2c543c8a5c96c91f010d19b6ecb25bb9"; + sha512 = "21167a3e6ad9d740f567270bda50ea8cb0315f1fced2b70aadb9eeb5c6de9609504cb5b81f3c51e1b69542e393d522278f649fa515b77d2e5fbc02a82d03e7f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "6775e61398e028c2a6dcf9171ffb3d8fd4746653beb58e8c012f3256685e545abf4a62d53d67aaed3a2f04f216dedbb14a09920f24c2b6bc288fd29caa1ce2f9"; + sha512 = "58ff22621d4158b93a773016cf766f0f90f71181d77b4c7d28ab2546e61f630447e5c01c559ee887224f6579801a6ded557a748bb89e8b5d4cd086e1e04f8bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b66a91988d816963731c823f16d001b89ce14928caa129ef90dfd1f01e3c54cea2ddcf0e5f7fe34ffe23b265c0a64715c3877fe0c5c8365f80b859d3e06e84ea"; + sha512 = "ad3e4725cff1f9b6bca01425764110df71694ede2b7afcd56da88da1982cdce93f08607c17806659917ba4fa1f0c88c4758079bb695b5145f3e717b5dcd45848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "29796ba9076ab6c46f16fc06119a267861b34652322397e77872a7570e8375e3efe88c3c08731cc8909d817d3eb71e269f7d245e691b8ba4778bb653a766914b"; + sha512 = "c70153af55f07aa84d9fac8e9ebf9c9137f62f6028662afc1189ba8329efbe17d77d1f3d2f368d800cddd715701714ce73b24960c243f933aa239b880d658543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d7fe426dcbd53043a94d143a038fd901875630627e98547997be62b3319d5f2c2172ccf9315886d97d30c4a041a099e0ad8a229e840a0f4061faa9d6d3c64361"; + sha512 = "a3ef8dee50ae5b0aeb08b3e7007fd766916fa7703189efdd9a2f7e9938f68699232aa1a4550f42fadf1fcdfa236fc355a072173ef2de1b00f6ec867f47cdc080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "093ee3c1d513adaff69bf84f5b9236c245c4580ae25f7caa642be239a591ad9242b329f15e2dde0969d12223cb6ab8decfc657ca440e344a87e42dd880450adb"; + sha512 = "2fe23bbbaa450de730e8269bb530dc03f1ff6b6d08e128bb685cfc601ff3930bdf50646f0f23252d692be0e843505a57c182dd747dd60e1404883b89379d697d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e912de72ee10ac764cccf1243c0c1f8fcf159d6ade88c7ff575a5f7a5175efe8086d8b4ad4c9a72cd65d59186665d0e11abc4399b0692428bb8c93d025de2f9f"; + sha512 = "efed082f592adf33fcb1fa1619743d0f502295dfb0626eeb66c17aac2d6cbb68598013b37631050c0438cc9dccb5756becad117a82493c9ef9b4c4c46aad6eef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "52c57e140593211af5abdf729d4dd45be242539aaad4688ab081d311804d56afe05ac6ae3e21c439a560f5213e49abd1ae0e5650f091215948ca514ad3eb7e20"; + sha512 = "6f34fee6e0beb244b567e748c8c4ffb72021061aec9f5112f782dda3cd90a76b1ba3f044e5eee7b6c0b0b39c2c9b32626cc379d3e4d1bbd37ef6b7bed8d3ae33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d249ab86026370ce7f417ddb7d7cc0a4fc58563a1c12388a4e1628938e3af8a1428f2e43cf7ace0c9e455e4b4999942221fc3d96723bd927c50f7e45c7bc1a1d"; + sha512 = "cfa9c3712952e93e854300bef57cc8b4c5ac908abcab9fc06c6818936b52377ec7d2dbee8d1d28313175b7d39977b7c1294babce387e5a8bc3bce50d6de74ac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "7d5d1861559627f9a77160106dd5c527d09656be5586791c2bf2a61292b1cb1150c545ff1f39a6744453af58bd44777b9668993a10e654ed4c8edddddec12467"; + sha512 = "166c240c73de0b4c3107270b3a1a4539a9c4a0712e96f3ccbef95330842d8b1c02ff6a15187c262231bfbd3e0ed237ecd3184b1abbb666ff55e5d4f242cc6f95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "24a419ca7b8c82112bac80aa9d956f3198cb324991492f9f66bcf0d64fcbe5618a2e654849dcb5794399dad32de91bf48bd3bba70003e02b9bf28634b8d4b267"; + sha512 = "5588ffb0238189fd9f18b6a50e8b421b807e50e9bb2da7fbed2c8c5d503a738a4c1b79457780ac6731e71b938879e2c8d61701cf5e21814172eb268c9d71c460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cf33be7018dfffc891e4cac9950ead0274957b9a44e27bd7924abd62f93e69b575dbaab1a663ebf829a05283f957dae0a7442abe76e8e1a8a6e35e12be6e2821"; + sha512 = "a9341b379e27f059cd26d03cc4f68124f52b8501c983e8c29653694e5d821311c92af123e2569933e6140889a701f4a7e5eeaa7f80e24502f75414be3631b57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c368498ffa8eb48801634fa6b50a74a563a28d4fcd23e4634eea52fb6ecf2872e4cd91aef5799afd8dcbf6020c7f694dd3eeff1197c3cfdac63bd72acfa7d7cd"; + sha512 = "8ce686c98f56d8e8847a567a71a52577569403daf02793f090a360e266d8fe3044088d615db0c0b8d3eea8f1da331f6f37bc21265fc4078c2a1e7d12d3be70e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d2064ab0dba1c122a599954efb01e4a68f189a1ce1d5059d60373e8c4b89c860d6b6a68c1e58afebe65107c3f8c5c5f87e771cad61efe7449e86f8ce25bacc5a"; + sha512 = "d66607192e6155ad67648c9c8ec5327b58433f14ab646d8b7fc8ffe301c02258057fcfbaa37d792978de4e171e89520521d741608a2186013931c6adfbd1c04f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "64d566ac3acb823cc062dddaa33e1ae321edd3a4e54b02e317a04595bbc145ee4cd06f3f84b20d1853ad6d0eb4cb7b13bb10bfc8383799264342a409e2254dd3"; + sha512 = "3c74b828b663de1e091e11534656579759a6953a7fe21b0531aaf501ad368dec9652af9a70eb183fc4a5242bdc9cead4d2ec8fbf3274d8e78963df2c78779584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2240c612c9d746774fba47019068391d6e08fc4933b082670269cab1416ce538b2bf9b948aac994e81a31a52b91a11df6968b847ce0e843615a75b8841443c23"; + sha512 = "5f3a78c25b202c732ca14a98bb4b3ac5baabcf47248ae0157c83afc6cd6d628e2ef44de0ec0292e4839994e2806ebd8698dbf0dcc13716f5f6e34110ee8111a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f579d1d21cb45d91394b9a08e1b960a43ddadd7040e417c20e66e1dd4d3f7ea3a8963ab8334e49cb22ad6eb2ef81ba98eae1298acab3abfa512fffb6024da622"; + sha512 = "398efe34b30ad6978e98363c978e6bbb810f359dea7066c06f904dff4bb934a49a20561e39cbd639eab9474210e9d34e3cbd97e1b78aca2755431ba7cbd83afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6d2436ef789404b6d7247ca222cda81ccf518b91bb854d7f53b6c2c1c68b96cf5785bf6b768e49a0b0a4db02fc899c72969ac0c1441ad6bfb8ddb944e2388d8d"; + sha512 = "8521f91202f18acfabb2ed2e914ab4f8a28079d1b474d86e110d1b0ceb0aae8f8b70a1a0cb3fa5a23b38a905f3abbfc2c1eb5277a400a215856c408efb0efb23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4ed452c03a08506498ec2663b6fab477b2aa52c9505085b493d799b19e5215ac72a90ab642ab2ba3520c609909b93a5b176d5f13c79066598492e7babd94ecaa"; + sha512 = "e137e54527667f98a5fb1f65707d2e60a151a7296068fb1190a62f07f091c5fefd97c098217e352ef2e62b5256bb45f5e410e4eb0636ef2f1033eb9a391e397b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d3c77c8a85dbb280f75068ca49891de95fc081b4074cfbd569c773fcfd4d0b017e2b734a6531dabc41dfb3e3f7accb51d47e7cfcff2bae6f230fed8d69db2073"; + sha512 = "924401c776f507c70e6a60c873c84f1f7540454946a4cfbb85426aa20a589973147a42f03fc106407a91cf484a3763cbb6268f8c119d72bcb3b4c46610986b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "94aa56c2d731533105c9e1c7d20862ca9cfd5729fd474b2ca784e2528f798915e9dc177e5966e2b5bb77d6eebc7962e6564f1494ecc284a91175565d25451cdf"; + sha512 = "8615b1930cb673c7eca59e5beef70cf05f9be628b90e6a895f28f5dbdfe46cf051a14134a30940d3f55512d6d1e12714ab2568b53202bb33af2ee4f0b26e586e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3785e6ba189c2ec41f56282ca8925c8eb14d68157c5c035e90fab09f27941e67c9286298c07c31ab0792488f2cba86bce166adf76259d10cc3007f5047847392"; + sha512 = "aee6e902c58389e5794ab802c3e7f0e6750c3dd9076e8dd33894388186daad17e3bd34f48cf16b082eb1fa4e3e8a4f794fd6bd87940792d089c50214b390d35f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a98ea8c31d5e6ecf3d3c4b0def2d2921aacd901d095ab53aed1da202937022c073834fcb1d3ced826c294c18660d2e4888473b2f8f9e91083bbfd0e040fa6ae5"; + sha512 = "c61acff7429cbdfc14dc6aca65bb538d99417567b477e24324d7ca1f7fcd12a0e2f338ee5a8246b8ceeed0c1761b3bf8d4e6d2be9311d6fdd91bc5677ecf3cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5c64882b2fe34cbff29ebe7668ba96526abfe29cc599881331e048da2655ec735f8425d98f64475073e86508626b464364e3a7212b44ac297e6a50c7fdb5b4f9"; + sha512 = "8c9255e218e0cbbd77cd6089d02535af65301a988c74cda0070ecd71a432ce34c5bc8c71aadf1edc5d558ebbaa5d8a5b78e3c76c0c714a6afd8d4b11e1b9e3a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "1506161ae00a4fa203cce5b31779a38f0e7df94021123cbd57197cff807a4a6ab2ee9907240b70b55e6795574b4074a83bd692d2b4ae208438a12357d6a898d5"; + sha512 = "92afd454d7542100ea73bb71df673bc006084fcc1a31f240b6431f4bc6cff946ab57a94d8a8634a8d01ee996e52cbadd5c9dc58e3d47533d3d3a72a8d3581142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "97950bd4c56df1defdcc7f6f1693dd6fd0065805d63145aca80242e2d5a83186585dc1a165e7fe9a0dde52a8f60fa6b32ee097fe0febdbac5937a410e654b20a"; + sha512 = "077e610d74fbf8d861f9ad0e3bd1b5dcf79e9d89913f7cb53bef139db94cecaa08d00dbe830a66f0775daf216a4e44416827bfd386d383272d7cee75b5493bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "994980dc3ad618140b0b422db46cf19cdaeb99c4d3202c426c415494812b5cac525b43c4b290fcb58ea66ab9330680c4add11e8ed92a5e36b7daeab19c96b4bf"; + sha512 = "00fde9ca4590744e2877a6460e5fcccde3da81864f6ca0e7b092cb250137d449038b618bfb9a3b58f2b349dfeebe964c88e194162f83c6dc573a239e8d4d3598"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "65558235961baf87812242607d8b77f6e843bc5828e79002d55dce462bb2d40a00ccc97a9e83de56777d1e0ca35991a2c577ce40217964c481930a4081955289"; + sha512 = "c84b99040d24d1e13ee568c6d5a0ec336823deb2ab229ca29d0738490dd848cbb79089687009016313b5b7d80601e9d54f68d7be08138b71dcb2cd016e555867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "cbc3c626919406af47ea8a00e01fc8146838042a8b7a04fde88f39e8b21bb3ec8c15b9ed2b327f5df1bae621427c8c2917837a29c95f27b1bade9d82e4eb93ef"; + sha512 = "7b50b2662861c4dc8a800f251297a21be22d3dbf863dabd0d2edc48406a0d190a1dba5dcfc623f3717c741b771dc338563e31f4d75484dc0fd7fb3bccb9c7a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "70ac4bcb16191992de317cc6dbe2f3e8d6ccd0b7bee0568d7a2272429bf164610621f53d6d3817ab6b3c7643d63db243273f6e99dfc5c5133dab4645f9824174"; + sha512 = "e2893db5b1d1199c9f823294b487e79b0c7f4e4c4c33398a3fd74db93fb11b1272292e0ccf8c6e51e706eea5ae63810dafee04ff8f53d76fc98f73cd5560ef04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e66011a9db9ff2512dd3b2a338440ecf268141200754b0dc09c484d1504534b109aeb83364181b3bee7b534ea078c879ebca1860af63c388689517397055f670"; + sha512 = "2cc0f3af1e52573b570ae07e39af53f63d0e51f6cd15121d3894a9afa96a0796d2dde9d49f0888ef7ab1a644682963c68282a4f9032a64b2093d7ff8083f35f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e09d595c56d8fb54592a046a6e4f9868a1bcb2bb638cbecbb87f94000127d0f3acedca67ea7f8db15445cd2142052873bf73ddf4df2fcea16373c614d6501728"; + sha512 = "10faea0201c3b350cdf52935a5df3fb0277f6ac52259b446a87a9cda1fa4f412a2d8e77c005abbaf2c2d9d3fab998a97ab8ef9833ea63e2acaa6981d194d064d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "04d5647b360d52ddb714c25443b55558b3d54fdb31a385513832fba336e7db28a8dc27653ceef32e72a4dac7cb771e82178b6161b55917c07da839e80523a8bf"; + sha512 = "2360929b0099a6712fff7658216bee5c9a90d38fed6fb181ec9d16423a2796763b3d955fbbf9ec124320595bcafcf7e50b1877989185a35bd5f25d1321dc5325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "bc564788b8fa57981b7963b584a445d69e4c198ae83d8d6ae1a5e4402796492bc2cf92d0119a9db067f75577240b0e9d6afb2f38fa94e3e101ce6481b8406fe2"; + sha512 = "2abd797d2f9b81f22c140bd3c57ad68baf54c10947a0d0615b639fa289a54ce3b3e72ea6c596ec6389977a9b31a1853b6c96e1bf23902f4c0eb7f4aa8a907e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "38fc3b4eef5cc6ffe867665d82dae4156ea2676749a9dd0b15bfbd9e01798829570bba75e0023ffdcf9b104ebe85911586eaba95868ab0773b22e121fc75679e"; + sha512 = "ec379eeb6d70eb210291651125a3fca08b1aca0f06cd22a6ccfa532ffef8d1480fa32ce79f93786f7ce3359328d5a96442ab88b4e7c78fa88a892ec08b8822ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "73477a782280c18dd42d7d62e26cfc5674201d3904d155c2ac712251ef8b65f422b522804104d7374865cd7e8286a8ea9291cbf7da37d412a1cdf8d24d18a3ae"; + sha512 = "fa18cc45678129584438122766b7b56705aa9332025c6f729f29fd50c3051a2f60988fac4f1f267a94d443a35f3f9d58162d3d355f978c018062a8546976a341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a35694c831c424eda7b6e5069c1b03d1e6b2fba051b3a29a7e8ebbded9b3b12fc1fbd39131d86f1c0d28a728a9ef2b7c8f903f6ba792d522c5e96490cf68563f"; + sha512 = "4f32295fa57221d2658f2bdcc4d3396ed3337944dbd9e46a1694ff478f4ac2d68ba57d8d65a6e5387c657d1e51b2a392dcece3735fc0c075da6c9e9f3a053cb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9fdc8e1e39d2fb69d3afb64f676fa85fd674b45eb86d4d4735df403bca27eb499be9e7a6f5f9e67cd3e588352adb29ee805b403f35a859c3226507684a69ecc2"; + sha512 = "8c88972e9f0b716d5e10f730d040188f4bd4566eef196da473f1be7206c67cbce90edb4bd08f7261e6860c276fa0c8fd15f39641e5f243715608b617ed8c27ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1da6aa658841d59069bf57960f9c5888e879056777e4c227037c1745648417356bd87bf062de6afe41058a290998e7e080ea7fec895cbc86619d0466ab0bf64a"; + sha512 = "ee72bbd1608ef81184fe128d3274ac0eee56003230d61e7047d0d40f5d0176383e843a5b7d090391203a1e3d6a8c1014096dae3796fb47feb55fdf08e5d5f37d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "8cfc1c08b728727053277a60c19e289f0d0407e01cb2da5632cbbfe5ab48f751298f4f83930dfd5907d4be8973a4aeec3f3a719dae16827f48f0eb0d4151cd03"; + sha512 = "280ee75fcff94e9bf6052c139871fc1d3e54f9427be30d2b286f654468436a906905fc3b8d48a943d1e2c4eb741d941020ccc2b82a99c73280bb8a5638689bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "96c7451450e0d6e133a6576b098b37dfab5059240a6107fb95be17a82e9600ffc4003b60918f4ccd8907d8aef814d55a79a61107504f41fe086fe3d6c83232b1"; + sha512 = "11a78f70db70c0ae9284c623100ac92b8af742ae389905007bcff5b9c731e18b97ad1226503b8fb7a78e981ff97595594e8ca84cd76ef48052c8440f1ff757bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0211b3ff84eb9e7e9f6a0c81a141273009a2afc7ff237bdad751bcd68a24b60c9e9c896a836068d3373f0a0e6469fc77ce8f502197cdf9701ba033ab63eb5e03"; + sha512 = "5f6064fdf15fff16312005114e91b8957daaaa45c2bbe12277b5d2bea72d6e20b2c04f5f5731300337d7204f3114ce9964c006cdab349b9d78255b109213fdbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e268741abb735b0425d42fb21a1a70b7035f915122c64e45418f2e61a3fb5f9c123b53e93979c96e7a183b8511cfeea4c3c6e3af87756622f4f8d049657a7a4f"; + sha512 = "08e136fd182c7c126a7c6bd410d5d1fd776797a7409e42ebdaad5dd9e0b7dc847a6fe8c5dfd9cec929c48461ba0c5da996a8eb8f34eb4be215f018fa71d290a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "3de7753956fcee2d2697f2c8a3cde18719621ae4c728b190d43b7e936c39543d6d6dae3ca593698931fb17b0270a19840377ec9392d1eb8bc591dcc7fc915404"; + sha512 = "fbd6a0fa6ae9e4f4232662edfcaf23b3c5b13cd8f9e33c714459ec398bf0cc06a358b448cc56fc5208b7f93315ff47d34f5b2975c90765f49d73f88d47596f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "ff9b2217e043c7cbba98f9993c729d23dea838e6f120c6adcbb4d03ff127484111ac2be2426de2134dc914aa765550ae62a464822ed31b24231fdfb50d295610"; + sha512 = "5ac3c52f9e8f40bafb3edb7b3cf6483fa74f6537ce1baedaa96e41a851197d6bf74c7181a132a51bf225d450081fc57450217c9db3df8cc085f799af5aeb0b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "805d85cad7af9264c1e8e3534b6c6248573ae445410616a8d74402cda2273b68dfeae4d47240e0247fb29b56bcf6f2d627f4a872afa8eda3d8156f14bf8851af"; + sha512 = "1311c592461fd0d23ab1e7616e120fe51b15c70790c2290340ff6f6110984a1ae9a96da40a73cccacbdcb4b2aa03717401b34b415c6509850adabbe028e9aa7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "40f56cc3fa11d85b7e9e8d770ac5bec91ba5b8203e11a0cf898ef6bc94d58ddc73d6919e5c56a2e79a846393f28922233211784e693f3da63ae9315f3befc80d"; + sha512 = "ea11227e9e53c781542c61212397dfbfdeefb2f70ec0e8a26bafd6e7de4dde3f35e6d87e3e3fdd5e31fd1e061d7906adad355398a4dba0ec1e6ebccf517bf2c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "00dafbfb3095d7b76d1bf08bdbe5e99cfd207b39ae2a787eacb39ca412f1b2ea7c4fade4c99715f44cdd774823c4929d0efb65b40757f1b86faec738d4f11493"; + sha512 = "c858400aad550180e04bedfe10ff1094bd0bcfe5c7bcffd5edd9512eefd671d6401bf1b50679af4636c3211fada6c44c126ebc3916fbec3fa08f587f70520e1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "24c21262e498e8840cba3f8411d8f46108f736f10bba2a0c37ad9fab6e0bc773f38ac086334d3d572e19223309e9d106035d3458e05c9b7b8db237b7bb1e1984"; + sha512 = "2a6464c84120f2c85002554af4759f282440435a84501817c0e933de0f2fa6535a5acd59bef92ad6befecd8bd7e40a8f650fcfa75aa4dc2b20b546eafd4df056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "fa849173b8af4d6be6a499734042763d2ac532e213cb863a611e66e405acb5df7a51649bb1f9509ec637e15c055fdaac63e380128290623b6d3818e528a9c532"; + sha512 = "c2d492cbc4ac4cd5ba030f1253dc987fff0cc2ebc0d3b126c52b1a6de9badf57b8601a350526934e059bd7f3b539f45fc120cb1c2f327e96abefe62b1177c439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5b718c2dc82230343e35b8d45725e9f7c331cdf5716d973d671b7465e06d50e92e0a353c73c7c31c33cec1115b9332e2457f17f6e5fcf8f033bcf7e222802267"; + sha512 = "9a2eb3ec93e43d789c3a15acf826cf72ea67afd5656114a0ba1125dc2bf57741799b52f565e47f4403859bc7110f3cea100c126c8280936235289331c7292fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7b037bdbe658d26c2ea75b8da80b4040b9a0c4cefc00784bb94512481de435463605c565eda38f0e958725adea11f09a9ec5a37d9513c16118214d0486db9031"; + sha512 = "9fca98e4eb686968d5608a8e253e0738f3369b943e63b960296c7ec718ab29638f522844705eed29fbccacb6b525189a7a828a7b29ce23e1bae61cacc925a73f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9752b73c59784ea54a95b0bbf63123ebbbfdfb7d2742e3418a872982c0d8198fc0450b3c33f4fc569fcd43a633cead3ea1893057b6d7e8c6ab78632fad3555cd"; + sha512 = "9393a9198d200b757e51af3961c2cf20f42cd6a8d85a7c2194731643648dc971eec924784958e306d3ea177a4ba8c15e79195dc59063eb81e332d4010e35884d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "067ad7a8a5a4c6120c1f1be2f9b4066f1ef830e3cb49ba850478d18693c8e4ab12d54a07036d23ddf3e138837320728f1fd6bbfffed760b530d8ab6addba6b20"; + sha512 = "22f901cc49ad275ef107a6c49607c3d8ae51315f83472088cc7d062bd980e6f74b911067f92740ee5906fca3e3fb1cfac8be63c8fc0d6cd45474f32be5f23007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9f4b6f73a3966a7aa60c168c16d88382dcfb278f934f3fa485e691a6b6af43a14f49395a3f8177b4ca9802275706b2cf701aba2310262149b0bb42cf6d096c25"; + sha512 = "190db9d98bc335e9cc34e37921af328ac0beee967aab4804c4a513199ca9f9c4c5153351c359d91d34f25cea4e109b90735009ed1f480b2da6a80422f0ea7839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "43a0710f463542a1389e98b5993d1d1b35f443f0a0ccabca65ec5505d19c28311d91cdddee4f9c102b6f4a25a87e4c2c6ad7be89252f60a724c7af935e30f675"; + sha512 = "36b0942422aabdc0dbe1959f330fd6347c0e3e0de9fdb18f33db3bbc8f7b1982a4cfe99aa126c8c4b3ccf93b0c26d01b01e74838460793cbd5d0a6a8193da4c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6717d9c590e5f06d3b02f643ad4eb27f48499ca759c41144aa5e0351e478bacc54163378faedd731042ce56ff5e8f55b2c6b6bde7768d3576b70a0abaf4c91bf"; + sha512 = "af22e98b054cf4052120bc17735e196b56e3d8875936f7c35fe66016858c650bee94932ce892afa5ab7cef3012f880b2533d58571a752f1ecab9a6284f69f991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "320a50b2461d617962093c1d7eea94517c56a93d6857a4d4efc4183e76f24dc9320619f9c3143c9dda017ec5e8e3d71c730a27d532bd7141c750598edbcb0121"; + sha512 = "34b5a9a7270d6bde97caa77e5b43c3c47bc71d9bb50e51bb6449969ac99b2e7df870349f73a4b7cafd4fef1e409720156a2f8c4082b50ed1abc042f3c53f03e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ea7f210807e2306d3578c39d1d58ce12525c47cb9dff3198dc9153683f8e49229e19dfd9fcfd3d76e109cda4f92392e4f9f1fac2cffbd59e6430105ebfc705f5"; + sha512 = "ec6dc83bd8e5cd20a47566be95e152ee63d770557b9f1c864da411fee6ca554e58aff21372e97f1ea557156381ed24a619262669190742ad705d2e48a9e9dbfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bd1dbf20cbd4aadef8bafa74f308f097b5dce955ba7f2299cddcb1cc9cc9d8805e399684cbca1af750535ba0ddc939757f4d38331035e4a708ffe1c252da9c82"; + sha512 = "9b97b46029ccd4e47fdfe157c9c34619311755da4d02e55469e434a82e187324f1a25a4015a8fc6345ca9701c6bbf721d076132b7d953a8d55cbb8e6cca8e918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1e7a48ba49c4f96ff0d16efa3798e4254b7f38f0da8f51e62a4bb71c13e3f066a64c2c6d778da18b5db83da52684dc39067f6c765987d95921df2b3118de2c6e"; + sha512 = "3dc73cbf68defecb48519996dde87f89f30788c4eda9782b89d5449e35b31bd3c842727564f9aa17dcca7acb19f4c8d27d975aebbd0045a0499217533a546362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9c7e6456459a4e2b6c7aba254afb145ca3c8efa4023f7e023c3cf326b0e0afd88149888265856e9f28179b686e1a458d453acace73f635a5fc8c90419e6fa043"; + sha512 = "dcaffcb471bfd9da4c4eb2e55061828a5fe569de2ef64492047122acf74a7885a91eac49c2057fb2d29045ad41ea4d9817ec0579aca286f186c12f3fd17020e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "95e2d89e0f94f9ac95489f8a084d0857aa5339c8257fc1bbe7c7ecba31694963831917461537cb12199fda05372e1304e6820683802efc0b4ec02324194ec2de"; + sha512 = "ac4cb3bcff2be801b3ef23c7b0daba5f36b6d2e5fb8e1b2baa45313963c1c32467c1a93fb1072a6fd38713b3fbde86e8de24ddc9f66b002ffd6a3d4bea9eb0a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5fc41cbecc716fb024df2d13e9fffb2b656e18f47adcb496d3f8f3d61580f97fe801435240576f1403805151c7183c208425e83a2ac56373051f0e82031115ba"; + sha512 = "79377037cdfa8a66df3d55e95b5a9a6846f8976371d7c88f2bf4f6df0bf33faee44fa0ccc9570f55367e5772750b53dc0fea6d1e847aab222599d055d64f387d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "16c5eb3e9739e100dbce0eb93f209fecb11b5b024ed62f18a47b00927452d8823b77a14fac1788d9c4bca9062e85e724a78c39630694b0d692b3867e4f62f7fa"; + sha512 = "17d04657ed054a8a7f2bde5d71906064ab924e24a1055a9bc9383fa86a1c5481e2a32f63735737e5c129e32046b06458879313bac37ff72774053a437714d8cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "0352971bb2d43782052f20341f8fff0f6e919ced7909e6a860648e9772101e5f79bfdf0f912647d3593a0f6dc9dbe84fc193519c3b24ddcd13742f01ec59d1af"; + sha512 = "a87495e8f4b8035886c007421ac84fb47d8cce387f8cd16e5cdc5f5fb71a80148ef42fee553d4ecb2d794aae367d609377cde61f9388f5aa7635fe704cd268be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4856a0b482dd0676cdb5d46de7bcd96a4c9aa61bd976f3b46205019493b8933c78d7b253c41f4c2178e2f79b000dea8a9cf13e1fc7a31a5242432e1c9205d445"; + sha512 = "99b989bc71e58b09106038db336ff9de46c8381be2294010b7a6cb32b1f222de413b051062f5fb2981ee173b0879d089d74c8cc9b6022f2f544c6021a998ddae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e85757478feafe009085ff55492913944d5d8490426f93cfca481cbd97842bc3c6dbf709e17c372b5b51b14fea3b057415120b6fe145de928a108c7464de9af4"; + sha512 = "125bfb8aab76599a1b35b9bfad886735ec8a89ccdcf8d29c45a238b4e06ab56ff2b848c94febe00042b75c378c5719610613b5b35fb80257daad35cc456bd90d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f479d48fd6176baf30b0d648120669ba47ae2ec5d681ac6b610d6f0b0a617a0f259db863966625376b63a6b871d56049adc500ce8e8e0e27da3520a953bf1736"; + sha512 = "e2f115848250093981efd9b4ad344464636bca52eba388e26f3d10795351f25d411ee71ed77ab3097c1e285676ea30d5151117a24527e8739f73431f60b346ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4caa574275e5c0756ae787e73398f73a2702b36d4d3f49d3a3dfad8cda8393cef24ec0375d65d0cee4f41be8fc94b5419a3b613dda287d884f8e7b6317e3fe13"; + sha512 = "9960af7e15dd722c93a7620b4f30fba8651d2245933e29d4f3f6fc3e89bb79a5658aba2c8969e569de7204e2d34bee72fb2ce292e970cbbe50cdad320e030117"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "28d31bc60979c84d874f444555e6157b906b9d34399cb87608099e67127dc7480d6789b855c38615b075f5b07f8a6b222f04dd99e5690ae36d56490953135149"; + sha512 = "aaa2ae8968ce6906a47305e78e2efe348117cce9040d7079415f082033c510ce67f833b9195d6496b831f7d8baf95f501ce1d54185009bc3f1d12b16a8275e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "b83c50b728bb1e4febc53ceb3a4fb8a6589751b5ef77ef81f03941ff33d3e289c8986b501d95afeb56feb8f94be7d9a7b38e5330ca359543948d762e71402f75"; + sha512 = "1b7f808948bd3dcfdf748b3e0b8f03cc6c5cc2c43edf84ab62a385ccbd51c915c971e5deae03048b4e48f7f73d671031bd55be06bbf74c050746d87b3d9213ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e1b2535e07364a29cedf36047b99dffeec8937b775a247b605532376b3a43a8c0037e2cc9a6a461a9b68e00eb67ac1d337bd40ee7110ce9890cf862dde3cfb60"; + sha512 = "2494ac50da66ec1a711a245ace28543c4d9095fd186855d968eafb48b385ff15e258b5476168464a3ed5059455bb023d3a964288bec8cc759f2421b8e3705b21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "776e2fb5cd75a8f5dd1e6340af21356141a24be87eeb6968ca926cb3d3aec1b48adde0881a7e4413a83fdf45f5caa3e829c0ca1754cf7176eebf2b9e3ccbb02f"; + sha512 = "5c5345d2cf6d26b33c6526c1591fc4c4667d2f9c553fd6b5a48a77316ceb1091b7c68c1860e4e01dfe9ba02ff397a48b10cae4047474e25a53bcf09942cbfebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd3bb0d416557c94a57c8b364ad08ddcc1885bf55a2435f5a2f74f5af1607a828795fc68027a470cc95bf46d553d84eed1c0af3de1ae9d72546587b486a1bafa"; + sha512 = "8e5a5b0791a937c3c4c5fd5b7862f92947e16b596842725af7c3c72597ce91946e2a8291a864ca2adb06f96b7bec9cdf0e01d9c915f68f186f80f95e245c61d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b789f7adc37302354f797988e052957fd95f270dce838352636a367e03475ea92a740ab5ed49c9561eb5e90b106e38a767d6d3b4e8f1b3f07db7dada400b6aa6"; + sha512 = "b12cafbb422a817073fc967b632fa80e3c08c38be5e5cd33a4648185e68be7ad2d5827ad0923c4d86e6ffddb50612175bf6a58c19992fc6ebccc3ca170b9ef73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "afbb11407ee19f4d3846673c451848ebd4efaf5795d1f864871c57f7e5d36d26e38c7107e326c5843109f89a315cbc38f25df1622f97d6c355f824d06986341b"; + sha512 = "b97e5a8f4958499391007d4a299bd70f5978185381be0e984bd87bb79563dd691fbee5a6106210629cfbb85346ee867b8eed6136454f9c910e9a728daa3c2524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "03c32d07601cf4b98d02495baf97b70a38a8e82abc8685ed507f0c9abb907468b1e8b8403b2272c9c06ea8b0cb020bb330f70f8abe5b5fe0c757fed710c912ce"; + sha512 = "44a512fd82b840141360ba2f2c283a014649cf532a151b8ce75f5b64dc8e04ab1ec7addf8c2ce4c288b125b1bde433c05ab87891bba0d6515c1d9501239887fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "47c923096c22e509063298e9229f3b74df60142aec4296d7008b5e49c69ee9542915e639b52ef8aa65a7ab9f118d1d23117874a3b717b37930d8a988386b6ae7"; + sha512 = "167b1128c547c6d041d5ead144a7539ca77cee428ebdc9ca712a5a13b89c38d332f00a71f48719af7162db0c59a067001181b8dbabc0e30cbaf2dd9dcfb4fb3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2e2b3c390ad20fef9860c4e3516a32a66b091e1f60a0dc71916172de3a667cdeab3d712f8f2a5baef8857da3d9211fb7bea808b975cf3cce1920e8ef2d73614d"; + sha512 = "116ceb3aab81c56d526c8564dbb45d4a58712ab62d0ce26edf99bd903e7782be8d4fc1a3d117feadb2a36740803bbd7778b18397abae4aeb71e69b48841e6097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4c5e5fc5e859751cfdbe1eea6217b92dcd3bf2a30b4967965d0242de72deb6d497823b0d17c170be1e7113a15f9d607a6890a5283c47c254ef2c94022397b977"; + sha512 = "8ea1cbdf1985b065bf71209ce5a4e9cc91b0a258b873b0b65fc9e7030a67c5eed3feadd714542962aca079a191a4fe92b452cfba6c45ff7f8dff7f874b627535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6953bf0ef7dfb0b703d4aa1ab9c26b85fc049c12a04d669121e9e98005ae870d92df9ce16bd567aa1586d02162ee94fd01800d4d291f5a0c1b6e0cfdafd89c8f"; + sha512 = "6aeab5e8fd9984410d8cf95ea675336a1fa98807abe19182c2f94155ec1bef36e7bd9a10b9ffb38d2a9ef7441a56dd329d07df4f7c9c301342f46afdb5f2f348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e7bb763c2049dfb8081384059313e977ca44eb3d147caa2fbba755e288e45d6ee5e47b6aef1267e23d4e8c6a625f9dbdda7b938a9183a7012b3d943b857645af"; + sha512 = "f853d14a988c3a9c1f8d1d3182d8bdd849784f081bfc609871e592a78de14159203b64755a0e9c63d1649b812094d389172b60bf12feec8cd23c55bb5ce664cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a4139cd488a85cd70e595bcbd3f8fce96fdebcce2c61c04c06b70ea0f2a99348ab69590f1ccabbf803798952fd436a30bf6c103beb3006ecbd14f70d6c3ecf93"; + sha512 = "897a928303027345459e2343a025fc0e926be7ab8ae7bca951afe36de5748aa6606dcc630bd33df8efa383897f5d1e24b078d94d15400496c61c6494fd9a9f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e485e4b6f5a8ae5fda9be8ebcdfa102bad2c55ccee6d9dfbaf2778f92c68e68133a26a599998e134314186b296df68fc0dba7c849a109f699d3198a2c5a31001"; + sha512 = "b86c9ce4a0f95ebbe9865443420576fa37946bdd5ea5e060cf4b6bf2d97ae98af599a00836ed722e1d19ae002c79d4ba1a8d41e0779745061410bd4d020771cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "032e3e3b854a0be7ace835d71dfa864c0c84004c87ff09314615e633d64011f8676118ea73797b725bcb1c1e079fe632e16c15eeedf78602201c7ed371222e2f"; + sha512 = "c7320bf6f9f5ae18d7eb7edc6b070dd77b79f594795395f2158ef3c9109e6b582b992aaf9712646f7e832eec9f4a622f00b8f218ec6a742f2010d4ab9f0fe1e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "dbdf163abdde2bfc22f5574d2be4e3daea52c7cca394a9b0f1f1b8af19c65593383a112a2fc7dc55e224ea6f5d63537f03be8d2cf02fd3d3566963bd0d51d204"; + sha512 = "32d619b4818fcb05061c5a07f4e83115532a37bc67ed7fb655dd813ff1390fcab1f7477f34a2a78832252cdff7f31d2046583afa4c0f48ec810a97bc2a2fddc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "2cd1446890227f1ba4d7f50ef778731b350f694646b6cf33e1407325784b071db4bc2fe43eeefef2ed98ffc5353538d42df48ff8e546f4495a366d5acbc2aace"; + sha512 = "9f4eb01db315b8f3b13900ce05ca3d6d036eeb45f67fd2e925d1d4e50a87418a0be5a0843e789174449c105e50beab82baf00f524e4b327d2a3e4b8596866a0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "87c131e32ad46194175e8ca8061cc1399813b2259c9c3e83e612c74bac27c9364cbbc63860c283eeb8416e3b108297ced4a1d9755c0a273c9143cc6b468f5cbc"; + sha512 = "2a57cb02f645ad0505292bfb064d908a5218928b9964761f89a1a775054fbe0f094c0e22895de68c7603e4328d33e7371ac09edc2b6d2c1737d5b662141fd0de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6977a2478623dd8963121a1cb3da0a8669d1cf17357ed85475f61384a9e1ffc2c1b4286b3d7150386031786e365c33c188cded495036012a63dcf2db44e19d50"; + sha512 = "708a29a81a0f1ded29abae0d0d781883aaf809f7910db2985d9e95b8de78cea750dd40f9721b24b642719f37c917d36e4e876d6aa8aa27401e695b61a392a2d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4893ae9bb4695b227a6906db91c1df7997c866953ae3960a334856f9a1c99e05937518ecea2e59c5bdf12a4ccd3e644ce328e99294dae53d7a9d9a9f5e2e483a"; + sha512 = "65de59b8b41f44e9e759e9bda4eeee88558e4660db30b3d9ca3f66dde0a82145a82ba463eeec55fd839f70f455c9d855d77e0507910ad234c6c883572942899e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "eb78a32ea736f139fe1c5cf0a1ae59df33272c6078e643a571968d0a5e4f3801c280aade938a5a714a7695700dbd2db84116f6e5ccbb7362d394ee929a2d9efe"; + sha512 = "094c26405e965834c5483d62c0403b0a64426ac1e559c1a760bd4492b7ec1662cc998a896e06778f910ad375073d996a25ce9549bf16f4b17aa4be52dbf26ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3bc572b109fe9c5b14cb94d7705ab7fa972a99e914eabddfbef4901e5be9f058ee6412c59b2173fa0620166612c982ed6bccb1f4fd684189845a5446c93364ff"; + sha512 = "642acfd183571001c25592ce0f35155dd80aebb8a79bdfdb2fc89a1130f93329b43a02d8ae550d495d277de0ad1ba5c746352c80419e97b51ea5c05169c4690f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9364ab431f931727157b0722ed021736bb8a2771a01fd8e12e616c02d7ff8a2ad23add11ea720b1d462e727df51c985b5fcad908307af04ffb57af5d25674c24"; + sha512 = "9aa044f118cb4aab69570ee08f67591662e6664b54e5989076875e59ba38b5b546047a3c2cb91a6d4ae658a89158b4ee78aca048598e5c26c79e4c79e972117f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c2ebacf0d93c38d51d16cda493aa1152f8a682aa41b7f6626422596f21038ae16d3419873dd253f60f59971486568f3a71420df4d2c503a79aef80ec413adbc8"; + sha512 = "92db275ad457450f7f7866a599082e643c106155347a18e4ad443f4123589014aa628bc485722d31ec625ad7d123d772c65579771dc0a253785ce61bd00f674b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a1e0962bd4a10f1c1336650e97ce79fccfba6e752e2929156f60ae10a9b3a9e74b9e2cb8c265d7b1c242b2a34ec52f2368d07777bf7c687dbdd7914daae55c6c"; + sha512 = "c1f5e72a8948e3fc8b240f93d9c6ebc403ca9f6c839064c830414935c4921825da39a3a9ded4c0362729c9da866c22fd24a1b5fb5a53b776b8a8e924dc862ce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e6b4cc5658ffdcc1a52979845abda4870917f8d036588daf1c1db93645696c85cbddc8a8dfcdb6f6166c43276ff52069c3c4289db38e9e98e7592b0d83fe3d08"; + sha512 = "b7fb36e20d83197e64b43b01e8f2d38f8c9ab721889a72c922df6f2d97ea8eae53cd638fa5cd18540b7c28bff6ce64a596246f535745d0890f69bd3fbc011a41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9d4cad2c1b192b199ac9a7c0ba233c0096546de7be31a21c4ee5789c82fa8fbaa5b9c5a37ac4001ef9bd774b62f57d33aa5760fbb0ee6ce60000f256e91f7054"; + sha512 = "5f65d79c539eaf73ce41ac3effe9a3ba033ce3bc32a4afda3353c815645dd69daa989f85def03ad6017a759f8b5d05cfc39223bd265f4962fa01d9ba83ecacae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "56d8a03ac84fab825c387ce84a45efd656abae43f9ea965ee45a09b417bb2634ed1f7fde0874294cb09ff3e3789782df7db19b6fce4598073a81854a91a6f800"; + sha512 = "67ebaff0a9dd48dd257b93dc31857ec6e3ca190a9ccd945f93b153293f9ceae9f461370a35f52f8d4f667905198076c79e2594e49a62c436248e2e198b75946f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "a9768618490611f5073438986de4265bbc7bf3a2613f4314b78533430d1f830f83b7929c74d431d8bfaa2ee9d5ef64b189695ac838c52c5ee6dadde88d3a3606"; + sha512 = "aa14d4a9aca7bd601cee793f9f269b6a8009f5b8c41858d7eb3440d0037f5d31f0fd9aec05c6dff1ff294e724d487bdeaf55450d378013b79ec198761e88dfee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4a413a17a3796f4ba4b0b783c4226419f7fb800ce4965288129cae2f1f087a11226376764afe51e09c57a23a85df762bbe833d167a13b6c93c22fa378f0ae47d"; + sha512 = "535df626eb1cda145fa474a0b8281480703f738dd40649e8a090ff880dc69c7c9b002a7f4fbbf149ba50eff43b05b978f7bffb73c2d994b709bb1221addeda6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "899e26c0ab61e7dcd4ba97b4df082b13fd93d07c22e849a02dcbd887f870df0a6de4b05517b200a4917fda6f7cc83d7ff603d8e0bbd96a39ff016adacb669c32"; + sha512 = "f6d3eb4b0bf3fd9891123fbea78d8b63e205886f0f2b7d9fb4fd7217981903ee9ea2933744a682f5684c1db1d398d5aac5e62e4c331d74b5f1ba0132d44c70fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "59b6885bce4c6cb95288e1338d6df199e8710313bd569dcbfa2cd2029b02bdfee9e28d4aa11f561765ef9e51d982a999d689935e18fbdd0d60d8ec25cf4544e3"; + sha512 = "02ba2f98ea4c1ecb9751feeeb603c058947df68841c803b218a3c92bdfc66f61f98c56bbb0614ebaf4cf67831e6702ec857cb7f6a8c540bc5fec3d81c5ba5ee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "40e62963d39f0b23498a438c3ad184d0367cdceff9a2674e565153c70bc450992d11145e5f651bbb53f389d5a74eb3d7413968c608b7d7650e9d553ee26d5cb7"; + sha512 = "591ecaf523f48a27101417a963a5792329b78605928ca400a8c61b5afd653a840755fae5ed3f752b88fb1d746cb51c3acf655ced3051ffe379e165264958c0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "3ea480ff19ffafa1812069ef7dd1ff1852b10abf2ec4cc094912173937b82c744f29f1480de2e95dc65ee1062a766f0ec33d234e3e3d714f49972458a09705f7"; + sha512 = "a11bce29cede60bc9bff8adadbe22ed70b44576686b88a0e7ebb59d3fab38c69553af4827fb7ee3db29c3f587c3099da6f19d4583f4c688eb46be4bbd04d2568"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8a13731a6072abb0c34241f206898fb59d91dc26eb3f4c0627d2aee2e6a53fba8b3735d8f5f2b36dddca9609ff4c1d9c5d441c350e9164aecc2ce9a69b1f0c5e"; + sha512 = "6c060521f85228487cedae7ff6c333e72fb3ac50269136585a0582e2ccc3ea0874ec21ac2db332cb90059dddb60014a68f434b9396a535694e65ea7207ff41bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "853bd27d468111e512907ca3226f399ba0be48c3332836342ff15b4a8bc4e3253e31fe91a31f462863f9a6559273ad6693f1bf65a1763178aa3488185779da91"; + sha512 = "a03d759520fdea2f911066b17082e4c322daad8bf6120643da9a1f19d2c1bb3cf3db359da614f0f876637f0edcfeaab45e18b90769568cdf2d2ea46cd6fa4902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d70bde7178c6ce76eedbd8a8e33617ddc7e7271aff41afae4d190e5f28bddec2094c1450c3782ae7dfe8ea7a6b844d50602e27294454946ab5c65a44b3553f9b"; + sha512 = "6fdabc52c892fe28f43d7acccc5c4edbf8bbf4e2cb9939447bac1299b78315df0f47c17c6abd1dae8508b20e2053f13ab169663b3572f13d6c5b55c91f9ef216"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6e8e2f7519e88809dd38d694f5a293379af1529afe7fdfd6f19e09e240bfd184291720ac48db382308c8d79c38c955916c57bf88d85ec2d220de7bd872954f43"; + sha512 = "4be9f310a230ff5426c73786e421bbd8ee96eb3ed15d394e7ecd8514b08d6b4edbbae259587da522c25a4f3c6eb57324672f8adc3622334c7f5c48af495254f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "928018a321f1c0b86d13c092a5390652fe5d13bc63ee19274b6d3a107e2c5157fc969683e59055a13798c5982c75e02ae0e5cb40f5c94203a052c7898d1ad607"; + sha512 = "05fe442d3ea0af4bbe1901b17521d0a1eb527eefef803d9a66fade056b988bf52a6bb2f7f32fef22a6d9bef76d66b31b690e03b14e1277627e228e0ba85260e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b2fe56c56cb25471fd7cd40d9fbdaad10d25438b94fdffbbd81ab93a7340befd1678d904a3629a28c8db6fa10d969243c27b003817ef3c9b38030d6f43f39f9c"; + sha512 = "b3fcabb7dcf35ca9e444a618b476862050ceff0845dfea4070793b59d347018dfdb6362fc5cb2f6a5ecb6fabcc2e55511535c018e2229a6aba4b6c0266eaf6f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "bb4745d61f87f6e7acae842be9068a7f7b9d9da3c44d2d32a45c4d4a0dcd127e4c98bf5c7cc9ce03c9dd1782e4d9d03f8c1c82a6008a2b9b93b5ce380020d98c"; + sha512 = "1e67aad86d44fdd6d7b72528b558b772868d72b9aab634224019646aadb64d23d19b7827a7b15e3e5b0e6a0247f64afecffa3ac88b171133c054b7587c2aa050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "efa44e8a4e69d10feb35385ee01b171d08c46feffea0d74ea8ee9b7cf21a839b2cc43ff138752c50ad43db1923b264495b63a0d46b5b2e579c3ba61b6bdf3acb"; + sha512 = "df01e74d2c2ac38ad574e2cbbabb057c60ffcd18a9e43f8de12483e9ed256a2368005b3c02f11cf6a742ce19d46eed7083f8834c3fdae5eaf1ab5f42b2281360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "3f9e63ad4c1e8a4f6bfac97925e189c9b3888c2e952c1801e4fcf935a246a294f9b088eaad6c18bf7dd93c136579529605bad6bcd95fa7b68c89a0fb087a44f8"; + sha512 = "d2db364b089b2786407c6606657b182980b4de9d09333fbe63f6d51bab8e99a493bcab417f06d528d4b178bf7cf5101e2903cd4c2998b264b9233db3be9e8330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "79d4a1aed3c9afab1c1847ed4365ab7e99d0982fdaf09d6d9652b9f95ce3c32b123b2389a1a9d6486e6141953d25c06fac0a06156bff8c2eff6e295c8f79c28e"; + sha512 = "5d6b3e9b918ffd18533335e32f8088dddfb66ca82e98a9af8a76fd2ff23247f4c8b05cea9895d076b555f2edd2af34776ed25a0e902be9abd589fe577e7bd659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "5faec58c78ab2acb1fb5f3aa3aabdb9d5ad9df6168215f818967bc2b3575aeee1428ee8354aabfb36b37ed66137f8ca6b2ce9ce5fee0075562c618fc3cfba9e8"; + sha512 = "ebfecd76869650105ee62325de604413a409b97fa0560d9f0e908a002a318234cff23dd857168ea0d782095fdc5db371af1382cebc49640a2554e6a602117f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "32c67a6ace809219fbd51775c421fa6a68e29bef9e908678b43b53e1bffc85d8bf773e2a5b9a00861b0a437d56ee3ad5ff1cd1e84504a48816cf74a69240b851"; + sha512 = "c94332eaecd79c0d1bec6cb9aeb9abe78a1528d855f71028a5d0eee95c9bc30c50263bebc198b86fa583d0a86ffb72fade74afa6d2a93ebd85e04154bd94b2f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ea3aff47c7e428a445aea0ebd7fa98e8de3a41dad208cea39adcad84327d2181b862ecd977e9c7a6aa8fb21cc99ada9698be67c86c5a931b1b41edafb744450b"; + sha512 = "386fcd94487ee4c360e6d5bd4cd97668c68c035100140f3ce894fb33eb179617281e3af42893abb9fe830e057d8b8a987f387861fb415bfe7af5cc49a2160763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "dcef09b5dee93167dbe6bc87d1fbb6f0e472db6471b99815d38532f6d223ac7a12183b323b5e979fa7943e4db1fc25b48760caf4540afa111f9dfd0958568767"; + sha512 = "d3413015adf93a6f9923b69805729e58f3826cd1db17585be10263fad78118d666e6036fb3c7e8f64057259e8f1fa93dd4fb2677e3b913bfca42b609077590d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "598e3169673ad39832fea1afe0c141070795d54636846b18fd7ccb4a9e66575f779789553550552f9a9786ebe691afb10b81f0d0ba127242827e2d11f941c115"; + sha512 = "fa6365f5ed4f53f12b8f7692aebae81150b4b8df6830f0f215c854b9603bfa57157f9e984201c5edf46bef8bd2d12772b5453b9b518f8cb90b3fd927d991d69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a1501c3fe46adc0d29ea098aba2800c71f6eb14b33e44a367e33f5f9c705357cad8445e0980cc758102eb7c01c18a79f3007cfbd8d1b9c1ae9766e0e793ec3b3"; + sha512 = "6eafe03b0856218a04f9fd78153552fd9b1026c2fb1b252e90decacd580b235d40cea0b54b6ba4209f9aea92c82785469cbd633e23c6ef8dfc61071f7412c491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1bf0876237e5c8eea321970f86c3878770a3c54c7cbacf67bfb75904fd270ce88252d9844450086e00758cb2b1a0e1db40394246cb9ef8a7018c76bba03e3850"; + sha512 = "6c18435b711a8300232eb64014305366f9eb96196e8c04cb2b30a84c8d21a738405e0c5abcbc2e2acf598d7ff6479cd170fe4b1fe9e02a1a59c0407d3d301c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "5a0f3514e196803d7d6062cac1ec75342ffb49155624a0035eb49ddcaf829dfeaf37f7e26997b31cb85b9e43ee21fca9f7129ab6bf4a065fdade9bdb06573628"; + sha512 = "d97c291dd618fd9ee9863d021c15113355d6668904685197d355156e365aa15e8ebcc2d62959caa3e596ab6609c84a571ff1b9c2e206e763f1dc691d2c4b90ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8b81e0479b60cad9b97f2108745445f584986fef5521c9ab88bb6ecd48dbc9a989b906122fad29c755dfbff859719c1c9da34452383dbf027d69288a32ea7af4"; + sha512 = "4c253b3f65ad7a04759fcde055315fe30f0b8433e0b670ffecbd906b8ec2ce96825bfd133bf7f014f696c1805e38152b0e4159b29840b22c77dbdc92dde5ebc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "9b3d99608d163d860d0b123eddd794a2d3b44866e6b92bfc0f06c05fbdb59ebd1ade970850e5b1974332424886edfde04861abd1d47868e60970826846fc5b31"; + sha512 = "b8d6e7ecbdfbff07a08a739cafb50a26c760b0ffb77386d57ae29255c57f67fcbc25ff95d4c3d9f1592b0aa84241493edf86a834a11af3f565ba35a1a6bac21d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f056c542bd5b83bdfc7b2a8d7234d40b64e88063208ee4b0b1b7b27017ede66b8acbbaa9d835a6d2667a321d6b965002bb87b68e5aae0eeae27aba8dfc87164a"; + sha512 = "d4d33614c0ee3382609d069327a7eb64dc00572c9150650f469389f13d6e8031e9ff92900fe1f8ff0bd6c8b0e77733d7dba1ded72bd598257c028fef218925ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a36a8c25ebe88fcf086fd476619a657b1ff26364133d05b32bdc13cca81b61009c4f1afb760bae961942ed1396b178c2eb3cda9add8c6b502353a2ce8c486cd0"; + sha512 = "b9efc510b1694a3aed04727484bd436d74f426d6c10ff491e770d4db38a0617a462015c5715e1d586490869f3d986b546a2f0da32e9c9bd7b9fb599804ec8b15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d07515f921caedca18f7661fad83ac772369a2f7f99d65fb827a0236818fd8eff211dbab90aa9525a6318374b1a2f84d8099667d1957f21c30e9dca35f97a111"; + sha512 = "65b0b0daf9869d82c16956f36d470dd52f82c7521c11877420ade0726e5f859f0b5fd8a68f587ea51f668067b45b777313b96f584e8cbfb4628704bd21b8f150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "de51d63ce79c249496222658ebbf53fa656916a753e6305d36047a99879b25e17a4ea4ebce1ccd07141cb507a7501362d0bb556aae97d115686d0d38db7742ab"; + sha512 = "4bb9160bd25f77959e9113b6fde02898193679afb2f11432271129472c8495427597c753c4ca3d7c138814278aa801957cbc73d55ab229cc05ed02a9b446b873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b01037ce68d8147dc79aeb0d540fe22a06d89ba5cf804951d16af3a896f592a00be7519b184de2f3aca7531d3026f78283b9f6b409c24031faf4859e92bfd1bd"; + sha512 = "0a5b9924328080838c1a2ae2a0823d0d28954a356d431fcc57c2ca387651e4bdb20673533ae098af68a93430214ff159c2d13a0180cb7862dbfa78abb2e1dd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0e6088a9b32ec76410fc45fc1433c514b1deb9fdab7f5249bd7ab3e1db9e0e5ad4294bffbfabf2f665bcfbedf8234ab64192ee50b34259e4133d7d035f6f4ff6"; + sha512 = "811934399498bae9a330b5a773510507fc6cd4d3d084ea9a2d866d2789576276155a8173a2e6cb4ac6c021acfb79220f64f4b484e5806a8aede252fdc726712f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "82042857b33d2dd642c8d6404bb864c79c2ffd91d2f8b342f39d9389e63ca59738b0083f192b607a391cf2fadac056760fd07c2b76a74172118eb44ed5724a1b"; + sha512 = "ddcee97acae9b4abfcb10e6ff095d9f69134f56e95ad46abd9dbba7f26f9fd0318aca470346add479ffa6899aa6a403c7a29563827935388dd92a49a9817faee"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index c2f92dc1e3..f9045a4cc1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b8"; + version = "77.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0c2e0175eb3950098d7e13352d037f00b46edd7094e2978ed568d4bfe7c046b533d4c5473be6e28f84baa6eb3aaa6658b174da23409eaf34841ab7ac4aa244d9"; + sha512 = "b377d891ec1ede4d13a55bf6dccf67e9cacdad118241902ea97a1719f784cd8dcae47fc015bc79e4bf7c4a76dd66472cc56a39173021ee1c259bcd5f0b7c3097"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3a10b739bb0ace8331190a9bd045cd4de78fa81fd18d271903db6a29828da814454751ff56dde9181786c81ecfc373a1bae05701f4982f5889dd6007ab2bde59"; + sha512 = "729d7a9cff65d7d002e732a4224921621e3b29c1afa0575506863dece3290722d916ab6072ddf6701628204e9b78d19a5b0ee90c11fc27772ea2eb30ae62858e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3a4d769aa9b123fcc5080bc877b6d29444926c5c7f45665e058bf7c4c9a7c87cd3c604eb56fb2a25b4a62a84360a3b6df51d123435f23b921b03e1bfdd65ef5a"; + sha512 = "7421dac51885269cbdea9514e4d96a9dc9a5acff496176f80fedf8dc570bb3113d3eceaaf25203aeadf2357b364e46b010df2d973f0d8c39cd6df7e408d286c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7febbf4429c33bdca13b978610e1f996d99e8db90290fa4c4ae5dded909d8fd60e416de328eb4b68b07af6af48b079232f9f85f64f30c751c2f877d7756d0c67"; + sha512 = "922cc579853ee87f9055b48c12df6ae5a756dcb0e6fef8907ea0befec3f7c2d53f158b4a089bd8bd42765104e0118328d27da4ca8924e732125b207ef72887d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6e6989857228793a3e3492a6f42b6c073c7ea58a9999daa5d88b465ecef5a0123d7607ede7c7297038747f4f0ea1c5fee70c2ff6436c6b7b642abe3f9a72be19"; + sha512 = "6d193a8a8aa22a667de3fa4c2b53ce9d9a674919c7e3c95fa7357cb968e3dd36bbd123b2fec06a3cb08bc298e5fdd38c4dce690d10ff15bd31768c7694d0e6c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "391becbf14940922f7a290840519af8ea5149058ae420738bb2bfa80ee057c16c04910f54660ee5eb3bc6067d6fd3b61053464eae4439eef708379bc220e4416"; + sha512 = "5048b6b859650523c1a98d6f0c471dce49833f6303a67f8bd02295dbd341981d145145671660ded3c777817aaf970b478e377bbd3fb367fcad5850402a16474b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c87ec6c520c9b47541e0b6ea2bd6a6916dc5a41e03affdf3caaee7247a8ad51925fbc7208725033518f03cab72a159cc5a75076bb9089ecf85210686cc704a60"; + sha512 = "0288debe1839fcbc9067e26411233b8b29960dbbe65c0878955eae67b91da7de0d51000e8adcac1e3f3e91d531c371f677e418366e50ed33337a4ce46c811b6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f50f02c10d5c14756670aac99ccc909bcfc62d30ad7ab4ffdfa2870ded4b97ada7d21a78fe94610e01a448231d5a4b1decee47caf467978b667cd65b31d53dc5"; + sha512 = "35821fcb332de76d2dbd039e9dc417631d8303921cb30947d39e6d0e57edd62f5fa1935238899076029189250a73dd657f25662f5bfdd193a5eb6227c706fb7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "f81e4f057defb28b57e218b74d115b140f595f17b40af00cacd4b46db1f45790e34a222c61551e8f9387c5dc505423f451904fc82adb2e18908786ca0e4a2ffd"; + sha512 = "82b553daf2ad0e93232b655fbe1c24928625c7f682ef755e1f1759847cd93f0b66bd000784274a40ab5ea0e89985018bf17835208746197b546244503138db55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2834602a86796ca65d278ad7e13d7e1722ef6d375d294d6623256c427eaa60691211244bc10a22b48c9831f832a9d2e948e814962464beaa430962e862000c78"; + sha512 = "69952a7d21006632a77c0e719bcdd3370d72760c98df348486d4f5c9d4d6ba73641b2133a615f8c5548e5708d4d68a499466d4ac32f690c9b76eea54f988325c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f4efa6b86bb314f850466d81e8fcffdd6b1fe4f8a372750edeecfda2fd5feb172251227ae8ead7d79bae3f3757b948e45200d779d8368fabc980ae73ef8c7b68"; + sha512 = "fdf0975e3b17097469f54e57b99fd99b69ed8241263600524b1599db94640b4b7bc105a67edcf67b70766188ba20ba7e9b7e96b181c2ed6de020c112af75dcd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "ec51ece975fa6e3fd4b3fe508c5ccacc62dc340562aefa8e22a74f2c818bbc81982ebb5d9b0f85a460ebf75030e3d25e084a554ff3ad8ea142a4bfd9b020ad96"; + sha512 = "438c3e5e9f6a34bda35ffced50e00012a9b84ef589b8868a7746f4f0abbe4143e591f5710d075def1187d61b7f289df0c4a5add6ba4c37227d04509c2b645207"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "84cb922c3b7c61185fee0f08d6c6123efad63730a8be960b2087fd6074ed3486c1ead7081dba0a6cb0ea1799e14cd9a32f3690c31017e5ce2a3d2875d0368750"; + sha512 = "884d87560ea62da3218fc7bcb5b3b3fb9d98e70d5c13bf86627ce61e20aca5a8717db595b9141a302753fb0d704f1c1da99c0a8bb3e1f83fd3f6eddeeea5218a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "7245add38d451e6dbad55140d9b2aee182df94b4285645ded8713f3c2c3aa4bf4c602a3f9a0a5f39ca091561cabde58aea18be3fe4247c53c742d03dc43c9858"; + sha512 = "6525cd987abbd4e871122a20c25c4ba353272437b56f82e1a9baec9581a6a10637a85942bbc261a375842660606259fd030c59e325b05aa9fe7f3dda77864a7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "883a2c0ddd7cd826e6bfe6835c8ff33c135a9bc77962d9f1f67d49a0928ad9172c07974f0681769cb874ae7db4f6a1a96fbc78af3275262cffadb744ec6527fe"; + sha512 = "c3eb1d943b892fc41e25ee2bf15f0877ac297483595f7abea31332311e764353d8b12b7879044f688d8cc97f3104a7bc2b0305b02b8412a78e388e59b04d29ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "93b8379294b7a6ca49aa8b454f64de1f2df3db75f47c4bfe6e11e9317cbcea41da1ad8b73564a273c9343b4317329ee96f1f1ae7dee4a61f52b3a26e5790fc0c"; + sha512 = "0a66eed4424c392f5dfaafa6aa198108757abffb069f8f665c06bdd24dfca08dff314447c57cd81815fdfaf54edc87eb67a6dd5c190e3512a15645e31d5d8428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6233c7a642883903c1e8054c6508dbc5cee01a5ee08baadc12ff388cf3353d879968a6cad59ea7458e93df9e1520e2a938a30c04b0f2e3c903857275bab801f7"; + sha512 = "e29aeeafc1f0d456dbe66d7ab07a632e91a25c62cfa03355eb3c4d9396529bf7908980b59acb9fe04204342b4c99f4f05ef5f440d638340272d20fd2bcfbc596"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "41febc39a7ade5843b45a02950ddb1485fca32abd0a0bd8f8e017cf8f1503d4b4b20e7dfaf89e8833900aefad44f5119ec9c8d73f5f5fc7641dd3ae1e5d794ab"; + sha512 = "b3aaec2e3d1a23976378bbe526c63503406690e23ccbf0e255f54c5eae34452491f414d5a8be6f9d8e7bf14d6d4479b9819289074b342691c607dd1a013db45c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3e4f96d7653f0cc4bec4de6c3eafea64c309f8dd88d54dc9fa27eca90c877d1f026b552fa755c0742a8537bc65a2ca831fd57adccda0c3f5573df95afbdf368f"; + sha512 = "ebaff33285d3d78e22deb21da917174a8db140d05d511ad75dd1125361e4c1e7c6530f5fa096634f3bbe364c42c55cc0e36ca7066c05ac21822b28898841c49a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3fe9b14954d3774a389deccbe7d7b1e81c3f50f1e7b7b2e92f8c5bd55c3f4623f99f518e3fc8acf92473dc4c05e2ce316c370aa19d8d39e970a1f99bb9d221c6"; + sha512 = "706fbbb44ecb6e7acb93d7fe8c1bd5f4fb3d3fad7a8e64648770fa69756309c0aaf0c2ff583b2bccb30c9f34450631ca886db0343ace3fa80bc1a6e7934cc134"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "d57062e3ca388a52485fb28eed924376f6decb324ba0cb9e9af2583f10447a24d129b1c0ae17dbeb9bcac829a4da09870eac22fd8aa378ffa2ca9dd2090292d4"; + sha512 = "62206c436f7fe811149936b8c73d62126e21874d63f66c72e7aff0e8d4f9fa26496a8adcd842071a602638ee01a14451c65c0ba8a2847f0b30b3d7da9c2625b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "62d571af76baad53a699a7e80dcc7c7e60ba87aa3d6325cadbac7230b710180dcdd7ba058b7b502303067ee7fd590247d08278583e188394a1873ba9f5f23b2c"; + sha512 = "6481706c1f34378bc4c804216217b15ca90a214baaf6ad29ca0fd80cf050b4f5eca17d29427d0e4bb0a5c966b407ad7d4ce08c085a68a193a500480c9196c760"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b934ff6b86c84600fae27cd006606b26cea62a42c8c21bdc5472b776f95faaa8604acc9c7072a8ea5aa6bc7fee6a62375b75ca4b34ae7ad83d16e074445ed327"; + sha512 = "74ece95a9a152addfc30de6f3daccbb64172c4081163467401d6459d4f7a65a7e459ec91663dd066f9cd7f867e7455e09fd1bad4fd9da7a6c3af20426474f95a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "7135b45b7424650933d579778130484b877766ddc7db83a5c4bf2f7faa662b127d475126d5fd67fffa3406f637128ced63693946e9ddfa4d33d57fe1396f3fe4"; + sha512 = "fca83582fe7cf14948fc352981dcbbc136cafbfd19fc85732466aa8af27cfde37264dd3168e9388c12eeb624d9af561bdd4caeceffe8d42a393d1133a8c20277"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0e66427df853ba3ba45880e45f466349bd4805812a879e6f654b2a02d4bcca71de27578140e4ae301b3bb329335453ddf3a756be6f49b1e92ca06abc58ff1654"; + sha512 = "442f9e533a1fa892d19aef77ca64024938ab934f4f963268ccdef1a715a2c3f2feb73f9c2f6c46751217d4dba9f72dbe88ed1b1114be22e2839c0b34a68e8c35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "36ed5cedcf9a2a75b19de328c5a5d89f07c09e9da728fb3431a31781a5c522b5a53a03fa5dfdcb079ce140f5bab3d7bedc79c0e3c79e3aaf672b5cce3eee2b1b"; + sha512 = "29f4c00ccf180e239a6660f5832d6ba21c733ae0b90150b1da128e7cd072b6ff5974c6479e161c7b646f1367449b8373af9ffd7d072bad2a190e50627a17816c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "616477226b52076c86371cf1f1a548c2c95112685ab0e4b9835bef7b8bcf6c0ebb839ed3cee2f348cf26d990bd88b2dff46e20e38938421a6670cf66a82ee3b7"; + sha512 = "f1d9ea6a116804e7deedf6e6d62b83224e1f7514255394f78fedecf500cc3343fc9fad1da1f690fde9a7eea4d3dfe0cd214a99a2f9bf3b83eb45ab00cc12de7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "87dcfd61c3e02515f772e02b182fdd465d34c79dea55d5fc125ad6f32e504c22aa3d7cc6f23a7b2905dc4f2fb73106ecd7c662758d218349fd6419ab889a98f4"; + sha512 = "8d4be6d04c22e1c98953b1a1468b2768d956b4d0190638cd24273d1a0356dd8479dca22566c5d45b8ec18a074be472e9ba9726b5224fbd3a2b7f05af3b46c411"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "81221fd364e6ba5e6300e93402dc727f9640b73015060d5a3fcb3d0d60f8fd031bcad94c9a5b35157bdb0ee2671fb2020656916fa2f5218d6e5cc1745d47629e"; + sha512 = "2c9962437d764aa27dc3d6a6c00e3cc40a456504cd74fe3a7f74a0f0216d54e9e4d9383fe6c5368fc28ae08d0b5424f65b9f50e33a7b6dc14c344a1aafb90fd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "58b0849c7df2d8d4cd5bc1e076728678b85adadcd504978356e6ac2810a4b1b9d2318e2ad9e056fd9598d3ddc829c16a1ab89102a11d17a8742021d9c8b5e293"; + sha512 = "c465778901b01e966fdf81e56b0f1b7667898ff0359711fd32e343692dd216704941e30c3ae7f4882f42fa297715f778e68094db85583c0e60a57cb91e95cbce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9f8db5e7054f377e4672333c3f775dbec755e6096660d1d642080bd5e9bcd0c8d50a05bcc92bbb357555f60f8aceb21fbffacb019f8b3c901b1390ff3dcee034"; + sha512 = "e194a9be6f993b177031a2fd3d91d955abb6d7a4d249e8864d5a894f1f9af87c39034801ebc9d1cda5f934c8259706c6e7fdcea344b5602f6d4ea8008375ed53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4fcad8469fc5c742e4b4c4dc838da969ec3ee4af5c8c856aeb2afce85e2de7927713acc1ab9c422814d51c1114917e131af7c1a9efb6b91b1e68a5c5b36a3c92"; + sha512 = "613dd230689ca36df61d558db43d8d204da5168ed1172bd29e732e0a640d5f954ec4f5eb03e8c6abe5646139005981bfed716dba8fcfdb2e697627e563a6ba0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a86ca2d70706f2c3aa8601372986525eddd8a268e47fdc7613223cc322fbfae68b86e8041c244366969cc1d5f09db7aa9c6cde9dccbd007fadcffc27b9310cc1"; + sha512 = "63dfc7ea59a29901165707b3c11f1087c6e23a27805de1d355d677943c84303b7c54c199d0610a714b930539bbde96991a79aa895fdd3f6952174548fe014d0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ec1c210cb0bafaaf14a6f8d79c81d2777d228ed31a7a4b1516227ce9c505574a2ad9a15bf72150439ddf32e5e2200f07471c92540d25bff31c6b9b3e123e8091"; + sha512 = "477539bce633a1447937d5689972fedaa1592954ea3cd1537f648d1aca9801fba8441ba6c35cd2148646607982d84fec743bbb115da6807f29790c38d5c22e45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "530c2e803501a91433401445badf6528ccb51b0459028c098d3708a33369e566f679702fbcb50190fc5236acc3aaf4ebb4acfabb529b86a47dceecedeea9e45b"; + sha512 = "cab7637566adf3d41e25915b6e94020214da31aa12a6e913754d1de2fad0fac9abf61686af64bad21eb07e696f23ece8ac38d8255848d5bcc6b0c1ba4c9bd374"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a81f82c5b4623afc3344eeded3d786f4e666627fbd40f64390dc21b728452cdca9f3510e21572d62e550c4e3b9230503eb771b615c3d4ef77e1a0211d79a5f08"; + sha512 = "843f136635783c6a586ed273f5d97f152b004406c53958e59d265f48e5390fd42246c2e92491ff4b39633bcfa15ab1c8c420b3749a468b87672ad900fbe23de2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "633b05aed902b9a655d22f45e5cb62d8978596e4d9b63f403a3f7f2a7db63b0dd2b9a1e5a82f7c9f5e8231edd15eda1ede415a80d9debfb96fc98058ed48472c"; + sha512 = "380ee84b44b90329eb253a604508584cb15fb3d36dd25a859dcfc8443cedefa54959fa958827132d1260cd040b70369d65319f8e18d06359aeb420b96068ea7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "052141759e0bfebedc42a7c9209b122e4ef4bb15f83ea42b8559d7b2894544e26167a6935e854541082a60dde2b301e17f2fd3a5c659642f6a4c83828ea55273"; + sha512 = "e328dfe710d097c49062b9d0a54f42d4896177ad7ba174fb5e45b37baf78ada25089360bb0bc7211d605cab92a2f3c220cd1b78a7bc0c65ac17d15314c68dc94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "74977e4afb2d61c01834cc63f0d4440012752254ee475f28e80d33c63148b7c43520e141f043d90e611be4268da89103ec6432af8beb96ae243b8acdf4f4e934"; + sha512 = "2f65aa3b62e2573cbfb0591e1ccc729f983035c3ada9159e9fb8014263f38731d19e5a2da41943c0c540ff1dbc7620c9fde82c24dac49da7b2d920c1d7faa4f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "bbe4e976026c98c7f32b83941841c3da8992495122e96954d550fc8263e989539372f120d8b359423ae9fce043e79421c096d8dbdea921ac7bea8133485ad62b"; + sha512 = "2d756897a5e3f7f038d3e000bfe6f1976611eae436ced45d5c06eea140ba26041c08588b6ceb7fc5026945a19a46715b154d0860ec7744762183f17d07b5e792"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "cd7b957a983efe5cf9c4760f0dbfe35a06e6a7dd01702d94474eccc19b91fe136a3c14c5eb5d5a1dccbf02bece9535f059179afce15c42567a918c40cceba1aa"; + sha512 = "fb5e2142f842ca0afbc5473dc3031eaba2bbc1f7ebe412d88696f05d8ab7102d9d8c57c318e7f6a8106b07e9cd6d7832ec9012868cf6b7571367ae1514959cc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "0a12a9cadbaaab40db835e5986d9211527d175a4724207af1e3ec6a22879a16054f4e9d7d5deb2c428f0b59b72b6f2d2d1c2d8ea5aaf10e20c0f4be1aaebc174"; + sha512 = "5e779dc92115568c08ad511469e03af1b4018ed15638f88ff83df08cd5dacaf9bda39cb5877757f7eef3d0d47b43777eac5363ba4a2a4ea895663d8deedd643a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0d219e5bea0ac4d75fd7b6d1ec2819e6bae95ebdb6766a09e34eeae2f8de3a330b58f6292c3a00e9d1b255e8286858db39ecbffdedf7af588ef393bfc7cddb02"; + sha512 = "2d196ec8cecd41fc5ea76aa535d830f98cec1572f7d8e7d8999769c09a49cd2063c9cc59314748579b8fb0fa9446b22df96b43c4f462b25dab96c265ba4f4d41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ee2325e90ff0e3fa5128e9a13938afa532fedc7565cb9d26c016a37227dd9417bb78eca928c9c33bd2526cca0b2c3a6f469a76ac5d7685755aac29f06ef6c506"; + sha512 = "647bf9dbfb8f5d053b84c507abc1b121387464542621264df72236a29accdb895e8c71ecef80f7a5a241ff4a18db47e4340f67a0653669e39cc56cfa622dbc1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "df602af7bc01521ff5c37876db7deb0d25414cdeabf34346c7cdf61e9083a12784ff94ee647fb75fcc9bb33e7458371b137cf3400b4d07dad4064b32a7cab11c"; + sha512 = "7a67cd7d6c4563189c93bc2b418423d6f787b36c5b188411ce49f763421d66ed37404b9caa0bf63ec4c150019df79de1992ef5a98600e63b5a8902ab44354a0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "774ed56ff51c7ea363c81fc11dddf8e6d54fa7242d9c7dcfc6cc3678dfe032cbd70ca93f014299690ff461da6c8013b946fa9ed170ca755a33fb95a85eb726f4"; + sha512 = "3a9fc6e362af83a1776619e0a5b36ce6f5e59cb46d2e8f9be2c57bc35b7e4e2f82b5ba4b61e637bddb470342fa67993b0374f2065946ae0ce24af1e187695211"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "c2513985cd2d6f1d874eb4f28eee05f7f42e639f8dcbc4d2a39d331507cf6681dbaae35e400a1f8e876598e8a633d67cd51b133391db30e36db46f65ede1cca2"; + sha512 = "5eaa3a5d9b0cfcee453de81138ab9ffbf1abb58eedb97a6b1dddc73eeb919c89bf077138d7b86bf804bb545fdec404724f7f76936cb09fca3844a93c7008dea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3bcad2477cfc42e2f01f5ef1bf3e907f80d96649fb5b2f143f58f6478939694fdfbab33bcd35b1f95023ad39ff807cf532faf43e1dac8aa66ca1e8d95c44ebbe"; + sha512 = "714c19533e92d23d7ceb7ba07dea6842d6f378c8d705ab9fd51769720c1b7faa8fdfdc9786dee881aeb5106e5a38b840aae4f5134962db225d0d13c0a9dd886c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f01ce9358446ed8ed4b01297fc175e2fc36804262905f2d5e6732827ffcccf2897d5daaa6464a4ca146fe46d9a1487164de3febb6a222343277cb26492e5a787"; + sha512 = "0b7216b9c09eb67d774fd0b8cf1a1b43a6cfd14d5327f6768136de3190974bc2fcb250f920253de8e77f7c61efcd23d0790da1eac2aeccc77e4e74fb4cc5d643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "52f23996de3c4cd409cff547348757f48e421555c965a58dc43fa82c99b51260b1ec24a97a04b046f29455955d62bc28a41d67d8087e23b9c490032cc28402c4"; + sha512 = "898c073e7335e7f2ef15abcbe9411f31522c2da464b62c2997550660dcb068fcaec2ab5e12fa4818816a34b37cf2a46bf9c5b36f65697a521cd5b0c05960122f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "490a950113acbc895226749335d8fbda813708ed916fb79719c0980920401871c632150bd2d88749cffd26bc7d3e7352b6706f379b37d11df6a8519d6a6642e4"; + sha512 = "f6dfd4d7aa9c1a0ced11034b59de3add54ef2b30aaff30a14081824bcfbd7bc020ef840f8c12544329b506fad1567400d2c7f57ddea22bd1fd37c17ddbe851d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "12191f6adf723389595e7b9b3ff1ae20c3873b511a021205046c51f29e960db1faf45e74c055edfeaee506e6c8dcdadca7967da4b4421f892a88bc337c6b5046"; + sha512 = "5dfb93fa63f26772a52b7d52a0839f1bb624408097cf927de0222eb06fc9b9b7a9649475d2fc6a02e7c66ab1e6aecd8fe3d959452a73b1f9d3d1be6fa1aa018e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a21ab0cff70609b3aebc28ce34ab2e6404b53638135667c330915491d8cb5c5ed7f292385e118e03e1bf2b4cfd197ad114f98b41371f5641c02d8372a7682286"; + sha512 = "767e3793cbe7e4023f227818617819026693287c3927d18193883e603d21d23c0239173266c89d776afc8ab0cbfb40ce9b4516e4663a44928abdb7672dea3f85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "93b2d1d091f9c14619d575eab5fa41ebe5a36f3278fa537f8143bd9fade793859d2d94e14d809e82fe037ecf2a05d0f84ef49c70970d00274d51beb2bc14fdc2"; + sha512 = "b4b7147631146a53b9ab32f8a3319466f0837219284d4757e29588890bd518b45c7ce329cf73e3840c018a160a13f841851c407a0c4ea06cc3acce163be8cf79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "184185ab33f3d73ea0a5f38b5e9931201ce3018e5060b72b0344211d11f8ebe9ee685e77c2160ce58a60b61e1377ba28f4bbdc2732f0a3ccef2190ce55072065"; + sha512 = "d3fc7706838fd310d34e9b45ee2fbdda352620b434e011a9b54aab598777001aaf24db2ea528da413356a486fa330729d121acf7e103905eac9bd914b5473426"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "b0917c696844114ccfeb854d13e75d48038404e1221b13629dcd981b1272f7765cfc85a0843d85957a1f3ead2a98288ae28739da47d1186b762058213681eae3"; + sha512 = "61621680b5dddd1058e58e741d2190a7d07ca74301706dc61d823b1577ba3b76c72cccd30fa64f4b5b95748e6ee4077945d6b7dfcc21d648f13ed7be62de2eca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4ce9e202f6d794585294d6bf664c999b88674d74d2b085109ad48f7f16737e26c89980c76e9d6ab34800e841bce9074fdde6c574b228116056922799369fa04e"; + sha512 = "66677835319f120fbd2290d7a050f2846484229527820e3e49daf3b7f377acbbfd0a736f2e71c388691f1d04ee013864813119e7f7c5c7528887b8061b62bc0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3138f5abddc0f49355c768fa84ec475bb3c013fad94bb4c87a2eae616b590244339236b112f03fe16dfd0b10ccb6d106cc1db0f73a5eb95df7e0dab9a247b496"; + sha512 = "d590da1e993a5d598411717a9e4ec87876066fe106ae1cf37deeed77a0508885d47836cf6653d144be30dc21917a56cf5977f99f3c38d5e9843eb52d69a7d267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7080f9e7838c5ac076bcfd0e1192f1435b623c81144f53b1ee935aaa07c941ca8afb0cf399f161496bce02052d069033f6990bc9da16a1ab23f228417935d8ed"; + sha512 = "450772baf4bec1a8077aa4ae1dd52d84ecefffcd4f93b9c486bbb4eec12c879a8daf2cbe51dfa2f81598abab6242bd63100d8243477d3176985a689eb2688147"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c058a8c6b4ea8c48991ecba72cc4c5645410da2d9a8ef9175475fbe906f5bbb2fe82f2c4bcdd86aed73cc75aaa0fd5a2e00a6a780f394b843ce075fdd031f8be"; + sha512 = "3ef9bcbc9356a83b20f3f3fa83530790209866456f44f9115f8f22a1dece72bc28f485f24dbfb854c77d4306e2f3da5f759f7fbaf151ac8a8f303b2dd24832ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f64a6373a56c7ee37ccca43708ab33b3e001b477d2ce25870553eb96fd3c42f20206171f46c93513cb328203c4454461d808b6f888260b0c2df76450ba676fb8"; + sha512 = "59e8a7fdaa37513e11722397d9708db397aca75eecf3ae2e3b99f42a9e40e89b183c6ff36fccec1c310269b5a4ec3ff9f81985ece314a868585082e4d132012a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "14f58b3f59e68b9692a6fc562888e7868becf95b53aa6be0de0d3ba6c883cfde4b56496fe017b5e6e38a89b0248794408402657a34a0db45eecae74d9ce7f9ef"; + sha512 = "bb7a9577fc6080fbb82918601405e8a6da59662c9edbb568e558ceaf71e04e95aa3dbd7acfbc780759b0cdeaca4b67e24cec1aa57fec30473d8410fe717450c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "238d2c63d4ffe36db493ef153c30a6e4b33e1403e456d2c02275786d3c13c8b2e0467a80916cb08f4676ed68c94b2127ee9876614909e4bece2577609f027ef3"; + sha512 = "e8bfbc9f54b3cb2d2a3f816329948f9e13723dc6c680c41e33cdf3bbe4825e89c9547144cf5dfd3ecebb0fe8759cbbedbe7caddd85c31007ab28b42219a8c159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "843d4d67ed852b2d0f54dee78cbe3e27ef052537270357e71f3ee0643904c2d370d5e0d25cc2e1dcc150d5f999f2841b963df41c7a98493a5101132dc6ef9a77"; + sha512 = "b95c1800738ebf79b5ffc64fa1a11ef772614eef6f49faeb977677c31e545e4bbaec3c9c75567afdc75397cd40dd80a671ff03ac17bc62ede2bdf162323e6559"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e8eff86060d9f6bc6fd0f13c6f1840c77b9282f8be07177cd6ffd5472ded9b55c3d4e7641a67c655c94fd72a21a100648ff1ccbdcf90b5e7543ac1ffeb604dae"; + sha512 = "505d68a0009efa7c8312fc5230c00e3d72c8412d6308360cc10257ceaeff98b3f22a5eea9ceaddd7566a9a690b4f0c04f91dd8a447bd338af02c915115cde506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "bb62e672ea5aabe57ab78dd37081922a67ea6471558c8a412bc5f6718b88439afb87debd23bc8e8076b7f0ca20083b79745ab0e85cfedbed024d82fee7a79986"; + sha512 = "01eb90cc8c93afdc34fdc0e47eb5b4a012c9fe7d3dde1301ecece240562766066901d80cd3789e97f2f7a7188d56aaf7bd67c56c4e4a210b30ad10a738ca5b1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9e0ffb62fc391ffc0bee82e67c26fd24f22be3c9ab0d14d929cc0ddaaced27facebe49b55bbcb53dad9e27466d22a4edbcc1358cf38c4beb1f846278574fcf76"; + sha512 = "486aba5ffc551be80e8e9b35cd92b903e318a3870638c532dcfc10cf0a7d545825eb7ef54b74d76f66cca2e86e25614896f78eac63b3662b43ed313b853ad4e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ea71229a06a26c13d436662336e5a9b52b290c2094561c3626bdda069930c3a5b4dd61a25f76d147fb152eaefa07fd1e032b7a739b5a2038a2c4360827322144"; + sha512 = "b0e885c206d93c294997b3798a93738f99e4bbc459f7e8c7ff688414b73f69509686056f86b12407677a79b7d4bd7aa34f4dbebd5965c6a92766f3448a33cd79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f0ca79deb5450984e1f70bafddb2002f81adba022ffd2ae9c68c009fa559253f47a5fd66bb232afc5ed685721c78d7c81335e4e5e898e4a469019f98330bc602"; + sha512 = "1b04601dfa2110a2999dea0d6fcc19fc40b487296c705a403e741c9a9e0405fc90c774af7665c9335e605d6fcba3c8826701a497483b896e7911bae3a7ca7a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6e730c323889c7d889bac2cf7d4d2fe13347c4c9ed6251ce9e3f3825e99248c896740ee24557e9238e8fe4f5b29702f6344ba4a3210279a6e6432ab94774d990"; + sha512 = "59d6957fcd1b2527cb77622df7cec4267d84fea180dbd2a7397871c90b2c27e8dd0b01881229eeb7219b548258d72448e690d654262ee55cfdcfa9d4a337e102"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e48f82f35d338852abe3ddb1abcd1c06c5d401f464bed702b7b649fe29e1a8a3ae25f4a2d0b4d30615340021cc71784777eed114b1dde4a34928159b8d616ed9"; + sha512 = "1d18dc2e580238d59997198d9aeea8673aa1d32db329c0dae79e52d9e3e64b063f4b96695bd18ca0a449ac3fd5bf77815aeeae05c108c139dd73134199a6e599"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cd84947d36f334740d2bc590ceaf8b052ef90c7b261712eef9c85580ee9d703e0b362ddd5d51ae24ae7bf56e2bddaf32f36081df2717e673c016ec91874f6b53"; + sha512 = "1d8bf57c135e56eb6fd823c605e870aa62f2b2c4d99f50447169411a3877fc089c588fb085d4c3a2dd62a2a955c5f7bb39cc6e8c391dad0f6c2d1f20f4a5944a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6c59d46bb4b740098ec69c7a573233cf871d88ec1f9a9ecfbbf5f38a4ec1977cc7d8c7b9a6ed78dde2a795d6d078a2e505646704e91ad37b09fff564585b170d"; + sha512 = "41d3c18252287a172dbbd70c713e7176de8ff107ba0bff47c6f2546b8573bdb11508ca550fd8cc56d23172a84e30e1573dfa43232d4298c1862d5e8fa0ac2451"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f700e667bb8bec958501dffb33bba8cffd4bbb84cdcc9f00ddee78d43676db9afddbdf6a3d9b2ab9e58c10d2b1a2727c47224e6e824f36bcf018f7bf53b45b43"; + sha512 = "b0b485f098475c1a1d422b8bf170e77ddd3ff2b7b3432bbd43dda975522767b9103368c74b8a74b7cf5639b6fe72690380b9c7c94995afa1badf728969123f62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e40a8935b7ad0b0656783023c622dc357921eda21583b1ed46c85a7ad2de8972167196764e98f75ee0c15ef046ebf09c99a2fa4613106c5302de8a9ce6429b97"; + sha512 = "ad8312d0ca6595dcf0073fc2de8a52dac61610e2714500372250ce142f1220ba4449f6cd5f0c0a2754eee11aef5a71062e82c08417ffd0222d771ea701943b3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "780f5df88cd75c306e725a48aaeae2b45ab5b30342ad74f5ce521f10dcf6b96affc92693fbc0dd1e95c927a21ec26e2fb9cfc74774040656459f2a7477520d61"; + sha512 = "ca9bdf02f34f92f0c752fbb55d6f69d17206f47b8745df9d224dca47d57ca1cc4b5646f374b37d1250733f66d83afe287bb698bbf783b08a6b7ddfdfe35a2e64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "59a20ec7a102830976fefad4f87fa4a59ce723541b069204c03728e4c7f19cddfd74e604844da72969439542bb67e404cf5d6a649372f85250cba4fb8fb42d7c"; + sha512 = "2c621f00a6b2f2978fdbc28fceadcf2385711cc56c0b47c536c690ff3c7549a2b9cae71c9eb1ce40c7a199cc936f1402e7d3f5055a70b98b015ac25006019464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "56c540f1a5d46f7e67cfcf8c6197febb7e7c4761bdbd0d4250a0c79671f84ff87c3f146f549c8dab85392c7ee94d59a4fa2101d5d8b9c7379b0f39a24d37b5e8"; + sha512 = "2fbbdc40f1308513fb9064f6057a383af60d5a7f60d07a4918f6631d59762a2a8cc11b23de167ed0a7317c290436cc15443e6d893b92a53df1bae2b7da3098ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "af3c4e96ca34c177fdfad0203daf1a85819e731b4137bd7685ca95d33583a04fbaf54097777c571fdc0ffafc4748f57b683cdf6773177ceef1e6ffe764f780ed"; + sha512 = "7a993dea012e011c97b98938bdacba53c498fd15bb94b9deb05b27d7b842986e3748aef6a6bf96b1e288c8bf59df5ded37337ffd10063b3bf7afa81cfb1622f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "045767b189c1f8ba26bfbec61f841ae2c66c7e1b35569edb26ddbfc9169e1cb6122237d83808a87e3bb3ce4a6b1f080a9bd77bd6f8d7f731a87a894a559cab1d"; + sha512 = "22acbd2b46bc7eba4003295fcd2fd01dd9e6ea7a45b7ecb595d55801030dd7baa7363f2d8b414554b07e8e4ea7418901b0412c43e5bc7a5c3c03bcf54318c5f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4126eedaa46dca25e491e74ad788af4ded93127061219dade8be09cd18d807b4df549178c4e1d525ba1530ddd50dc4c6e35586e7762f550cc0381bb7d9c2d7ed"; + sha512 = "5e0f2a51073728b8b90eef284f9e632365360f45839b0622e6a52c34dd0eb41ee7ad07d320e6b3610ea6265ae48daa05cfc022bff0b2bdb97caa8dce1b38e0e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "60ef4c3830baf02481d7371d4a55ad8da7b7cb059c1e7171b3aca0be159baeb287b2aeac15e0ef0936f452a12c8e6d2570f50a846af7b87f5d8e1779fcf8c8b6"; + sha512 = "4bdd5193455e99f98ed90aa05349e2beae496c44718f07b6d81f81abe75d755f4a88fba8dc020998fd6199dcf1271dc7fff3177625e7872e1d271da743d4de00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "354e699c53e9b9e0a803824a4f5d00fc991adc3822a21f5842a1268e6d028c89951c943aa2461402d39b7345487bf74c73bcf1cb49ea2acbce5a24a49ace8b9c"; + sha512 = "14e7db0c882d5a84439926602d6d706084001499aed5db4adae6a11cf7c25e95d0c77a59340c74bbe11c6cbf960500eac902a2ea23f7bbbffb9805b789242eac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ada3a7ee976f82841096b9cd80fc1af79000833cf65971b3c141f70cb9ede5a523c6e7e8f6be36d6a175c7b1e8415f95a84553d21b35bed90bf1865861ed9d19"; + sha512 = "f0948c827cedd46641a26facc08c30c1b8292d48d8d703fd7fa846bdd1c9f631feb64b50457fc6d10b0b2a6effcf304b659e1d5f666215613bed75307de37a6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ec9d5f601856bdedfa4f005692911e4e9a5afc88d8c0a5551e507ccebe28f2280b2ee3f842df5255e1cca5b1e35308354827d8c6006c593366a08e917622366c"; + sha512 = "a0df152f09d0c6abfdaaa1c3c352282374c71fb2cb674199ae8fe4c53b891d98a5cbb19c5c20e92e7cb602bf4be1b66ccf6db295cb91190b639e2ccac9c68b86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "e939d4888cb59e0a1f066c641c213bdf33ad56c60e73eb7b97983026249b223f2465703bf8df931b6b844ced18a8703b77310ac61c847be054eb83b8196dea6e"; + sha512 = "eda5d9fc2798e04addb6cf093548cd819a23ca480e392440838dc8a023e074b4b235a2df7a1ed26d4fd795c7e21c041be6f7c08d6dae35b05fefe9c31c79bb9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "4f269b9ce6f25e236f00374e68438d09cb30107babbe3fcaf88312b7abdcf8d4a5b619860e3e4010f367b341646cc9de027ee094f175cb144a00bef47f427806"; + sha512 = "09aef5e2ff0eb455284ad185274fb6fefa2ff6f768a16e6301c58be9f97aa357bb18147d7a909694c69daae683ac636ebb16f800b6e0d7d90e931426f74cf3a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9275209304112ead1c200f9f62386de665922bedfe8501f5975a7598a6ab19ec6941fa61cec4904fabf75d76c42105f7abcf86d91c746b609bcbc6957b8c40b5"; + sha512 = "f936b11f4fbe0ee2f31b5c4f773e3e0044468bec15806afe21ee4e3f95862909f6cd68e35731ba29a32aa7cecc8c06120c3722500d9f3bd2912a29702045251e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "4b06342ca02d40b6bf9de58e50d29ff2ffd3ffba60e79b6aafc7e59a1ff8bc28e1d32ef6fed7ab5d90d5224fb98ea11aee57c758938ae84015c52202be97a300"; + sha512 = "4089f69168225d62d89bb34bf8c2cba4c9225b1b768e9a94b13024bdffd485d83f3389a8d9964b6afdd5575917d70070d7779dda0bd0119a15946ceed2839afe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "02189417dac9ad1371fedf3a2909d3a1cb612566d653255a58402dd79656a56fdd859b23aa7b9872a928d2ac088e96bc9d24d97504ac183d6e3c7baec8c072a2"; + sha512 = "4ecafcda0026949c745378e32a8bb68a1dcdaa292db74f7a88bd13e38dd39f2d1748a69e9e2827ad6e8a2a71f1872f0ec3cb846ff071954a41dee242ab233243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "6a629c7c06883c0cb3d62f69d996c6778a0929802bfa086fded6f7b5d3572e615f6280a68b3343c43a111c02ff6b18f77ed411029ce9c6084c98f418f9cf5fa9"; + sha512 = "25bf5543b9586e542968aba4896a0c0c00ab5eaf99b82c8d9b7354c82c33d2eab68dbae2295823230cd5708ef02817a51e9b9f12954a43aa0c0b131a44388d72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f890c9c046244c476250ec89821f5de5a2e0a2acf12be2ece12b192276163dd9c86c046e8d22280592fc0b22e799b3681a3138a624564f45e3ce3e17dab20119"; + sha512 = "90aaa4ed0f9377d17ec0b02ceb934ea775d5f378a01f8b4c0ba7cf5c67975bbf4f7ac59103e8002116118972eb6d2a48c6dd3d6cf515f766667309d0d515f994"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "360cb88f79705ac8b6e50a52ef23b10923a15c952795f1bc885cff09d99e23f200b7e67ca8637fad0447abfdb07ee9526f26ffbc424cc6c9bda399da0e4ef0b6"; + sha512 = "0fccb7e7aa3ae6f8b539864ed44c7d8349ef96ae5d55d9ebec33bdc1dbf470a9a831b440fb0cf008e86421290760422201ec55e704b5ecb388155605ddaf35a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "03cf616b1bcf80c2dda6a6eba15f28b9e5c8741aa37c383c3b16b6f1ddc834d51fd144ce3484709335e06119769bc021da6d1006cb385929451d6db1f1480a4e"; + sha512 = "fd7d880ace4221cb8031bfcd9c90c07ed51fe345c9592791bcef61e52a29fefc035bce0a24a24594f310cb7113ebaae8525df0b2462f86560a45253b89b7a53b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "de16b1013dba1726a146c3212310da5e51f6dc706ae1e5fbda60e1181ab19510a485908bad50b6a4d87ed1e56027627777bb005bfc2a5e104df9f7d1e95cd7db"; + sha512 = "d7c386894783434732c56460fa30de8ecc360041934743b4632c8a03c36b00227fa8e23d2180a7f5dc742cb324329aceb2eaa4831c9eb9545920a95ae3b7db44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "15826e8a03c1c0496a7d9ffcec580f283b789c594f6dfa64de2ac8bc86398d2cd267a84a274a94063d980cbf984741f1754c644451dcb1e56d06c1c8393d1294"; + sha512 = "52a64ca3d152b0afa2be9206ad08fa1edef8411d41c23d984c4015b629bbc0ba21970c1059cda76041366221a193040db474218dabad7131766e53ed6b719d81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "619cef2ed7c9a8fa67723548aa826926f0dbe34996a1c6132571173a15c15dc7a8f9165296f4a94e1b8beebf67cdf79c388fdc898a013cf25985b4fdb4a5c200"; + sha512 = "d88c9bf2fc5b38d367a3e6210b59a4488092d42b380bf020bdf82b1c0527f03ecd48c08813a8bf73fcea48ff58a77fae80b2c907498f2d9f5275fc3a7f80c5a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3815642e4bab2ffeab6208d9c6901c80c89a42dc8453a97ff288da7847f033402bd48c0eba8a8e62f0c696fba75f95e7dc9795089894e99c70306cf4e40d37fc"; + sha512 = "cb15b0cd5980a7021abadbe765c714604840a2127722f8b61bf9187bcce3b70af2e902220d5f0faa0cc7b3d513e64a250bbfe43a090d13ae4b8835db0c28428e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b6a740e7273be146958a99a5a4e16f7c1c7e21b8df76d22473c6ca16e510d7f37fd9fdcb672c2d6ad29aa354a20ee3a7c5a9aaa03b9332ea3f5b460e7d271565"; + sha512 = "8ee5673c42ba46e41ede5f3657a5fd7c9073fbf9f27e5583a0471802542012b67e8e0730cb58f0833fdb1d036dd887ed797b752d79290ad8982d3addf6739c44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e3fab302b21d5f6de8b41faec14cfd842def6f2a65259cd8d5b0b481fca33bece3e7fa4610c60013153b676dc9e53d790734d27837e4701b393e322c5eb0f602"; + sha512 = "25a2d1144a734270e0304bfc6a42a6f6585bb79e7289b381791fb6a45b86891f570c9c4d6a71de2fb8f0aefc6533a11862363ca60bdff14f817704fed4e9bb23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "28f62c0a906283c1ebfd47e598918349c066c33512d3fff2daa44885faadbfa8b00309254b754d758d86acf23bd4ebde9142e56302c23ffcdbbe2baac6fd6e47"; + sha512 = "525fea1b71c9a51706033c4b2f523813e61666df6230ba51752a2161704c48c26ddd5d781285186beb53e90f01cb35e7de743723bb049b729fe26799eca6036b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "c9e00425a869501867f20b22c85e72dce9798437ee8afe718eb21c06acadd9d618d614e25463f84d0a31901261d92603374f9b2b91879e19973d50942ae6774a"; + sha512 = "743377d9a76b6acbec6a7c005824c6286e10e26e30a6bce90a8750657d52e19f62cb6653513a241ff9a6f3cebb5caf63dc438293568db5418827cee6dfd94b56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "58811c55d4a5f41e3ef8b378c00a9a08adfbb48294eb20c32dbaffd972e1df1ae55191a8ad5c4705002f07d3b7d3eda90ec759b805995c14c29fdb8707517378"; + sha512 = "2b96da128311fbf97cbb31e3b4b6e0d1fe0158ff7892195d7074de67e0f5b7e22f82c8131dbc0ff209e043d89191d269f5b7af224f6d2646fb5a58168b2f0d31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "428b34c8dd2c926dbbbd2a8ccd72ea7f023e5fb0e9cb664810d29df1008ab744eeefdd34f6f6de1596f3fd7da9d2e3b23d5c216c8a9ac94b96aefe5fe987828e"; + sha512 = "fc5712958fd93700d39bc60799a32e99ba0db868997e1c0b4750bf6258caab3296decc55d14a48d9ed065b9beabfcbd9b7979fd9289b4243d0449fa124267e2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "5f1d54165939ef8448a5abb734f8bb914626964493e9ace1a483f5d6003c0fb087e6cc1d76afdc15c1fe563ec64f022233204be92a5705d8456a6cf75219cb4a"; + sha512 = "eef007d4b60b487a1a8352ed7daab3cc5fa0f3e24a235f5fc28979c2fa69390032feac2590401533b66add014ef85f573e89613334b0b4933bad903c8576d566"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4eed64845ca603e21de1e60632b7d75e4bff5a5a2af792131de4141a2454fc8922109f67c13c9cd97032e3cb2cfa4d5a0ca3cb3e64faf2754fe44d8a161c464e"; + sha512 = "51f73c61512ac4f568161ea0dbc045a11dfdf810bed9e56a109c127b8e64b649cd368f02f06791433ef694190a08eb5b2efc66db48674244553c997b783d0610"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "7525926461a5e89d4aad85bf3176ff36c39fa18131ead378ddce015688830051dcabb4eb3dd05922d84ea2fdb666dc8a2f8751c6bb3405b4c6e1f7a5241dcfed"; + sha512 = "71a6dcb6af95976882eaaf330dcbd64942decc76ad2a110e11721d8dce64c1fc28522520f2dfd1484b430c8c5a6f531c57ec96e533d35a7cb3bc3d688939ef8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "3ccda6fade937406e9ad8c609e1cbecc2ebc064d0793e9facf3910569ad5f8997d8e9165a60d59de645d29bf1411a439904af504a5daf519774bcd76a371b567"; + sha512 = "e18c221ca0781c3a9a95ca1b2542eb7bfd66a09c9ceaa88b9d0ef76396f21635fd5d79bcc4881432426673865fe9aea679b8c4986bae668587371bdd237a3a89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d1a6c8a42fb947547d460d8d244f0b091f609aa3590fab7a785a5a9aebffcbb96fd6254797b19ea3b0bacc8ba086db210ead35260cac69d980432fc0a7a7b9e1"; + sha512 = "76135be63a3da2968dd35055207d58fd58241846b4e680aba92541047ddcb97635ebb58b218dd86f86c94aaccc58162007e964a63099b26d139cb8537787ff10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b0052bbd85357bf6bd3d550021013d3f97cde943be85c08835e9d51b829f9fa66fb3a34937f806552373bcce2f36d949ea872f0eae115e7b1d13382502fd2c3b"; + sha512 = "088e14979cca1a9e9296dc0fba4507e2e5a04b71211fd9c4d64032b6e76f2c5060eb40b331762727dffaae5595883e7162b8fa6c7915666e0c4183889ae64089"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8f8f91ee726b3526b0d375f6075e466781fae463e55f8e7140b859e4418466c3653a3a39ef69c5395393840e8d09188d1be503ef7ac9cd2f34bce7fb6fc8719d"; + sha512 = "35dc0443d861b8345610448ec145b1933c6de5eafca6fe83580632d086f0ca2a818bfc03cab85e9cf1aeb32a7ded6f47e7f9af1859c1432d8ae47f09440d81d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "895f1e28b998d27c99ae8cfd8f6bdb94dc526d5dfe39d537e5ece92a76b8ea3a9905197c40967e7e90bed60567628dfb23219843dcb313bc65b8dc1300dca51d"; + sha512 = "5d3ffd08d02c2be15fe5e66c7fce402b2b3fa6534192fdfc38f718d3a341bdde25012a59e5f8481314986fe2cbeffbd9ed0d79726067fa4d3658d27855839af7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "3b206e9d0b2fea0fc445617fce9c9908d0d4ca15e68ac04fbab74dbb7239c986de7f5e0a5ab601f25b3481a20eb9fe1f39aaa535ba24fd6e1c76fefe81e26474"; + sha512 = "79dc2dcb1d1dcd17da99cc668086a42b25b32f867cd381016f5cf76529363680db5c7ffe53f2660d8883eafa965e320f3d8bfca00dd84759685dfdd2d3504f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8a9293278b5a426aeb3f1da45fc5c8d8508297a81534c33ed3d032fcb0a0c67eb4cac72b591f4fed9b159934b1e3f84a6996f665ec7955f37b6acef78886ac3c"; + sha512 = "075639fd73e2595c5bf99632e0aac36664675a3aab3b1b96e9fa701fb4b4a6988a4d966cd111a206fae5a6d21a79286d7b24ebff44738fed2cba0fcb7af29ed3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "edc302624c544c455f1799b271b0c6590131f0e01e4cf1691fb8f6fa3b470ff9a5b4db301ca87ae97ede4482782d802e24233d20d84dc8adc2b18deb25b249e5"; + sha512 = "05d5b528aad3ca76449300e4708c5ee8c13951e72c8343b8c0ae7587d2470c485e7320e7ef70bf806caa2530217d525ca72a95f046ad5a1576d5fdd69a971969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "98259fefb0d9a3ff9d5e80afe251cb001c767736887d6c342d857536a031d013442a271b3aeb1c227c789a5695e134b31a81777ca7d13249451bce4325bc9a8e"; + sha512 = "08334bae31f5ca6da017fc93889303d93f39be6d27bd79031e5f4f01038d78caced4ed5f407730d3c48b2094cb40448906f53f190415830d91bf7dda1463fbd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "f0f8d81d0700d8539a9697001a9bdbfc75a36e3f4a1786d46e5dbdb77f61d69df10097040ea8e5aaf722b7eb578a58300c2feb32bc010443fdbd2e5eeef1eff5"; + sha512 = "054fe82f776c2b38175ce2ea6acc10f81c2e9f9ce3e6f96f49cd8d0521d447d26386384327011d0f7879e58a3af81c93b7f227ad4b5385fb8903ea29c28cb1ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "97994f92d574726cf0553378f3a0a90d32cf92b8810b33a4c422355ae5dd5ce7f411352f8f45311c24caea005b727a2886bc60589231608604f97dd684e5e3db"; + sha512 = "82e9e546f77e94d4f91eac13b9f1600bcbbe05a250c6049693489ca46c93a3ccfc791879123f1b49c82ba83c9f472e8f6f3d00f50794cc491a99d756ee9eff22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "8e212c9b394d887ec8a27e47fab45f15e4d179b82332605360a951fc4bed5693be1136bddd8821ecbd31aca926a1277cf9f1fdcd07e365ada5ad35e19c64e213"; + sha512 = "f8e5e352b94e9ff12c86f2b2d189c88b6e1c24cd912e3777eb256403e691c0a28e860c22e098d8a3b4c5d526580db2da2deb408f1e8bdea91deda5dd8cb94e9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f8ef36d7d4cb44a170fe575d6bf94854549eb311422ea5c6ce9220f6852d76c7d1d9b65f8f959526b6d91e88b1dc34bff6f30d8534fe565574b78b045a652662"; + sha512 = "c6a806f7b7655861c1e44837e6b116c70d64a158e5f38c13179d52230d1bad34121c04865959d0608f6a3193bbd55fe081d2b6b3f9ffe9c9a41a1ea8c24d63ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6a6a67453a7b48f635b2ec0b6fd34ded5d1624a375ff526ec1693affb77d7c503215d91a29c0a266228f2f1780f0f5e6b8ab215e810faa8eb5bed5a36c998975"; + sha512 = "c894fbce700c17200eee40d35fe423dfb19f5e4703b1bbf39925e4fae85e094eb5124b8dcd1e8f09f57e73be4793a92af32018b385bff09f7d111f8da06517ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7755a4cd53704f28a137d8588a969475df4ae444e1a15591941cb409528deda93b45bcd4cc0d8a10321402f01ca8439db6ee0d634a1a50f964d824e61cdc789c"; + sha512 = "9896a7b6a72632a42b68e4bf0effb25b0882cbf1571c782045de452a5e58608b41fcd2027cec5677d31a454f6bc82b8104df7490bf1c4b1b05a36aa170fd2e7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "88b173d9b150f4973fb59d3bc51c3cb5f9e2580805310a73f2de993f6cb053c2c8a09d97c6979a7a501610d924a97ed6cd848325ba5142680c2e7e83ed026c37"; + sha512 = "4708a94835a987f040e27342d73adde1094de3824ae444d124f2e02223de5f4bc280fbd954631eaff8f17d839896c02050c78e00dd54b4a166f291faecedf1a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e84b113f5c8a4d5a242c174fb5752e23be54bdd79d19926ac46f29ffd7d0d5d2d35a7f2aba68967c0cf0a352a8bc8f5e7ff50883a1423a99d811a260323475af"; + sha512 = "430c0ea67e09e36b5736f039995b3f6ee4a7bc83327366acf34cf2ac11d79c49d37a336b9b0a39a61381fb4d9c47b0908f25b4f303fa4b21242fc46749498c17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6618cdd88ff48e3ab9b1d5f301d668c5ed1e659c3777cf1d87f7fb33c8698659766291b821f1fda11d13a72e50321a48afdc42438f96a8e827b2cb6712a60e66"; + sha512 = "e200e5b679a45d6a03784373861a7e78151289888f05561c9f58f4afd9cec36df5df85865d790483989b23435c1d762e8020863d0f3dd6e02f3fca31fbf642f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "56488e4dc90422b1df30265dedfbb2d0ed9e2569b989d642e83d68f71be8e5c45caa9e7df0849993b7763ed91dba937a66231288cc821cc753e9631ee1cc6118"; + sha512 = "d7d5355aa60043fe759a86134bba37fb99ccea19978b0c56298f1acd465e5ec53d50761671e2636c535cdc6003fa82f8e99027969d254a3f0003995ba7db995f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "87c044f5b2e86c65f03b164b4875805c01fdbeb8cc1f1a431c3e8dc1c5f7cfe5e836e2c32cf4a6a26621c3a9f06a831edca828b5a343d8547e69684c6da23924"; + sha512 = "fb174f97e2e21f6ba70fa8eab316a445a0c01a32fb00237790cddd4e6a32e461e89977238a47317ef2c11268d75ea34e84ecf96eac346661da6a4e7fd1509666"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "22722fb25b81ae05faad99a81af7aa21489c0fc031ce039c7f917f0d329160748f7ee6378c53e26846c466a472b19f88fb0a71080b37f16fc036f4199b75f67e"; + sha512 = "d453cd657ce54da24179b74723e2e0c793d6253f31bcfab914ce5cce9992266a3533b0358f53ee17aac0b1e616bc9c5c2d32112a514ac85061da61bd7b8a425e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "680e8889e1b4b162118dd781cc43a928ab07359d31d61f0e2053223d5eb858d24a12a81dffa3ba562428d958940019b0a775867553cdc5156d2c380f1ff98d13"; + sha512 = "ddd65dbe5e8a9cc59b1c44b40b0f836d56b1042b5a2a37fd021166929485fe013acd14ac59f0c985b6a691b1ccd8b62f5d0bbe89ba341c414003e73fbe839546"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "45d39ff9ef3de3229e1a6799fbbfe8ea9e773041c9f98998aaf07a41146cf8a034a46927df8003d953ecc10ce50b375b311fef5b3cd532952761b6d05c4316db"; + sha512 = "5473918598bad367a0f8cc71f50b54c899fc6ff015c78884040c09f558e0a80508dd104112b9ebfa92b8fe5f328262fb2c784dc8726c588ac84e41bcff95f943"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5b6b196fcd7c1a23664e10a0351a5f13e2168ede27627a1aa66a6c6e586095c47de071e917b82092f6df72540e50a93fa95e0c81e0e06687517622ffcb9b8a6b"; + sha512 = "5e49d9d3a9aaace6192a838697ce0220ec347b93c0896dcd1cc46f97cee9a7835aae967d4413d71770feaf917eb984a5547d1dd5b6587baff7bb895e5c2fadbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "44d1554d851e650f2121183059625f3c8f633c50b309cfbad2cd0dd3b3c7cfcda33c8a14ab74fbb3481725c530c5140363dca573a4e686d6921974c191da093a"; + sha512 = "84b39f6aa3f9845d2d34ce089eddfbaad0c914a21bf68dc64e649a358739eff111e3809e48d882de0980b96537472e90b922ed2bb17a340e92000f0fedd17b4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b8210e2afd5f13522dd367baf6724a0982ab0a98b548b1f2e6fc3af93d704a4e5929ed4e235f292ed666b6064beb5e1e463d715c8c14bfb47cf9b2687e321b1d"; + sha512 = "88657692e941513807522e7513f480915f2f40278ed3ba36855a03e47879eea2c17d48bb626543e71a19eebd7b554d797f522b499066e7a52f8a4363c8987a44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "96349751178a2cf264e1ec27c74ba725d2c3a9b54641bc4964e5d8237d3d6b6f98c116d44b883aad132ba7c4962c3c1b471fec08394e969dcff42598fdea6841"; + sha512 = "21cd90d9e5010ee858fd5b499b64cb1b0a695ea04c7551fff884e426895bf80e041244a5a27ca4e37a6a283b9058723b9b62ade273446a5ec9b0f5055c612a6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "61b270273fae12b485d93707d358e5a3d7a9198ad147e31c2fac2465f65c9d6a803326fb042ec0a6de2d46cfc61e505b09f6093a7f62e3dd69b8e44e017d7b26"; + sha512 = "23ad0e28b4d5bf1e83983e3b498d78019b78f821f17cb9c1e9b18a2f98b4c044ee25ec2de8ca43381366344010c81979c6f568ef9ccd70cf67bb933789b96179"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "52e497831de58f7abb221b4906f0fb64182a04a93e8d7ee83d42a1391f029e4873dbe977b4e8a405d0acff537d98504f659971075b9b76e33c09a46607a6106a"; + sha512 = "6914fe4888f878904eced34e13392dfef90b313c4b66fbcdbdd02070b62a8b12a397267012267551f8ea36e826912e26e5563d0f2d8c320589ad7c572786316f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "8212b67f9447128a4cb9ee0864c50d07fd3595de15d8e3c6bf4a8f3b19bd2288ea1f55b7fe003f75249db6de0a8aa4ad6962b2913657bbdfbbf282cbc14a77e0"; + sha512 = "453bd36930e6749afc97dc995565d72dcc8e1196d719b8ef3eba080796392297d698e439a2ffbe2c388dc78c7296baf40e2a02e539651f1c1b8bc62f9a294226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "61e8954d14b9b7f06919c23d60eba00213c57709a5013c4a9b3376f7823f5eec262ed891a24857fe5e5efcd0245bcfe474c3838f1463dfa38427c4335ce7f1e7"; + sha512 = "67570140e8087e721ca4951fc7f8845164f6d6a6ac2bf7cbb84c2cdfc522bc1c8578a11154207097893b3556b415ee2724403ea377a59d2bca53bf1cadb78895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a58c582cf0a9dd154ab53819197eb4c84fdacb2133e59b367df5111a5807c4ac63d1ca0b2567fa218a64f570b19dda9b70b13a2c15d2359cdf962f241d4ea275"; + sha512 = "949d494a971d4abb4a0a7f41d994758cae50ede8db4be8c240382ee2f33b21e383bf9fe9ee53a1f767960c5c01005285f899f4c575e734dccd2ab95f6fbcbe73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fdd4d7618fda5b950fcdfba0c47c27311881bdd62d1ba2028ba13adabb4beda99351c97a3ac0d3e7c1d9b9fdbe5e32bd04c4863f24e76144f6b21725a5d5d8d2"; + sha512 = "5987ac4a7b8ff18604de100f2dd5099d3f7b4217e1d921e3804a86b340686188761eee33240d8416aa6ec7cc538026039082953df34d2978d30992bd451c8e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2d6455843faa19b8fcd401a897eb03b76bcb5da784b6aa8598e88d1b3d44ffbccbcd01d9480fdfd61039197f8e6dba86353e400cfa9537568d81debd31428c50"; + sha512 = "438344b07b4f788496de76cf361db5b8a8d43b71dbaabf025f05b24bb47f0fad17d93d683743a0a7673727339324d82196053e67eadccff901c5ad02b45b15bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6ea49a50bf8e22e6caffc95936cadf3e6373b131b10a5a96faffe786a9a9a4ca8737600cec76c071bab4a20f7c05003f25d3f573af6450a5c995e08e3b939acb"; + sha512 = "123f20b8b235009474b3b7e3d57619131a4f607dbd600ae23bb52a8f726c458a23356fc12929fb0557da96c9eca489ac8b87909b43d2f0bf4024b8a306e99148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7f5bfb9d4c7debcfb8a19c59f464a47af4f729d780b3940420326303d129f93363a6b9d606285d6d1e87b51d538b8573911356be2318b72e9544adaa0c64cc83"; + sha512 = "afcc7cf79d5d8f023699d6a9d2c35897329a9372f5161f28188b75126f5b843d105e50bc49968a7ec8acdb290ecfab5ab06731d7b002d2721c0161cd46dcd01b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f98fa51506a9c5f8da4ce090778eb675ab922970a94f7fcc93b2f0af20b08889238188f8def9f001ca757b68cc321f7f023023b53c2d2c1f87dc645d9a9489a8"; + sha512 = "3b505e26ba7fb53c27aee55dd47771abe2e16ddce33413cf61d21d757be2f9744b7e406294ed86a95f2ed645c73efca2714e405a6b0947e08e19f3c667f886ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "54a2ec07da6259d6fcbf38a9bda6636fda9a15dad5188c3a8cf5a80bd813ce5c399d44daba0ba49281a7d503ee38542753560ca322324d86bc528c509b34d3c8"; + sha512 = "7444d0cd5ab0f667a46f6e6ce685102a4a3940d422c671bcbe4c454333714dd17e2b6784cd3d865ff13fe9b5fd63c6bdff79a17188038baa2b558d0764f31d10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "944dabeff41606eff6a49ff87142aab2934cbc658015a8ef05a8416252b8c8c64fd446f5f88516dbea67e269a6514ba7a59038b39b2bb21b909f5342e90b9fd6"; + sha512 = "675f81a6a7266855ff6ebb8effa0646b3bf48da50246bc4aafcaf35aab52be107df98767e51f3aafdee7ad7b866f7304c859aabf9039ce08ab601df8f3aaebf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "22bf40ed5c37609dce3ed3ea4e88ab8bbbea31a2610697ca72446c201f874c7a4fde8c3f0f859e492869a8a3421e917d6eef37f71cba58658c584f30c683e9b8"; + sha512 = "296f7a8ebe0e685e854d5f2674af347c2c3dbe0735bc763cbb1b12ed7862cc44592795b0cd1b01030e36b3c933e3e5cdd6288e77283633655c60182f1b91b0d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b746405cd39c261ca7e18193fb0714520c59f58a595be513660d609ed3373b36f07444283d8ed1a6106ef0a48de45ba61fd5c8a1798d45088ac886917e883772"; + sha512 = "514409c1bebc87ac575edc28d461d165e64779e95e54a27f83b0f9194d86d7c3473b29e34c2666e4f9ee04a0365e963c0ad54dd0d34b979b0d444c2059d3681e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "eabc8a30e4683de833a73a49e2d3d6a25d92ca6fbddbab672f13a6ed5094edacda15ee85a1a8582a05b6e3382ad8a2063a6b1f9acd02771711d43a5e43da8f4d"; + sha512 = "d53d3b7fd5cfa7c96ddc528ae531d111998c95e8ddf0fb44a5e3e55f3223492680acf87590d1fb4d26278604eda2ed48b8681cd62a398a779ff76429df7bdb5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "938991eaea630be2ad5818f97a9f43808ce7978c07177b5eaf10bfc74d495c1bbd5d66af79c25ad66ecf6b1d35acd94b04b70c5a8efbce5e26d53e45f3db0c7b"; + sha512 = "8a9fb7e5070ee73dc8d87935cf0d328616ddeb67f1f3955678cbcec6e240ec375117daca8a574f4379677959e7acd30efb65114e4941ffd204c3cfdbb848c570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ae6eeef2328c92c26b6eb9c2a600162d99c58fa04bfd526f8b0d3d1b147a9f19b7976342e17415d8cca2df65ef5335c5da0a68378e900c09c941fb18a92ea8ff"; + sha512 = "754254377c41865d6a5aa8f2e338353987885a6e54a7738c36b1566249a0b3becce3bcca9419905be64d935d97a90b3108f0020a313621c64cfdc568f663cc2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "af171a1f641c50b7f50794d6a1ea0b2d9d2230724c08774ab594b1c9d02ba0660e7f349de65dc4638191b855183b9a0a45fba1ecab5e87199522d6c36103e6f6"; + sha512 = "79cb8cb3f8daacd1015a2d23b8cab568f9622396a983cbf1a3c6e231929d8bcc40ba84ba2787c9b60a1c9bdbb0729e2637ff3bfc87501bb0e156ff29c3a98148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7a2a61748c0f79f6e65da80e013dc9cc4550253298e6abf01b431db16a3373ba4fbdabba25dec3c994435b6e6330aac58067ed95003695bfb7e49fe6af70b094"; + sha512 = "262a471319ecd41cfced36e353dd32f22c1aa79224198d203ed029d21f858bf283db75b33f3af7abc48cf3a995d7ed90d75701d70e371c8a937d6259ef50e7ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d06298f697163b89f7195393a660534080595b6630b8e2b5c67cb311001bdde4b69cf5a2bcecae4ca90a0abf275736842a33f6d57dbe021458599f0a531b5a13"; + sha512 = "59b93c56ebe8022ac3ff72acec539639cf290c0339e825a27e6fe0a6e85ae02c6c4ac62ac056ade775eddf0462131e2c7cff99639c1626f2a6d979d2d340ed6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b9ac847949d35872b0d56c41d58c26768afc1c6157d87a0e0059c4b4928e7eaeb6aa7564754b739dc757e049ed485a2c94085e8881515ebf18f250cd5c9e8ccd"; + sha512 = "7578bf3f0d9428345d0d5f16c1cf6557d6fc0962382df1359e9a2c3b94feb3ef279266635da41cca1a90660640b0d5c0d20a415130a860aade0ab554b6fc8415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "88cd61ed1bb4eb1d871d1844e83acbc932685e10993ed64e84c63fea81fd1d5f79937ca9fff154a699334a4f10942415b6cbb90312d5be508d482de064cdbba6"; + sha512 = "610f14f6e3ddc8b2f732e40e79ad07e40e5cedc2e92dcab6b39b3b3895970d9c82749f4af90f034b7431191faef6bb0f61e230a3374efae7c5715e096048878f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6359356fe1c2eabb3757c6906d925b80a7a069e0dcd7a56b958f614879b942a295bb6345a84365fa21a2cd527bea48d6efe01a603d98571deb6141ae35ff59e6"; + sha512 = "cfddb67634a2e05d41c3595f62b88e53c05f5b07973ed16128f7620cabc9422a8f028458118e404148a2f5187fd0209910be1d5fede135caea25a2ee076811bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7b57efa8b87f662a56cd202102d220fe8f5a72d2e9838528384c4e40206df75e57a26df35544f595460daf471a565c5bfc7071f9a816b11cfeb48f84437d40a6"; + sha512 = "5bb458faf0495b24600395250f8800587f6cff04d46437fdfef4dfd1fc240c7c9bcc49f6679258bb761f587b2c8115f0bbb6ef5c0b11421b79cf8d534e70c8ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fbdfe0a1f4ee6831a1d09d9349ddd43d6d540877c1272484429a7ac735a9b326ca5d99fc45a305fa1a36293a4e3eba3d03c4451b0f68a011e58c055d7e89ccee"; + sha512 = "0e509780c72eb1d6154e3b3d804ca434be340f6fe8e706b87e2fd9e00aff3b82002a8b1a2f5d6994da2b566f5678f1b489e3b116af95776b323da7f5f674ea17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "8106d80e99497435ffb5a58c0f4002fc1286e223688ebd7c9e406d4181c621abd831819339a6ce65c7a3ebec7a7e8963bf711d7fadc5b94653d83e1fdd13ea75"; + sha512 = "2a036f00f40e98a5dade0d380e416f869d0c42f4004878dd1a51e99386a118cd88ad603915b741e91e16a7bedc0db9029d8627037e17f275c74736cdd69375f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "165c134b673a2a9cfb38db68e5020a284bb087b21ae37a70ad8ab25808c1fd68c0f6385a433d4e16bf34cf7fb07510b36edd0563078a644d6c0a44633946be23"; + sha512 = "f289ad816331cebb6634def4c7faf5ff6d1c6000cf5677502027a7823c34becca72a0cec5bbb13d5c4c16ca22fd87da941d0569b47369e1cf5ce00cbad326693"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c0450269268b5e89de324c3e5fc6a864461a4b29d1fb8646846f8ebd87f661be2a340963a5ae8282cddcca5f05a3ca14f2b155eba99f4357983b5977eac808e7"; + sha512 = "6084544df0c3f45562a3bd380386217c4a4a6cd4968159006e3c24ece9cf6c178731c4e8fb0466ddf484776ec533e838e24018ed3d41bc5f54d9757081a963cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6cd6dc6545e481c28f9d63e5bf97e8dbeb275821c829c729c2dacae5e16d913424bff0e2c6b3cd65a566708f6b047a6eda29793acdf45de295911596bfa49ef9"; + sha512 = "1d31ffd4e7e9cbf728d552cc1cf6692037f62884cd396ce5ff3c96f89096d44a9fd789ecffef1516cdc0d66413a30ce67daffaff224854dfab2e9a3fa37e6150"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "03865af4dd626a188682ce32b4e817af44cb3059bc8ed7620853234a15972556fa57a2b6c6046ae40cc9c714dc09e54c2111adacd2a0a315d347e4322233fd3a"; + sha512 = "0f97a3a2807b1087e1569e0f31cd80ef2995b89c69743c3441ad974a5786b789793c94828935027cd45f52b738a28dfdf86b1e95c5026d34de2e1f20107bf784"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9a774f343442ee10b673cc9894fb8e4adb0a02d824dce5bfa8b3c699a1deb17dfc2ebff86126f9e0743075091c37ad170ed49f0c7818b602373f9fff20240b58"; + sha512 = "91f5dd7f7c4ac97bde1235e9bf9594623f531a5558ed06d5ba61fe8cd584d80e6b01fdb070fe53b7c702893b2689fcdfedabd28c440ff865decbe4119bf4ef06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6413054a66903741f6a50c8977dc61866067ea54f915f1d7eaf972dd26cba592945bda62348b3cb397d7e045cc7af36581e374deca2812a5112f0bcbd7703b43"; + sha512 = "763e900df5673e5f88fd326ff6ced28502ebdf09001fa06fa37912317bab9d0ab6c737233baf8d644de286766a7d4dfe740242ab70fe938c0c3bbcaa1aa1b314"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "98c9403b1567d02c1571aed5d6b1cdae7bdddc01ef16a2df44fb8efcb728b7c16dfa27231795fcb9ac3b1cdedbb66fcdda70a8971ed08caa89f8a0bb11dea5e9"; + sha512 = "1aeb0dff591ad21dd506da2cc89d7082044b762e7c987e364631cb6f28bb07618d51d138d9d7a936f244841cc4f5208dfb9bf8dcd1ee0d839fca5e6e58823c1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ac721c8b4e104285cb8eb025916da8ba1c7c0481eeaba2b60e35ceed7d26afa7eea9a83168608daff25c025f2f06208cf36c56a4ece68b66b2baacefdb8b5d9f"; + sha512 = "643a666005cfcb726a18dcd81c8af6d3fefb77861c2a4db884227044c39d907659f1b2abe640950c4cf31ff3552d4d12a52fd9e7527637a68543aecd93a61763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "720d6a5c0bfeab99f4360e9e64c4bcfc49c987f1dd040eeb1ff580f1f4b1c4a29fb7a3c88a369574fd966237f817959baf9db7117bd515cd6458e13155128df1"; + sha512 = "f17fff22865d6e64ba77069012072d24ab79abdf783652337a7dae7d9a901569f00f9d3cd20c2e3a268fc81188b478b9036229dfa248bd5b1ddd7a0f9c7b7201"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e06fd7a663dd341f8cc9f60de2edca6af622bbcfffb9b1d9e3b75c07fb6b27f3b0ca9eeccb6173a91f52ee8241f167c4a399160e20377b3738e4cf4b2dfb84b7"; + sha512 = "3e105652654c1691bdbf8ab51f20f4ebb9b62d6a6d09f0f6527079bbc1f5832f4170800e6b200c00dd43f62dde531e7e8bd6bebd0ce27fd058552672d423a967"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d7738a3039202e9cd3b30652b4c069f9b73f88e5db1429e26324ef30f87af88f79452cb5dfa687bb988b513359ae65d7319c8a3dd59207af85b618d51519f335"; + sha512 = "5062a90cc4712f30c9dc428d8ccbfe3bc1d0a50de3e84b5c475fbfbabad09394219fcb03db9313d7773518e24e5eb5b41dc16723ee235a87677dd07bdb1e975b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cd0c2ea6af241de3d382345fd783b75e15499e0d666df99bb6ec06ae9e9da233e5ebbd181bec6a3b044682456dd78f5405177e4a781160b9a3b110008782f32c"; + sha512 = "5b457059285c31381a03b9e0285874989cbf93cb264a74ee875ec9e120027d5bd921a666a95275c56631ebbe3f435764890852ba25d199b0c8c8258d5b8a5807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "94aff48579b1fff63decdc6640b853907abc508da23e3d7ec13ea01c2fae496e870261fc5616821bb0c2dd5279ceb1be054691f501dd183ee0ea9aae7d24d5b1"; + sha512 = "4f8ec721ae19da2466a31e363ecdd9743f90a597d0bcfba12c12120207545ed03685a552515c9fc1deb27e79dac41345b8c87efc025dddef6c0347d21c2809a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "189f8bc5db155eb0f50d0b60d321ca0dd67e15cd30749d830a21397df0b314608393c08daf70712a6077ea5ac663d5e745a836483750fd26ec1e92dda265c061"; + sha512 = "4953e879c353d7a9a71e517454ffdd793546d5c863676ffae3a1bc725000b5f69f0f74fdb9ba979fc54d809d576918e6def88ec1b1b7a81cdb6d1dffab624093"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f6f1d2ac3270e639bea54eb04c8f292d17ec2c4e70848a4104219800af1a17f78658eebc39d3c244e351d0511d681ab66a61358523d7edf93d4b317993cdb10c"; + sha512 = "ce930f05f2a6f3716ff54a71af907cfafb1398d4f86999e8b161771197c60260abf82d0431093ecd8894d2de2aabc317ee5b6f348d8c05f3a823ac706bce0b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "747f109672e47a6a344a09c32b5e2694de1ba125dd29d583a5f6a31859247e659b9ea204af31337dd5a635c0d1d7662efcf37d0d708e0936b59dfe3c975e9990"; + sha512 = "1862101ca5ae8d8e2543f55e6b283dc8f935eacf38dece8c0e1b62a0cf83342065b467ab001a9709dc25f305294506f84a1036ce618bd7d47ed8d60f89b838db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5f6ad0ccd20bcd09783de5307a1ac2b149cf63ab922162149d8c0632698de86b78170e378dca7103374ec356bbb03b373bf573512e6b27b95550ed95178dc1f7"; + sha512 = "511b7f3dba5083414d62090ff1202599d8b6d4623df06d8749c0bae2c18249b3370af71eacb87b77711982a196fac380f982c55156b2bc589572796607128763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "01c8f958ff9c5e9e65459b20c7a42208bc985246445d6ed310f80fc0dae2c8bb5684e118baf1c3dc2947dfd66ca148537d94ae726e3b3d8cc01c4990e42e2f96"; + sha512 = "372420a6a308e94a438b9b220a268264f3dbb0c45ebf5053fb0826948fb6f5e0598567f2e237a4c753431a135274a9867fb8d092f1abc3b90900039fa2be5322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1fcece2f00f98e769fd7023b5cd80eeac27b8f987291bf4041dfd90538482e7184137471cff73aaaff1c307813efa26cea3f7e77082ebe08d11769b35cd21d12"; + sha512 = "cab258cbae1aff73f16f4be2217274f0be2e82bd587ffa45846308b90d0bac043953828706fb3ad33e33d06ca4eba6d0fb4d96caa684dd18f9fc96a33e1b8445"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "557646065e7370bfe43fffc9a57eec3da2ec8176e2371e948f70c92e54e3cd7d194022dab508c0b384545c121587e41ef19bda7ec8b1827118adf12aa82c653f"; + sha512 = "dad1630c0fea645199cf5577d3928cdb06bea5bd718d4da4ab27b194aa5068107b0bcf433ac530c53050137a42b700834fc30a778834885976c090a9a6817840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d7f95cefdf312d4c3ec157208266c9eba7e394cc1deb83e4cb9baa98f99292f6d4996b4c6f663a303556769a8c6b81fa6ee127f84464fbabc8fa0f55763dced8"; + sha512 = "7b903192af9e954b8b595e6f7eb7b176fa7fa91dad3891f364c676e0627a5eb7426b1f676c522943eda22565d459d049a5e10b2584e65b1e1fdf7bc27a7c2aa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9c9d80fe8157f7f844c81a99439d9e35ccd51c8cb9dd4e8c1bc16591aa2e34654440e1b926f3737790c2fe4fa1ef9720180393260adf1dc1b6d22a805ed8edf8"; + sha512 = "5ddba062f7ed0de1b9b7782ad34acc32762ec5b4a33cbb3805eda39ac667d239ad23bf81777b8ea0d9dbf82d688c9a2fb273c635b4d44cd7afbe887a16c34ee6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "21fc8ba0d1374fe0dbdba8a0f5ac940085f89886f0eb7ae28aae5e152ce7d68518172238042fd0287ec62127489ae3c9b750334d38676ecc7b60633187311fde"; + sha512 = "8f78278bd75240622edf86bcfef0563d51d671a7b7731195b698f3e6baf2e467c0864ddbafe38fa7728ff00c4ae059f2e60c1cf67a81772445639cfb75fddf04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b91dca298f68ef9f1a9ff17ecd58d7fd2f0d47193fb03781027be26ecc75d3391ff47dbd1d9b6796617df00b28ff8b2610858188cd03d87efcf704f2ad4cb0df"; + sha512 = "20081f6fd914bdfa14ddf0a7896986290f3e7f35d7c77c90448be53a0ae09c5697b37ff8b63a0138ae20327d110a1eda2bcb5a41ce1927e36eb222795fb492f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "ff2b2be81f48758bd52a70ec6da9cf2950fa595bd7d3a26a4929ae28a6c612aa6ca1c127318587fe4adc03257e259a1b68ea39b9b4741e7edea53c55ccb9036a"; + sha512 = "023b6a4cc9069ba73e0072c8e4ef8d782b4e8cbbd9ab4810c921998d6eb87f8d631fe8e62771f8c3e5b0da83f43aac8a7d569a8309603e75b984b4233dd7b652"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "980175a00523c0ba2b4c67999e5afcc59946b45bc58d6b813e25dd0a5f1678d23d329dc70611bdb55d9ad9debe2adf0a5fb867a9d83d43ab5934ad2bcc132da0"; + sha512 = "5d9774938c64271ccd14a498151436feb8ac3a2b46f8f093c7c11bc84b7f49ec559acd620ed0c4e1d76b6f466f8be5d19d64af4d84606c12271814cca88801fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9648cb55f355c68852430f9a7c5486b0fb5be65c7f258b81906d19119f437e033121f46b884d65f1f64c33f511c605d8a42737a26ff7089306ed6bde4fd5ab4d"; + sha512 = "73aecd84a201e7047ebddc71695cfbddcff8d7866f1ed1299217bfb81c49865ce4140deaf0d3d0ca34f82bfeb1e3598059f299f163e816fc4f85bf0a1b8d93c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2fdc0572a32112310044936c9b81f7238172f9ef2c2e502813b82ac0f61fa96b9d1ec96d396c7baf79c27b44673a72bd9e484d6ab68087993ab44310a52d453d"; + sha512 = "0b0a0f8bcc7a96222ab09c113b537b2e56d1ae38f198c9a0efd0a7defe917aae30b64b81047b404e09953146ca78588e8184127d1ec86ed05c642a8f03b0478d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9b6b6ccaf74e4c3699605d43d51c02f7ccd3f4f28ed93e9b800fc0adcf662f08e554f081cc51e5706c73f308cc289976e5523d0424988b5ae3d5bb1ef6260503"; + sha512 = "2b41d980f54907cf4f84ac5159ecf3d0b4ee4d6ff0003d2d26cf8ef51befbb67410c99eb75bfdba3f8afbc64c1911011946cc8ad23ec7f514982d522857a8304"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d417c0efde71e18f8dc04f5cb8b61c6b4410579051cf3816b55a52f3165ede2921691ed67307999ba48d6b46ea2acfdf82d063ea349fd7131402155f50dec01e"; + sha512 = "9f07d1b5b54ccd5764aab35df797ef866cb6dfc705bb6db0337168eb0453d847d6068230ddd00368ef27f3f58300f8009c9848a9ad1dc3a459d90889e2f7c5aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d4da856a2b142d4a088a0a5b460eaa2466da9280890c62b178d1bcfc18e91e494d7be357915880a0369ecf578b00e087cdf47eb8591d605595e9cc2356cbd086"; + sha512 = "1a5c6b1abab116fb0cf3e98e50024070c894e64334a82a3cff7c3a755b72a0ff8992f3a4c631cbb5489e2c03b5cd5dc5918dad56d5818c6050eab32335bf347b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6a43e2db9823f0ca86628b77df193183182208c27a7c0347fb0cb324b615bae58ca9319038c4ac642428f4ab0f1bea557ca46f313256d849cb10e8da87942247"; + sha512 = "0b16ba221c9c681e44bcb8ab6ebcbc0698dc8ecdcf31d14b9b4818afd396fa8608b389cedd372d15dfd833e4e7e028dadc7087af21c4c2d423fd97e1d2c0030f"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 7a542a71d1..f793491afe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.52-1"; + version = "3.0.1874.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0bq9ggk75xzka2nbrnc7vghq8s7jjy9nbfmyrf51kf0nni1zg1fp"; + sha256 = "03667f8rlk8shxq6ghjg4q9hqhsaw4gwpqnjpyili49qczd5423w"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 18a9bc0f42..39ad9ef1d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "calls"; rev = "v${version}"; - sha256 = "0715cap3w8gppxlfaynhiqvc2ss512xgykjcpqq8f5syz2776skh"; + sha256 = "1wqkczl1fn4d2py00fsb6kh05avmc7c49gi49j3592fqsvi87j18"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index 6aaf67bd1d..4aa15b218d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "cni-plugins"; @@ -36,6 +36,8 @@ buildGoModule rec { "plugins/meta/tuning" ]; + passthru.tests.podman = nixosTests.podman; + meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; homepage = "https://github.com/containernetworking/plugins"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 9d3809c171..2e4f68d6bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd"; + sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7"; }; vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; @@ -28,4 +28,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 992b6c4dc5..0972135680 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "0i7sg3iwxb07gjxcz6chpdcx3fqykzldmf7s1c9m02hkps910ca8"; + sha256 = "0h89lgp3n7nd7dy8nq4bfxg938imdjsvs1k6yg8j37vgdmi24sa6"; }; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 32b8b44986..c6ae0629d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "1.6.0"; + version = "1.7.0"; k3sVersion = "1.17.3-k3s1"; goPackagePath = "github.com/rancher/k3d"; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "0qjwqqynvgzainq66fpzczgynwk3hv7wzgfy5271fc6mj2k0zz5x"; + sha256 = "0aij2l7zmg4cxbw7pwf7ddc64di25hpjvbmp1madhz9q28rwfa9w"; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index 4486f47396..c739be7632 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,19 +2,21 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.12.0"; + version = "0.12.4"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh"; + sha256 = "1abm63fb40zky5i97wm6h8ifmdf6i71ws9y7217hv2rnja37f4zd"; }; vendorSha256 = null; subPackages = [ "cmd/kubeseal" ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + meta = with lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; homepage = "https://github.com/bitnami-labs/sealed-secrets"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index ddde1e50ed..a48016d506 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "qbec"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d"; + sha256 = "1lf9srkmi7r6p3him19akzag13hj8arwlkm9mdy8a8fg1ascqbm4"; }; vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index ec9f02fe9e..080bc83254 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -118,13 +118,13 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.25"; - sha256 = "0xq4327386x6isw82d4xyq70pw7xxlh4sgmqas0b2pvyz85jxdch"; + version = "0.12.26"; + sha256 = "1f0n2zdk1jyqcmchsprqfkiivmsmdlpsf5b7x5f1dmvms9jw3268"; patches = [ ./provider-path.patch (fetchpatch { name = "fix-mac-mojave-crashes.patch"; - url = "https://github.com/hashicorp/terraform/pull/24562.patch"; + url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch"; sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; }) ]; passthru = { inherit plugins; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 5ee80250dd..b95d272e65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.6.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0nlvhcvd3bbvd3dapqix7h29pchbd9gv5n3hmrig9yi98yv8q53r"; + sha256 = "1dx7gcmrjyi115lf6d36i129zmxfb16z7wy4ff8z9m65paci24mw"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 20ddc6c93d..65fb6ffa36 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.30"; + version = "3.1.57"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "453992c6bf8a7b0f83abeddd0e8f989dc10fd59e407e3803b886072cff2576a7"; + sha256 = "661663726f75b12ba2e67db1276a9abf586b41db1ff313488ca35a439ec5d721"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix index 92415148ed..49f7bbfd81 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: +{stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}: stdenv.mkDerivation rec { - version = "2.9.11.1"; + version = "2.9.16"; pname = "snort"; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; - sha256 = "1ka67zrrhs32c729v4h76mvv2723mij0adxx0iaza2d1qpm3lswz"; + sha256 = "1mxspk0060f62xp631w589b9ryb21qygn020az3dw2fsy7nxi24n"; }; - buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; + buildInputs = [ makeWrapper pkgconfig luajit openssl libpcap pcre libdnet daq zlib flex bison ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index 5418b67163..cfc5f090cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -2,13 +2,13 @@ let pname = "deltachat-electron"; - version = "1.2.0"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "Cyb34bfQEdwOA6XYZO+1Ri/2e/PRat15aUMn7IElmUI="; + sha256 = "sha256-Mk4OzKcZceRv2IEzf/72VBWEq2RWi6BVzqjfEB5D1/c="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix new file mode 100644 index 0000000000..a82e39647d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "go-neb"; + version = "unstable-2020-04-09"; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "go-neb"; + rev = "1e297c50ad2938e511a3c86f4b190fd3fc3559d6"; + sha256 = "1azwy4s4kmypps1fjbz76flpi1b7sjzjj4qwx94cry0hn3qfnrc6"; + }; + + subPackages = [ "." ]; + + patches = [ ./go-mod.patch ]; + + vendorSha256 = "1k3980yf6zl00dkd1djwhm2f9nnffzrsbs3kq3alpw2gm0aln739"; + + meta = with lib; { + description = "Extensible matrix bot written in Go"; + homepage = "https://github.com/matrix-org/go-neb"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa maralorn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/go-mod.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/go-mod.patch new file mode 100644 index 0000000000..1c725652d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/go-mod.patch @@ -0,0 +1,50 @@ +diff --git a/go.mod b/go.mod +index 8ed4e68..83526e7 100644 +--- a/go.mod ++++ b/go.mod +@@ -4,24 +4,15 @@ go 1.14 + + require ( + github.com/PuerkitoBio/goquery v1.5.1 // indirect +- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect +- github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect + github.com/andygrunwald/go-jira v1.11.0 + github.com/beorn7/perks v1.0.1 // indirect +- github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/dghubble/oauth1 v0.6.0 + github.com/die-net/lrucache v0.0.0-20190707192454-883874fe3947 +- github.com/go-kit/kit v0.9.0 // indirect +- github.com/go-logfmt/logfmt v0.4.0 // indirect +- github.com/go-stack/stack v1.8.0 // indirect +- github.com/gogo/protobuf v1.1.1 // indirect + github.com/golang/protobuf v1.3.2 // indirect + github.com/google/go-cmp v0.4.0 // indirect + github.com/google/go-github v2.0.1-0.20160719063544-b5e5babef39c+incompatible + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 + github.com/jaytaylor/html2text v0.0.0-20200220170450-61d9dc4d7195 +- github.com/json-iterator/go v1.1.9 // indirect +- github.com/julienschmidt/httprouter v1.2.0 // indirect + github.com/kr/pretty v0.1.0 // indirect + github.com/lib/pq v1.3.0 + github.com/matrix-org/dugong v0.0.0-20180820122854-51a565b5666b +@@ -32,9 +23,6 @@ require ( + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mmcdole/gofeed v1.0.0-beta2 + github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect +- github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect +- github.com/modern-go/reflect2 v1.0.1 // indirect +- github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 // indirect + github.com/olekukonko/tablewriter v0.0.4 // indirect + github.com/pkg/errors v0.8.1 // indirect + github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77 +@@ -47,10 +35,7 @@ require ( + github.com/stretchr/testify v1.4.0 // indirect + golang.org/x/net v0.0.0-20200301022130-244492dfa37a + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d +- golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect + golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 // indirect +- golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c // indirect +- gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + gopkg.in/yaml.v2 v2.2.8 + ) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index c7d8ce4b56..faf4e40693 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.5.1"; + version = "0.6.1"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "18jihvqlfk8lx97hxcr36zdkp2sffg2l8mkg5lflylwcgwy1dx0y"; + sha256 = "0hn3731jh6xwyjayzdf41skhpdx002qs7n5l7ffh4dplhnv9vbxx"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix index f7238419b5..485ceb2080 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -1,20 +1,20 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder -, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig }: +, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig, setuptools }: buildPythonApplication rec { pname = "poezio"; - version = "0.12.1"; + version = "0.13"; disabled = pythonOlder "3.4"; checkInputs = [ pytest ]; - propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi ]; + propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ]; nativeBuildInputs = [ pkgconfig ]; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04qnsr0l12i55k6xl4q4akx317gai9wv5f1wpkfkq01wp181i5ll"; + sha256 = "14ig7va0yf5wdhi8hk00f1wni8pj37agggdnvsicvcw2rz1cdw0x"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index e586276988..f451702501 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.1159"; + version = "1.4.1231"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "1k4ip2glkjsbb28gzffahi81kz90qkf213j89gsmcvbdjf4kp687"; + sha256 = "0m5p8is8nk3g0cbwiq73cff9nn2y09fcnh1pzc6rlqqhmz1acg4i"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 16c96a86a4..215aebf2b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -16,22 +16,31 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin $out/opt/RamboxPro $out/share/applications - asar e resources/app.asar $out/opt/RamboxPro/resources/app.asar.unpacked - ln -s ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/{bin,resources/dist/renderer/assets/images/app,share/applications,share/icons/hicolor/256x256/apps} + + asar e resources/app.asar $out/resources + + substituteInPlace "$out/resources/dist/electron/main.js" \ + --replace ",isHidden:" ",path:\"$out/bin/ramboxpro\",isHidden:" + + cp $desktopItem/share/applications/* $out/share/applications + cp $out/resources/dist/electron/imgs/256x256.png $out/share/icons/hicolor/256x256/apps/ramboxpro.png + cp $out/resources/dist/electron/imgs/256x256.png $out/resources/dist/renderer/assets/images/app/icon.png ''; postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \ - --add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \ + --add-flags "$out/resources --without-update" \ --prefix PATH : ${xdg_utils}/bin ''; desktopItem = makeDesktopItem { name = "rambox-pro"; exec = "ramboxpro"; + icon = "ramboxpro"; type = "Application"; desktopName = "Rambox Pro"; + categories = "Network;"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index d036050a47..959b99e68f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -1,15 +1,111 @@ { - "name": "riot-web", + "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.0", + "version": "1.6.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", + "repository": { + "type": "git", + "url": "https://github.com/vector-im/riot-desktop" + }, + "license": "Apache-2.0", + "files": [], + "scripts": { + "mkdirs": "mkdirp packages deploys", + "fetch": "yarn run mkdirs && node scripts/fetch-package.js", + "start": "electron .", + "lint": "eslint src/ scripts/ hak/", + "build:native": "yarn run hak", + "build32": "electron-builder --ia32", + "build64": "electron-builder --x64", + "build": "electron-builder", + "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild", + "docker:build:native": "scripts/in-docker.sh yarn run hak", + "docker:build": "scripts/in-docker.sh yarn run build", + "docker:install": "scripts/in-docker.sh yarn install", + "debrepo": "scripts/mkrepo.sh", + "clean": "rimraf webapp.asar dist packages deploys", + "hak": "node scripts/hak/index.js" + }, "dependencies": { "auto-launch": "^5.0.1", "electron-store": "^2.0.0", "electron-window-state": "^4.1.0", - "minimist": "^1.2.0", + "minimist": "^1.2.3", "png-to-ico": "^1.0.2" + }, + "devDependencies": { + "asar": "^2.0.1", + "electron-builder": "^22.3.2", + "electron-builder-squirrel-windows": "^22.3.2", + "electron-devtools-installer": "^2.2.4", + "electron-notarize": "^0.2.0", + "eslint": "^5.8.0", + "eslint-config-google": "^0.7.1", + "eslint-plugin-babel": "^4.1.2", + "find-npm-prefix": "^1.0.2", + "fs-extra": "^8.1.0", + "glob": "^7.1.6", + "matrix-js-sdk": "6.1.0", + "mkdirp": "^1.0.3", + "needle": "^2.3.2", + "node-pre-gyp": "^0.14.0", + "npm": "^6.13.7", + "rimraf": "^3.0.2", + "semver": "^7.1.3", + "tar": "^6.0.1" + }, + "hakDependencies": { + "matrix-seshat": "^1.3.3" + }, + "build": { + "appId": "im.riot.app", + "electronVersion": "8.0.3", + "files": [ + "package.json", + { + "from": ".hak/hakModules", + "to": "node_modules" + }, + "src/**" + ], + "extraResources": [ + { + "from": "res/img", + "to": "img" + }, + "webapp.asar" + ], + "linux": { + "target": "deb", + "category": "Network;InstantMessaging;Chat", + "maintainer": "support@riot.im", + "desktop": { + "StartupWMClass": "riot" + } + }, + "mac": { + "category": "public.app-category.social-networking", + "darkModeSupport": true + }, + "win": { + "target": { + "target": "squirrel" + }, + "sign": "scripts/electron_winSign" + }, + "directories": { + "output": "dist" + }, + "afterSign": "scripts/electron_afterSign", + "protocols": [ + { + "name": "riot", + "schemes": [ + "riot" + ] + } + ] } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index 0db687dff0..4aa56181c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -2,19 +2,315 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_types_node___node_9.6.45.tgz"; + name = "7zip_bin___7zip_bin_4.0.2.tgz"; path = fetchurl { - name = "_types_node___node_9.6.45.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.45.tgz"; - sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"; + name = "7zip_bin___7zip_bin_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz"; + sha1 = "6abbdc22f33cab742053777a26db2e25ca527179"; }; } { - name = "ajv___ajv_6.10.0.tgz"; + name = "7zip_bin___7zip_bin_5.0.3.tgz"; path = fetchurl { - name = "ajv___ajv_6.10.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz"; - sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1"; + name = "7zip_bin___7zip_bin_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz"; + sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f"; + }; + } + { + name = "7zip___7zip_0.0.6.tgz"; + path = fetchurl { + name = "7zip___7zip_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz"; + sha1 = "9cafb171af82329490353b4816f03347aa150a30"; + }; + } + { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + }; + } + { + name = "_babel_highlight___highlight_7.5.0.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; + sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + }; + } + { + name = "_babel_runtime___runtime_7.9.2.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz"; + sha1 = "d90df0583a3a252f09aaa619665367bae518db06"; + }; + } + { + name = "_develar_schema_utils___schema_utils_2.1.0.tgz"; + path = fetchurl { + name = "_develar_schema_utils___schema_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz"; + sha1 = "eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17"; + }; + } + { + name = "_iarna_cli___cli_1.2.0.tgz"; + path = fetchurl { + name = "_iarna_cli___cli_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@iarna/cli/-/cli-1.2.0.tgz"; + sha1 = "0f7af5e851afe895104583c4ca07377a8094d641"; + }; + } + { + name = "_sindresorhus_is___is_0.14.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; + sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + }; + } + { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + path = fetchurl { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + }; + } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + }; + } + { + name = "_types_debug___debug_4.1.5.tgz"; + path = fetchurl { + name = "_types_debug___debug_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; + sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; + }; + } + { + name = "_types_fs_extra___fs_extra_8.0.1.tgz"; + path = fetchurl { + name = "_types_fs_extra___fs_extra_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.1.tgz"; + sha1 = "a2378d6e7e8afea1564e44aafa2e207dadf77686"; + }; + } + { + name = "_types_node___node_13.7.1.tgz"; + path = fetchurl { + name = "_types_node___node_13.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz"; + sha1 = "238eb34a66431b71d2aaddeaa7db166f25971a0d"; + }; + } + { + name = "_types_node___node_9.6.55.tgz"; + path = fetchurl { + name = "_types_node___node_9.6.55.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.55.tgz"; + sha1 = "7cc1358c9c18e71f6c020e410962971863232cf5"; + }; + } + { + name = "JSONStream___JSONStream_1.3.5.tgz"; + path = fetchurl { + name = "JSONStream___JSONStream_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; + sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; + sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + }; + } + { + name = "acorn___acorn_6.4.0.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz"; + sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"; + }; + } + { + name = "agent_base___agent_base_4.3.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; + sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + }; + } + { + name = "agent_base___agent_base_4.2.1.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz"; + sha1 = "d89e5999f797875674c07d87f260fc41e83e8ca9"; + }; + } + { + name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz"; + sha1 = "a113924dd3fa24a0bc3b78108c450c2abee00f67"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + }; + } + { + name = "ajv___ajv_6.10.2.tgz"; + path = fetchurl { + name = "ajv___ajv_6.10.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; + sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + }; + } + { + name = "another_json___another_json_0.2.0.tgz"; + path = fetchurl { + name = "another_json___another_json_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz"; + sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; + }; + } + { + name = "ansi_align___ansi_align_2.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + } + { + name = "ansi_align___ansi_align_3.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz"; + sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb"; + }; + } + { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { + name = "ansicolors___ansicolors_0.3.2.tgz"; + path = fetchurl { + name = "ansicolors___ansicolors_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + } + { + name = "ansistyles___ansistyles_0.1.3.tgz"; + path = fetchurl { + name = "ansistyles___ansistyles_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz"; + sha1 = "5de60415bda071bb37127854c864f41b23254539"; + }; + } + { + name = "app_builder_bin___app_builder_bin_3.5.2.tgz"; + path = fetchurl { + name = "app_builder_bin___app_builder_bin_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.2.tgz"; + sha1 = "fba56e6e9ef76fcd37816738c5f9a0b3992d7183"; + }; + } + { + name = "app_builder_lib___app_builder_lib_22.3.2.tgz"; + path = fetchurl { + name = "app_builder_lib___app_builder_lib_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.2.tgz"; + sha1 = "d43e0bdff91d484c0bd07d7248043dbb2665b8ac"; + }; + } + { + name = "app_builder_lib___app_builder_lib_22.3.3.tgz"; + path = fetchurl { + name = "app_builder_lib___app_builder_lib_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.3.tgz"; + sha1 = "9a95a3c14f69fb6131834dd840fba561191c9998"; }; } { @@ -25,6 +321,78 @@ sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317"; }; } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "aproba___aproba_2.0.0.tgz"; + path = fetchurl { + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha1 = "52520b8ae5b569215b354efc0caa3fe1e45a8adc"; + }; + } + { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + path = fetchurl { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz"; + sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2"; + }; + } + { + name = "archiver___archiver_3.1.1.tgz"; + path = fetchurl { + name = "archiver___archiver_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-3.1.1.tgz"; + sha1 = "9db7819d4daf60aec10fe86b16cb9258ced66ea0"; + }; + } + { + name = "archy___archy_1.0.0.tgz"; + path = fetchurl { + name = "archy___archy_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "asap___asap_2.0.6.tgz"; + path = fetchurl { + name = "asap___asap_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + } + { + name = "asar___asar_2.0.1.tgz"; + path = fetchurl { + name = "asar___asar_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-2.0.1.tgz"; + sha1 = "8518a1c62c238109c15a5f742213e83a09b9fd38"; + }; + } { name = "asn1___asn1_0.2.4.tgz"; path = fetchurl { @@ -41,6 +409,30 @@ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; } + { + name = "astral_regex___astral_regex_1.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; + sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + }; + } + { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + path = fetchurl { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; + sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } { name = "asynckit___asynckit_0.4.0.tgz"; path = fetchurl { @@ -66,11 +458,35 @@ }; } { - name = "aws4___aws4_1.8.0.tgz"; + name = "aws4___aws4_1.9.0.tgz"; path = fetchurl { - name = "aws4___aws4_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; - sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + name = "aws4___aws4_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz"; + sha1 = "24390e6ad61386b0a747265754d2a17219de862c"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base_x___base_x_3.0.7.tgz"; + path = fetchurl { + name = "base_x___base_x_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/base-x/-/base-x-3.0.7.tgz"; + sha1 = "1c5a7fafe8f66b4114063e8da102799d4e7c408f"; + }; + } + { + name = "base64_js___base64_js_1.3.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; + sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; }; } { @@ -89,6 +505,38 @@ sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; }; } + { + name = "bin_links___bin_links_1.1.7.tgz"; + path = fetchurl { + name = "bin_links___bin_links_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.7.tgz"; + sha1 = "34b79ea9d0e575d7308afeff0c6b2fc24c793359"; + }; + } + { + name = "bl___bl_3.0.0.tgz"; + path = fetchurl { + name = "bl___bl_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz"; + sha1 = "3611ec00579fd18561754360b21e9f784500ff88"; + }; + } + { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + path = fetchurl { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; + sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } { name = "bmp_js___bmp_js_0.0.3.tgz"; path = fetchurl { @@ -97,6 +545,54 @@ sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; }; } + { + name = "boxen___boxen_1.3.0.tgz"; + path = fetchurl { + name = "boxen___boxen_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz"; + sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b"; + }; + } + { + name = "boxen___boxen_4.2.0.tgz"; + path = fetchurl { + name = "boxen___boxen_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz"; + sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "browser_request___browser_request_0.3.3.tgz"; + path = fetchurl { + name = "browser_request___browser_request_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }; + } + { + name = "bs58___bs58_4.0.1.tgz"; + path = fetchurl { + name = "bs58___bs58_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz"; + sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } { name = "buffer_equal___buffer_equal_0.0.1.tgz"; path = fetchurl { @@ -105,6 +601,126 @@ sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; }; } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "buffer___buffer_5.4.3.tgz"; + path = fetchurl { + name = "buffer___buffer_5.4.3.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz"; + sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115"; + }; + } + { + name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.0.tgz"; + sha1 = "b7007c30126da9a90e99932128d2922c8c178649"; + }; + } + { + name = "builder_util___builder_util_22.3.2.tgz"; + path = fetchurl { + name = "builder_util___builder_util_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.2.tgz"; + sha1 = "23c61aaf0f0006f994087b33a26e47cdaec7aa8d"; + }; + } + { + name = "builder_util___builder_util_22.3.3.tgz"; + path = fetchurl { + name = "builder_util___builder_util_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.3.tgz"; + sha1 = "62f0527ceaa1a2e4a60596a9b38ad1ffe3e20ae6"; + }; + } + { + name = "builtins___builtins_1.0.3.tgz"; + path = fetchurl { + name = "builtins___builtins_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + } + { + name = "byline___byline_5.0.0.tgz"; + path = fetchurl { + name = "byline___byline_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + } + { + name = "byte_size___byte_size_5.0.1.tgz"; + path = fetchurl { + name = "byte_size___byte_size_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/byte-size/-/byte-size-5.0.1.tgz"; + sha1 = "4b651039a5ecd96767e71a3d7ed380e48bed4191"; + }; + } + { + name = "cacache___cacache_12.0.3.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; + sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + }; + } + { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + }; + } + { + name = "call_limit___call_limit_1.1.1.tgz"; + path = fetchurl { + name = "call_limit___call_limit_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.1.tgz"; + sha1 = "ef15f2670db3f1992557e2d965abc459e6e358d4"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase___camelcase_4.1.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; + path = fetchurl { + name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha1 = "a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"; + }; + } { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { @@ -114,11 +730,267 @@ }; } { - name = "combined_stream___combined_stream_1.0.7.tgz"; + name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { - name = "combined_stream___combined_stream_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz"; - sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "chardet___chardet_0.7.0.tgz"; + path = fetchurl { + name = "chardet___chardet_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; + sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chownr___chownr_1.1.3.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz"; + sha1 = "42d837d5239688d55f303003a508230fa6727142"; + }; + } + { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + path = fetchurl { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + }; + } + { + name = "ci_info___ci_info_1.6.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz"; + sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "cidr_regex___cidr_regex_2.0.10.tgz"; + path = fetchurl { + name = "cidr_regex___cidr_regex_2.0.10.tgz"; + url = "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-2.0.10.tgz"; + sha1 = "af13878bd4ad704de77d6dc800799358b3afa70d"; + }; + } + { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + } + { + name = "cli_boxes___cli_boxes_2.2.0.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz"; + sha1 = "538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"; + }; + } + { + name = "cli_columns___cli_columns_3.1.2.tgz"; + path = fetchurl { + name = "cli_columns___cli_columns_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz"; + sha1 = "6732d972979efc2ae444a1f08e08fa139c96a18e"; + }; + } + { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + } + { + name = "cli_table3___cli_table3_0.5.1.tgz"; + path = fetchurl { + name = "cli_table3___cli_table3_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz"; + sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202"; + }; + } + { + name = "cli_width___cli_width_2.2.0.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + } + { + name = "cliui___cliui_3.2.0.tgz"; + path = fetchurl { + name = "cliui___cliui_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + } + { + name = "cliui___cliui_4.1.0.tgz"; + path = fetchurl { + name = "cliui___cliui_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; + sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + }; + } + { + name = "cliui___cliui_6.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; + sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + } + { + name = "clone___clone_1.0.4.tgz"; + path = fetchurl { + name = "clone___clone_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + } + { + name = "cmd_shim___cmd_shim_3.0.3.tgz"; + path = fetchurl { + name = "cmd_shim___cmd_shim_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz"; + sha1 = "2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb"; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + }; + } + { + name = "columnify___columnify_1.5.4.tgz"; + path = fetchurl { + name = "columnify___columnify_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz"; + sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "compress_commons___compress_commons_2.1.1.tgz"; + path = fetchurl { + name = "compress_commons___compress_commons_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-2.1.1.tgz"; + sha1 = "9410d9a534cf8435e3fbbb7c6ce48de2dc2f0610"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; }; } { @@ -129,6 +1001,54 @@ sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; }; } + { + name = "config_chain___config_chain_1.1.12.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.12.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz"; + sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa"; + }; + } + { + name = "configstore___configstore_3.1.2.tgz"; + path = fetchurl { + name = "configstore___configstore_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz"; + sha1 = "c6f25defaeef26df12dd33414b001fe81a543f8f"; + }; + } + { + name = "configstore___configstore_5.0.1.tgz"; + path = fetchurl { + name = "configstore___configstore_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; + sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + path = fetchurl { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + }; + } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -137,6 +1057,86 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } + { + name = "crc32_stream___crc32_stream_3.0.1.tgz"; + path = fetchurl { + name = "crc32_stream___crc32_stream_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz"; + sha1 = "cae6eeed003b0e44d739d279de5ae63b171b4e85"; + }; + } + { + name = "crc___crc_3.8.0.tgz"; + path = fetchurl { + name = "crc___crc_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; + sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + }; + } + { + name = "create_error_class___create_error_class_3.0.2.tgz"; + path = fetchurl { + name = "create_error_class___create_error_class_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + } + { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_unzip___cross_unzip_0.0.2.tgz"; + path = fetchurl { + name = "cross_unzip___cross_unzip_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz"; + sha1 = "5183bc47a09559befcf98cc4657964999359372f"; + }; + } + { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + } + { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + }; + } + { + name = "cuint___cuint_0.2.2.tgz"; + path = fetchurl { + name = "cuint___cuint_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz"; + sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; + }; + } + { + name = "cyclist___cyclist_1.0.1.tgz"; + path = fetchurl { + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + } { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -146,11 +1146,99 @@ }; } { - name = "deep_equal___deep_equal_1.0.1.tgz"; + name = "debug___debug_3.1.0.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } + { + name = "debug___debug_3.2.6.tgz"; + path = fetchurl { + name = "debug___debug_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; + sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "debuglog___debuglog_1.0.1.tgz"; + path = fetchurl { + name = "debuglog___debuglog_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz"; + sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + } + { + name = "deep_equal___deep_equal_1.1.1.tgz"; + path = fetchurl { + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "defaults___defaults_1.0.3.tgz"; + path = fetchurl { + name = "defaults___defaults_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + } + { + name = "defer_to_connect___defer_to_connect_1.1.1.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.1.tgz"; + sha1 = "88ae694b93f67b81815a2c8c769aef6574ac8f2f"; }; } { @@ -169,6 +1257,62 @@ sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "detect_indent___detect_indent_5.0.0.tgz"; + path = fetchurl { + name = "detect_indent___detect_indent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + } + { + name = "detect_newline___detect_newline_2.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + } + { + name = "dezalgo___dezalgo_1.0.3.tgz"; + path = fetchurl { + name = "dezalgo___dezalgo_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz"; + sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; + }; + } + { + name = "dmg_builder___dmg_builder_22.3.2.tgz"; + path = fetchurl { + name = "dmg_builder___dmg_builder_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.3.2.tgz"; + sha1 = "4c052f75d601e3358da1ff9d7d57738e1c01b157"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } { name = "dom_walk___dom_walk_0.1.1.tgz"; path = fetchurl { @@ -185,6 +1329,54 @@ sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; } + { + name = "dot_prop___dot_prop_5.2.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; + sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + }; + } + { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + path = fetchurl { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + }; + } + { + name = "dotenv___dotenv_5.0.1.tgz"; + path = fetchurl { + name = "dotenv___dotenv_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz"; + sha1 = "a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"; + }; + } + { + name = "dotenv___dotenv_8.2.0.tgz"; + path = fetchurl { + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + } + { + name = "duplexify___duplexify_3.7.1.tgz"; + path = fetchurl { + name = "duplexify___duplexify_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; + sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; + }; + } { name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; path = fetchurl { @@ -193,6 +1385,70 @@ sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; } + { + name = "editor___editor_1.0.0.tgz"; + path = fetchurl { + name = "editor___editor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + }; + } + { + name = "ejs___ejs_3.0.1.tgz"; + path = fetchurl { + name = "ejs___ejs_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.0.1.tgz"; + sha1 = "30c8f6ee9948502cc32e85c37a3f8b39b5a614a5"; + }; + } + { + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz"; + path = fetchurl { + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.3.3.tgz"; + sha1 = "0a417af35c83b067096bd3217b6b7bd75c6c48a9"; + }; + } + { + name = "electron_builder___electron_builder_22.3.2.tgz"; + path = fetchurl { + name = "electron_builder___electron_builder_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.3.2.tgz"; + sha1 = "902d150fc0670cb90213262e5e0aa3c4f299ffa4"; + }; + } + { + name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; + path = fetchurl { + name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.4.tgz"; + sha1 = "261a50337e37121d338b966f07922eb4939a8763"; + }; + } + { + name = "electron_notarize___electron_notarize_0.2.1.tgz"; + path = fetchurl { + name = "electron_notarize___electron_notarize_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.1.tgz"; + sha1 = "759e8006decae19134f82996ed910db26d9192cc"; + }; + } + { + name = "electron_publish___electron_publish_22.3.2.tgz"; + path = fetchurl { + name = "electron_publish___electron_publish_22.3.2.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.2.tgz"; + sha1 = "d2e60caf7a9643fe57e501c20acaf32c737b1c50"; + }; + } + { + name = "electron_publish___electron_publish_22.3.3.tgz"; + path = fetchurl { + name = "electron_publish___electron_publish_22.3.3.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.3.tgz"; + sha1 = "7d1e757a20ce0558fdc42900b6e3d773fdae9d9e"; + }; + } { name = "electron_store___electron_store_2.0.0.tgz"; path = fetchurl { @@ -209,6 +1465,38 @@ sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; }; } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "encoding___encoding_0.1.12.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.12.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } { name = "env_paths___env_paths_1.0.0.tgz"; path = fetchurl { @@ -218,19 +1506,51 @@ }; } { - name = "es_abstract___es_abstract_1.13.0.tgz"; + name = "env_paths___env_paths_2.2.0.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; - sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; + name = "env_paths___env_paths_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz"; + sha1 = "cdca557dc009152917d6166e2febe1f039685e43"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "err_code___err_code_1.1.2.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "err_code___err_code_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz"; + sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; + }; + } + { + name = "errno___errno_0.1.7.tgz"; + path = fetchurl { + name = "errno___errno_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; + sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es_abstract___es_abstract_1.16.3.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.16.3.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz"; + sha1 = "52490d978f96ff9f89ec15b5cf244304a5bca161"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { @@ -241,6 +1561,150 @@ sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; } + { + name = "es6_promise___es6_promise_4.2.8.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; + sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; + }; + } + { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + path = fetchurl { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + } + { + name = "escape_goat___escape_goat_2.1.1.tgz"; + path = fetchurl { + name = "escape_goat___escape_goat_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; + sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; + path = fetchurl { + name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz"; + sha1 = "5598f8498e9e078420f34b80495b8d959f651fb2"; + }; + } + { + name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; + path = fetchurl { + name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.2.tgz"; + sha1 = "79202a0e35757dd92780919b2336f1fa2fe53c1e"; + }; + } + { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; + }; + } + { + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + }; + } + { + name = "eslint___eslint_5.16.0.tgz"; + path = fetchurl { + name = "eslint___eslint_5.16.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz"; + sha1 = "a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"; + }; + } + { + name = "espree___espree_5.0.1.tgz"; + path = fetchurl { + name = "espree___espree_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; + sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.0.1.tgz"; + path = fetchurl { + name = "esquery___esquery_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; + sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + }; + } + { + name = "esrecurse___esrecurse_4.2.1.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; + sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "execa___execa_0.7.0.tgz"; + path = fetchurl { + name = "execa___execa_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } { name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { @@ -257,6 +1721,14 @@ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } + { + name = "external_editor___external_editor_3.1.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; + sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; + }; + } { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { @@ -289,6 +1761,38 @@ sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + path = fetchurl { + name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; + sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + }; + } + { + name = "figures___figures_2.0.0.tgz"; + path = fetchurl { + name = "figures___figures_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } { name = "file_type___file_type_3.9.0.tgz"; path = fetchurl { @@ -297,6 +1801,14 @@ sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; } + { + name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; + path = fetchurl { + name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz"; + sha1 = "8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"; + }; + } { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { @@ -306,11 +1818,43 @@ }; } { - name = "for_each___for_each_0.3.3.tgz"; + name = "find_up___find_up_3.0.0.tgz"; path = fetchurl { - name = "for_each___for_each_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; - sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.1.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; + sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + }; + } + { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + path = fetchurl { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; }; } { @@ -329,6 +1873,78 @@ sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; }; } + { + name = "from2___from2_1.3.0.tgz"; + path = fetchurl { + name = "from2___from2_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz"; + sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7"; + }; + } + { + name = "fs_minipass___fs_minipass_2.0.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz"; + sha1 = "a6415edab02fae4b9e9230bc87ee2e4472003cd1"; + }; + } + { + name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; + path = fetchurl { + name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; + url = "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; + sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; + }; + } + { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + path = fetchurl { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -337,6 +1953,78 @@ sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; }; } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "genfun___genfun_5.0.0.tgz"; + path = fetchurl { + name = "genfun___genfun_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz"; + sha1 = "9dd9710a06900a5c4a5bf57aca5da4e52fe76537"; + }; + } + { + name = "gentle_fs___gentle_fs_2.3.0.tgz"; + path = fetchurl { + name = "gentle_fs___gentle_fs_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.0.tgz"; + sha1 = "13538db5029400f98684be4894e8a7d8f0d1ea7f"; + }; + } + { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_stream___get_stream_3.0.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; + sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + }; + } { name = "getpass___getpass_0.1.7.tgz"; path = fetchurl { @@ -345,6 +2033,30 @@ sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "global_dirs___global_dirs_0.1.1.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + }; + } + { + name = "global_dirs___global_dirs_2.0.1.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz"; + sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201"; + }; + } { name = "global___global_4.3.2.tgz"; path = fetchurl { @@ -354,11 +2066,35 @@ }; } { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; + name = "globals___globals_11.12.0.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; - sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "got___got_6.7.1.tgz"; + path = fetchurl { + name = "got___got_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + } + { + name = "got___got_9.6.0.tgz"; + path = fetchurl { + name = "got___got_9.6.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; + sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; }; } { @@ -378,11 +2114,43 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_flag___has_flag_3.0.0.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.1.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "has_yarn___has_yarn_2.1.0.tgz"; + path = fetchurl { + name = "has_yarn___has_yarn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; + sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; }; } { @@ -393,6 +2161,46 @@ sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; }; } + { + name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; + sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + }; + } + { + name = "hosted_git_info___hosted_git_info_3.0.2.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.2.tgz"; + sha1 = "8b7e3bd114b59b51786f8bade0f39ddc80275a97"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.0.3.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha1 = "495704773277eeef6e43f9ab2c2c7d259dda25c5"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha1 = "e4821beef5b2142a2026bd73926fe537631c5405"; + }; + } { name = "http_signature___http_signature_1.2.0.tgz"; path = fetchurl { @@ -401,6 +2209,94 @@ sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; } + { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz"; + sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b"; + }; + } + { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + path = fetchurl { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "iconv_lite___iconv_lite_0.5.1.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz"; + sha1 = "b2425d3c7b18f7219f2ca663d103bddb91718d64"; + }; + } + { + name = "ieee754___ieee754_1.1.13.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; + sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + }; + } + { + name = "iferr___iferr_0.1.5.tgz"; + path = fetchurl { + name = "iferr___iferr_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + } + { + name = "iferr___iferr_1.0.2.tgz"; + path = fetchurl { + name = "iferr___iferr_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-1.0.2.tgz"; + sha1 = "e9fde49a9da06dc4a4194c6c9ed6d08305037a6d"; + }; + } + { + name = "ignore_walk___ignore_walk_3.0.3.tgz"; + path = fetchurl { + name = "ignore_walk___ignore_walk_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; + sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "import_fresh___import_fresh_3.2.1.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + }; + } + { + name = "import_lazy___import_lazy_2.1.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + } { name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { @@ -409,6 +2305,70 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "ini___ini_1.3.5.tgz"; + path = fetchurl { + name = "ini___ini_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; + sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + }; + } + { + name = "init_package_json___init_package_json_1.10.3.tgz"; + path = fetchurl { + name = "init_package_json___init_package_json_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz"; + sha1 = "45ffe2f610a8ca134f2bd1db5637b235070f6cbe"; + }; + } + { + name = "inquirer___inquirer_6.5.2.tgz"; + path = fetchurl { + name = "inquirer___inquirer_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; + sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + }; + } + { + name = "invert_kv___invert_kv_1.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + } + { + name = "invert_kv___invert_kv_2.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; + sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; + }; + } { name = "ip_regex___ip_regex_1.0.3.tgz"; path = fetchurl { @@ -417,6 +2377,38 @@ sha1 = "dc589076f659f419c222039a33316f1c7387effd"; }; } + { + name = "ip_regex___ip_regex_2.1.0.tgz"; + path = fetchurl { + name = "ip_regex___ip_regex_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "is_arguments___is_arguments_1.0.4.tgz"; + path = fetchurl { + name = "is_arguments___is_arguments_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; + sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } { name = "is_callable___is_callable_1.1.4.tgz"; path = fetchurl { @@ -425,6 +2417,30 @@ sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; }; } + { + name = "is_ci___is_ci_1.2.1.tgz"; + path = fetchurl { + name = "is_ci___is_ci_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz"; + sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + }; + } + { + name = "is_cidr___is_cidr_3.1.0.tgz"; + path = fetchurl { + name = "is_cidr___is_cidr_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-cidr/-/is-cidr-3.1.0.tgz"; + sha1 = "72e233d8e1c4cd1d3f11713fcce3eba7b0e3476f"; + }; + } { name = "is_date_object___is_date_object_1.0.1.tgz"; path = fetchurl { @@ -433,6 +2449,30 @@ sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } { name = "is_function___is_function_1.0.1.tgz"; path = fetchurl { @@ -441,6 +2481,38 @@ sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; }; } + { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + } + { + name = "is_installed_globally___is_installed_globally_0.3.1.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.1.tgz"; + sha1 = "679afef819347a72584617fd19497f010b8ed35f"; + }; + } + { + name = "is_npm___is_npm_1.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + } + { + name = "is_npm___is_npm_4.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz"; + sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d"; + }; + } { name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { @@ -449,6 +2521,46 @@ sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_inside___is_path_inside_1.0.1.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + }; + } + { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; + sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + }; + } + { + name = "is_promise___is_promise_2.1.0.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + } + { + name = "is_redirect___is_redirect_1.0.0.tgz"; + path = fetchurl { + name = "is_redirect___is_redirect_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + } { name = "is_regex___is_regex_1.0.4.tgz"; path = fetchurl { @@ -458,11 +2570,27 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha1 = "d778488bd0a4666a3be8a1482b9f2baafedea8b4"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -473,6 +2601,46 @@ sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; } + { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + path = fetchurl { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha1 = "d502d3382590ea3004893746754c89139973e232"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isbinaryfile___isbinaryfile_4.0.4.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.4.tgz"; + sha1 = "6803f81a8944201c642b6e17da041e24deb78712"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } { name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { @@ -497,6 +2665,22 @@ sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; }; } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.13.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + }; + } { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { @@ -505,6 +2689,22 @@ sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -521,6 +2721,14 @@ sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; path = fetchurl { @@ -529,6 +2737,14 @@ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; } + { + name = "json5___json5_2.1.1.tgz"; + path = fetchurl { + name = "json5___json5_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz"; + sha1 = "81b6cb04e9ba496f1c7005d07b4368a2638f90b6"; + }; + } { name = "jsonfile___jsonfile_2.4.0.tgz"; path = fetchurl { @@ -537,6 +2753,22 @@ sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsonparse___jsonparse_1.3.1.tgz"; + path = fetchurl { + name = "jsonparse___jsonparse_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + } { name = "jsprim___jsprim_1.4.1.tgz"; path = fetchurl { @@ -545,6 +2777,158 @@ sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; } + { + name = "keyv___keyv_3.1.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; + sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + }; + } + { + name = "latest_version___latest_version_3.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + } + { + name = "latest_version___latest_version_5.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; + sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + }; + } + { + name = "lazy_property___lazy_property_1.0.0.tgz"; + path = fetchurl { + name = "lazy_property___lazy_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz"; + sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; + }; + } + { + name = "lazy_val___lazy_val_1.0.4.tgz"; + path = fetchurl { + name = "lazy_val___lazy_val_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz"; + sha1 = "882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"; + }; + } + { + name = "lazystream___lazystream_1.0.0.tgz"; + path = fetchurl { + name = "lazystream___lazystream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + }; + } + { + name = "lcid___lcid_1.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + } + { + name = "lcid___lcid_2.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; + sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "libcipm___libcipm_4.0.7.tgz"; + path = fetchurl { + name = "libcipm___libcipm_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.7.tgz"; + sha1 = "76cd675c98bdaae64db88b782b01b804b6d02c8a"; + }; + } + { + name = "libnpm___libnpm_3.0.1.tgz"; + path = fetchurl { + name = "libnpm___libnpm_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/libnpm/-/libnpm-3.0.1.tgz"; + sha1 = "0be11b4c9dd4d1ffd7d95c786e92e55d65be77a2"; + }; + } + { + name = "libnpmaccess___libnpmaccess_3.0.2.tgz"; + path = fetchurl { + name = "libnpmaccess___libnpmaccess_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.2.tgz"; + sha1 = "8b2d72345ba3bef90d3b4f694edd5c0417f58923"; + }; + } + { + name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; + path = fetchurl { + name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; + sha1 = "c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"; + }; + } + { + name = "libnpmhook___libnpmhook_5.0.3.tgz"; + path = fetchurl { + name = "libnpmhook___libnpmhook_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-5.0.3.tgz"; + sha1 = "4020c0f5edbf08ebe395325caa5ea01885b928f7"; + }; + } + { + name = "libnpmorg___libnpmorg_1.0.1.tgz"; + path = fetchurl { + name = "libnpmorg___libnpmorg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.1.tgz"; + sha1 = "5d2503f6ceb57f33dbdcc718e6698fea6d5ad087"; + }; + } + { + name = "libnpmpublish___libnpmpublish_1.1.3.tgz"; + path = fetchurl { + name = "libnpmpublish___libnpmpublish_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.3.tgz"; + sha1 = "e3782796722d79eef1a0a22944c117e0c4ca4280"; + }; + } + { + name = "libnpmsearch___libnpmsearch_2.0.2.tgz"; + path = fetchurl { + name = "libnpmsearch___libnpmsearch_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.2.tgz"; + sha1 = "9a4f059102d38e3dd44085bdbfe5095f2a5044cf"; + }; + } + { + name = "libnpmteam___libnpmteam_1.0.2.tgz"; + path = fetchurl { + name = "libnpmteam___libnpmteam_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.2.tgz"; + sha1 = "8b48bcbb6ce70dd8150c950fcbdbf3feb6eec820"; + }; + } + { + name = "libnpx___libnpx_10.2.2.tgz"; + path = fetchurl { + name = "libnpx___libnpx_10.2.2.tgz"; + url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.2.tgz"; + sha1 = "5a4171b9b92dd031463ef66a4af9f5cbd6b09572"; + }; + } { name = "load_bmfont___load_bmfont_1.4.0.tgz"; path = fetchurl { @@ -553,6 +2937,14 @@ sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"; }; } + { + name = "load_json_file___load_json_file_2.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + } { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -561,6 +2953,174 @@ sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; }; } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lock_verify___lock_verify_2.2.0.tgz"; + path = fetchurl { + name = "lock_verify___lock_verify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.0.tgz"; + sha1 = "12432feb68bb647071c78c44bde16029a0f7d935"; + }; + } + { + name = "lockfile___lockfile_1.0.4.tgz"; + path = fetchurl { + name = "lockfile___lockfile_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz"; + sha1 = "07f819d25ae48f87e538e6578b6964a4981a5609"; + }; + } + { + name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; + path = fetchurl { + name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; + sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; + }; + } + { + name = "lodash._createset___lodash._createset_4.0.3.tgz"; + path = fetchurl { + name = "lodash._createset___lodash._createset_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz"; + sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; + }; + } + { + name = "lodash._root___lodash._root_3.0.1.tgz"; + path = fetchurl { + name = "lodash._root___lodash._root_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + }; + } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } + { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + path = fetchurl { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + } + { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + path = fetchurl { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + } + { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + path = fetchurl { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + } + { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + path = fetchurl { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + } + { + name = "lodash.union___lodash.union_4.6.0.tgz"; + path = fetchurl { + name = "lodash.union___lodash.union_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash.without___lodash.without_4.4.0.tgz"; + path = fetchurl { + name = "lodash.without___lodash.without_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; + }; + } + { + name = "lodash___lodash_4.17.15.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + }; + } + { + name = "loglevel___loglevel_1.6.6.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.6.6.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz"; + sha1 = "0ee6300cc058db6b3551fa1c4bf73b83bb771312"; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + }; + } + { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + }; + } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + }; + } { name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { @@ -570,19 +3130,75 @@ }; } { - name = "mime_db___mime_db_1.38.0.tgz"; + name = "make_dir___make_dir_3.0.2.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.38.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz"; - sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"; + name = "make_dir___make_dir_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz"; + sha1 = "04a1acbf22221e1d6ef43559f43e05a90dbb4392"; }; } { - name = "mime_types___mime_types_2.1.22.tgz"; + name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.22.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz"; - sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd"; + name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz"; + sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; + }; + } + { + name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + path = fetchurl { + name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; + }; + } + { + name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz"; + path = fetchurl { + name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz"; + sha1 = "c28ad67c113c4aa9c8bce409c7ba550170bdc2ee"; + }; + } + { + name = "meant___meant_1.0.1.tgz"; + path = fetchurl { + name = "meant___meant_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz"; + sha1 = "66044fea2f23230ec806fb515efea29c44d2115d"; + }; + } + { + name = "mem___mem_1.1.0.tgz"; + path = fetchurl { + name = "mem___mem_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + } + { + name = "mem___mem_4.3.0.tgz"; + path = fetchurl { + name = "mem___mem_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; + sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; + }; + } + { + name = "mime_db___mime_db_1.42.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.42.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz"; + sha1 = "3e252907b4c7adb906597b4b65636272cf9e7bac"; + }; + } + { + name = "mime_types___mime_types_2.1.25.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.25.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz"; + sha1 = "39772d46621f93e2a80a856c53b86a62156a6437"; }; } { @@ -593,6 +3209,38 @@ sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; }; } + { + name = "mime___mime_2.4.4.tgz"; + path = fetchurl { + name = "mime___mime_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; + sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + }; + } { name = "min_document___min_document_2.19.0.tgz"; path = fetchurl { @@ -601,6 +3249,14 @@ sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } { name = "minimist___minimist_0.0.8.tgz"; path = fetchurl { @@ -617,6 +3273,46 @@ sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f"; }; } + { + name = "minipass___minipass_2.9.0.tgz"; + path = fetchurl { + name = "minipass___minipass_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz"; + sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6"; + }; + } + { + name = "minipass___minipass_3.1.1.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; + sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + }; + } + { + name = "minizlib___minizlib_1.3.3.tgz"; + path = fetchurl { + name = "minizlib___minizlib_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz"; + sha1 = "2290de96818a34c29551c8a8d301216bd65a861d"; + }; + } + { + name = "minizlib___minizlib_2.1.0.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz"; + sha1 = "fd52c645301ef09a63a2c209697c294c6ce02cf3"; + }; + } + { + name = "mississippi___mississippi_3.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; + sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; + }; + } { name = "mkdirp___mkdirp_0.5.1.tgz"; path = fetchurl { @@ -625,6 +3321,270 @@ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; } + { + name = "mkdirp___mkdirp_1.0.3.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz"; + sha1 = "4cf2e30ad45959dddea53ad97d518b6c8205e1ea"; + }; + } + { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + path = fetchurl { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "mute_stream___mute_stream_0.0.7.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + } + { + name = "mute_stream___mute_stream_0.0.8.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "needle___needle_2.3.2.tgz"; + path = fetchurl { + name = "needle___needle_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; + sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_fetch_npm___node_fetch_npm_2.0.2.tgz"; + path = fetchurl { + name = "node_fetch_npm___node_fetch_npm_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz"; + sha1 = "7258c9046182dca345b4208eda918daf33697ff7"; + }; + } + { + name = "node_gyp___node_gyp_5.1.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.0.tgz"; + sha1 = "8e31260a7af4a2e2f994b0673d4e0b3866156332"; + }; + } + { + name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + path = fetchurl { + name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; + sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83"; + }; + } + { + name = "nopt___nopt_4.0.1.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "normalize_url___normalize_url_4.5.0.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz"; + sha1 = "453354087e6ca96957bd8f5baf753f5982142129"; + }; + } + { + name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; + path = fetchurl { + name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.2.tgz"; + sha1 = "303bc78cd9e4c226415076a4f7e528c89fc77018"; + }; + } + { + name = "npm_bundled___npm_bundled_1.1.1.tgz"; + path = fetchurl { + name = "npm_bundled___npm_bundled_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz"; + sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b"; + }; + } + { + name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; + path = fetchurl { + name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; + sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; + }; + } + { + name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; + path = fetchurl { + name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz"; + sha1 = "ab2e32ad27baa46720706908e5b14c1852de44d9"; + }; + } + { + name = "npm_lifecycle___npm_lifecycle_3.1.4.tgz"; + path = fetchurl { + name = "npm_lifecycle___npm_lifecycle_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz"; + sha1 = "de6975c7d8df65f5150db110b57cce498b0b604c"; + }; + } + { + name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; + path = fetchurl { + name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz"; + sha1 = "44610141ca24664cad35d1e607176193fd8f5b88"; + }; + } + { + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; + path = fetchurl { + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2"; + }; + } + { + name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; + path = fetchurl { + name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz"; + sha1 = "02168cb0a49a2b75bf988a28698de7b529df5cb7"; + }; + } + { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + path = fetchurl { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz"; + sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"; + }; + } + { + name = "npm_pick_manifest___npm_pick_manifest_3.0.2.tgz"; + path = fetchurl { + name = "npm_pick_manifest___npm_pick_manifest_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz"; + sha1 = "f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"; + }; + } + { + name = "npm_profile___npm_profile_4.0.2.tgz"; + path = fetchurl { + name = "npm_profile___npm_profile_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.2.tgz"; + sha1 = "8272a71c19634d0dce9c35a5daf8ee589cbb0f52"; + }; + } + { + name = "npm_registry_fetch___npm_registry_fetch_4.0.2.tgz"; + path = fetchurl { + name = "npm_registry_fetch___npm_registry_fetch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz"; + sha1 = "2b1434f93ccbe6b6385f8e45f45db93e16921d7a"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; + path = fetchurl { + name = "npm_user_validate___npm_user_validate_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; + sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; + }; + } + { + name = "npm___npm_6.13.7.tgz"; + path = fetchurl { + name = "npm___npm_6.13.7.tgz"; + url = "https://registry.yarnpkg.com/npm/-/npm-6.13.7.tgz"; + sha1 = "9533a3ddc57f9792db8a8b303efabaf878047841"; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } { name = "oauth_sign___oauth_sign_0.9.0.tgz"; path = fetchurl { @@ -634,11 +3594,147 @@ }; } { - name = "object_keys___object_keys_1.1.0.tgz"; + name = "object_assign___object_assign_4.1.1.tgz"; path = fetchurl { - name = "object_keys___object_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz"; - sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032"; + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_inspect___object_inspect_1.7.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; + sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + }; + } + { + name = "object_is___object_is_1.0.1.tgz"; + path = fetchurl { + name = "object_is___object_is_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; + sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_2.0.1.tgz"; + path = fetchurl { + name = "onetime___onetime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + } + { + name = "opener___opener_1.5.1.tgz"; + path = fetchurl { + name = "opener___opener_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz"; + sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "os_locale___os_locale_2.1.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + }; + } + { + name = "os_locale___os_locale_3.1.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; + sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "osenv___osenv_0.1.5.tgz"; + path = fetchurl { + name = "osenv___osenv_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; + sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; + }; + } + { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + }; + } + { + name = "p_defer___p_defer_1.0.0.tgz"; + path = fetchurl { + name = "p_defer___p_defer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_is_promise___p_is_promise_2.1.0.tgz"; + path = fetchurl { + name = "p_is_promise___p_is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; }; } { @@ -649,6 +3745,22 @@ sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; }; } + { + name = "p_limit___p_limit_2.2.1.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz"; + sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; + }; + } + { + name = "p_limit___p_limit_2.2.2.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; + sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; + }; + } { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { @@ -657,6 +3769,22 @@ sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; }; } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { @@ -665,6 +3793,54 @@ sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "package_json___package_json_4.0.1.tgz"; + path = fetchurl { + name = "package_json___package_json_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + }; + } + { + name = "package_json___package_json_6.5.0.tgz"; + path = fetchurl { + name = "package_json___package_json_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; + sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + }; + } + { + name = "pacote___pacote_9.5.12.tgz"; + path = fetchurl { + name = "pacote___pacote_9.5.12.tgz"; + url = "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz"; + sha1 = "1e11dd7a8d736bcc36b375a9804d41bb0377bf66"; + }; + } + { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + path = fetchurl { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } { name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; path = fetchurl { @@ -690,11 +3866,19 @@ }; } { - name = "parse_headers___parse_headers_2.0.2.tgz"; + name = "parse_headers___parse_headers_2.0.3.tgz"; path = fetchurl { - name = "parse_headers___parse_headers_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz"; - sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34"; + name = "parse_headers___parse_headers_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz"; + sha1 = "5e8e7512383d140ba02f0c7aa9f49b4399c92515"; + }; + } + { + name = "parse_json___parse_json_2.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; }; } { @@ -705,6 +3889,14 @@ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -713,6 +3905,38 @@ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; } + { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + path = fetchurl { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "path_type___path_type_2.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + } { name = "performance_now___performance_now_2.1.0.tgz"; path = fetchurl { @@ -729,6 +3953,14 @@ sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c"; }; } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } { name = "pify___pify_3.0.0.tgz"; path = fetchurl { @@ -769,6 +4001,38 @@ sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f"; }; } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } { name = "process___process_0.5.2.tgz"; path = fetchurl { @@ -778,11 +4042,99 @@ }; } { - name = "psl___psl_1.1.31.tgz"; + name = "progress___progress_2.0.3.tgz"; path = fetchurl { - name = "psl___psl_1.1.31.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz"; - sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184"; + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + } + { + name = "promise_retry___promise_retry_1.1.1.tgz"; + path = fetchurl { + name = "promise_retry___promise_retry_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz"; + sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; + }; + } + { + name = "promzard___promzard_0.3.0.tgz"; + path = fetchurl { + name = "promzard___promzard_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz"; + sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + }; + } + { + name = "proto_list___proto_list_1.2.4.tgz"; + path = fetchurl { + name = "proto_list___proto_list_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + } + { + name = "protoduck___protoduck_5.0.1.tgz"; + path = fetchurl { + name = "protoduck___protoduck_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz"; + sha1 = "03c3659ca18007b69a50fd82a7ebcc516261151f"; + }; + } + { + name = "prr___prr_1.0.1.tgz"; + path = fetchurl { + name = "prr___prr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + } + { + name = "psl___psl_1.6.0.tgz"; + path = fetchurl { + name = "psl___psl_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz"; + sha1 = "60557582ee23b6c43719d9890fb4170ecd91e110"; + }; + } + { + name = "pump___pump_2.0.1.tgz"; + path = fetchurl { + name = "pump___pump_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; + sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "pumpify___pumpify_1.5.1.tgz"; + path = fetchurl { + name = "pumpify___pumpify_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; + sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; }; } { @@ -801,6 +4153,30 @@ sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; }; } + { + name = "pupa___pupa_2.0.1.tgz"; + path = fetchurl { + name = "pupa___pupa_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz"; + sha1 = "dbdc9ff48ffbea4a26a069b6f9f7abb051008726"; + }; + } + { + name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; + path = fetchurl { + name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz"; + sha1 = "bb5b699ef7f9f0505092a3748be4464fe71b5819"; + }; + } + { + name = "qs___qs_6.9.1.tgz"; + path = fetchurl { + name = "qs___qs_6.9.1.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz"; + sha1 = "20082c65cb78223635ab1a9eaca8875a29bf8ec9"; + }; + } { name = "qs___qs_6.5.2.tgz"; path = fetchurl { @@ -809,6 +4185,30 @@ sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; }; } + { + name = "query_string___query_string_6.10.1.tgz"; + path = fetchurl { + name = "query_string___query_string_6.10.1.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-6.10.1.tgz"; + sha1 = "30b3505f6fca741d5ae541964d1b3ae9dc2a0de8"; + }; + } + { + name = "qw___qw_1.0.1.tgz"; + path = fetchurl { + name = "qw___qw_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz"; + sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + }; + } { name = "read_chunk___read_chunk_1.0.1.tgz"; path = fetchurl { @@ -817,6 +4217,166 @@ sha1 = "5f68cab307e663f19993527d9b589cace4661194"; }; } + { + name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; + path = fetchurl { + name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz"; + sha1 = "87e43eba50098ba5a32d0ceb583ab8e43b961c16"; + }; + } + { + name = "read_config_file___read_config_file_5.0.1.tgz"; + path = fetchurl { + name = "read_config_file___read_config_file_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.1.tgz"; + sha1 = "ead3df0d9822cc96006ca16322eaa79dac8591c2"; + }; + } + { + name = "read_installed___read_installed_4.0.3.tgz"; + path = fetchurl { + name = "read_installed___read_installed_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz"; + sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; + }; + } + { + name = "read_package_json___read_package_json_2.1.1.tgz"; + path = fetchurl { + name = "read_package_json___read_package_json_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz"; + sha1 = "16aa66c59e7d4dad6288f179dd9295fd59bb98f1"; + }; + } + { + name = "read_package_tree___read_package_tree_5.3.1.tgz"; + path = fetchurl { + name = "read_package_tree___read_package_tree_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz"; + sha1 = "a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"; + }; + } + { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + } + { + name = "read_pkg___read_pkg_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + } + { + name = "read___read_1.0.7.tgz"; + path = fetchurl { + name = "read___read_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_2.3.6.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; + sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + }; + } + { + name = "readable_stream___readable_stream_3.4.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; + sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; + }; + } + { + name = "readable_stream___readable_stream_1.1.14.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.1.14.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + } + { + name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; + path = fetchurl { + name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz"; + sha1 = "8d45407b4f870a0dcaebc0e28670d18e74514309"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; + sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; + }; + } + { + name = "regexpp___regexpp_2.0.1.tgz"; + path = fetchurl { + name = "regexpp___regexpp_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; + sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; + }; + } + { + name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha1 = "d7446815433f5d5ed6431cd5dca21048f66b397e"; + }; + } + { + name = "registry_auth_token___registry_auth_token_4.0.0.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.0.0.tgz"; + sha1 = "30e55961eec77379da551ea5c4cf43cbf03522be"; + }; + } + { + name = "registry_url___registry_url_3.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + } + { + name = "registry_url___registry_url_5.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; + sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + }; + } { name = "request___request_2.88.0.tgz"; path = fetchurl { @@ -825,6 +4385,134 @@ sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; }; } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve___resolve_1.13.1.tgz"; + path = fetchurl { + name = "resolve___resolve_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz"; + sha1 = "be0aa4c06acd53083505abb35f4d66932ab35d16"; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + } + { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + } + { + name = "retry___retry_0.10.1.tgz"; + path = fetchurl { + name = "retry___retry_0.10.1.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + }; + } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { + name = "rimraf___rimraf_2.6.3.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; + sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "run_async___run_async_2.3.0.tgz"; + path = fetchurl { + name = "run_async___run_async_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + } + { + name = "run_queue___run_queue_1.0.3.tgz"; + path = fetchurl { + name = "run_queue___run_queue_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + } + { + name = "rxjs___rxjs_6.5.3.tgz"; + path = fetchurl { + name = "rxjs___rxjs_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz"; + sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -841,6 +4529,14 @@ sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; }; } + { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + path = fetchurl { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; + sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + }; + } { name = "sax___sax_1.2.4.tgz"; path = fetchurl { @@ -849,6 +4545,78 @@ sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; } + { + name = "semver_diff___semver_diff_2.1.0.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + } + { + name = "semver_diff___semver_diff_3.1.1.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; + sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.1.3.tgz"; + path = fetchurl { + name = "semver___semver_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz"; + sha1 = "e4345ce73071c53f336445cfc19efb1c311df2a6"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "sha___sha_3.0.0.tgz"; + path = fetchurl { + name = "sha___sha_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/sha/-/sha-3.0.0.tgz"; + sha1 = "b2f2f90af690c16a3a839a6a6c680ea51fedd1ae"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { @@ -857,6 +4625,126 @@ sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; } + { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + }; + } + { + name = "slide___slide_1.1.6.tgz"; + path = fetchurl { + name = "slide___slide_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + } + { + name = "smart_buffer___smart_buffer_4.1.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz"; + sha1 = "91605c25d91652f4661ea69ccf45f1b331ca21ba"; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz"; + sha1 = "3c8991f3145b2799e70e11bd5fbc8b1963116386"; + }; + } + { + name = "socks___socks_2.3.3.tgz"; + path = fetchurl { + name = "socks___socks_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz"; + sha1 = "01129f0a5d534d2b897712ed8aceab7ee65d78e3"; + }; + } + { + name = "sorted_object___sorted_object_2.0.1.tgz"; + path = fetchurl { + name = "sorted_object___sorted_object_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; + }; + } + { + name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; + path = fetchurl { + name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; + }; + } + { + name = "source_map_support___source_map_support_0.5.16.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.16.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; + sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.0.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha1 = "3694b5804567a458d3c8045842a6358632f62654"; + }; + } + { + name = "split_on_first___split_on_first_1.1.0.tgz"; + path = fetchurl { + name = "split_on_first___split_on_first_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz"; + sha1 = "f610afeee3b12bce1d0c30425e76398b78249a5f"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } { name = "sshpk___sshpk_1.16.1.tgz"; path = fetchurl { @@ -865,6 +4753,46 @@ sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; }; } + { + name = "ssri___ssri_6.0.1.tgz"; + path = fetchurl { + name = "ssri___ssri_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; + sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + }; + } + { + name = "stat_mode___stat_mode_1.0.0.tgz"; + path = fetchurl { + name = "stat_mode___stat_mode_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; + sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + }; + } + { + name = "stream_each___stream_each_1.2.3.tgz"; + path = fetchurl { + name = "stream_each___stream_each_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; + sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; + }; + } + { + name = "stream_iterate___stream_iterate_1.2.0.tgz"; + path = fetchurl { + name = "stream_iterate___stream_iterate_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; + }; + } + { + name = "stream_shift___stream_shift_1.0.1.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } { name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; path = fetchurl { @@ -882,11 +4810,259 @@ }; } { - name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; + name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; path = fetchurl { - name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; - sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; + sha1 = "b9c7330c7042862f6b142dc274bbcc5866ce3546"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } + { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + path = fetchurl { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "stringify_package___stringify_package_1.0.1.tgz"; + path = fetchurl { + name = "stringify_package___stringify_package_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz"; + sha1 = "e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_7.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; + sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + }; + } + { + name = "table___table_5.4.6.tgz"; + path = fetchurl { + name = "table___table_5.4.6.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; + sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + }; + } + { + name = "tar_stream___tar_stream_2.1.0.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz"; + sha1 = "d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"; + }; + } + { + name = "tar___tar_4.4.13.tgz"; + path = fetchurl { + name = "tar___tar_4.4.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; + sha1 = "43b364bc52888d555298637b10d60790254ab525"; + }; + } + { + name = "tar___tar_6.0.1.tgz"; + path = fetchurl { + name = "tar___tar_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz"; + sha1 = "7b3bd6c313cb6e0153770108f8d70ac298607efa"; + }; + } + { + name = "temp_file___temp_file_3.3.6.tgz"; + path = fetchurl { + name = "temp_file___temp_file_3.3.6.tgz"; + url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.6.tgz"; + sha1 = "bd7a1951338bf93b59380b498ec1804d5b76c449"; + }; + } + { + name = "term_size___term_size_1.2.0.tgz"; + path = fetchurl { + name = "term_size___term_size_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + }; + } + { + name = "term_size___term_size_2.2.0.tgz"; + path = fetchurl { + name = "term_size___term_size_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz"; + sha1 = "1f16adedfe9bdc18800e1776821734086fcc6753"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "timed_out___timed_out_4.0.1.tgz"; + path = fetchurl { + name = "timed_out___timed_out_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + } + { + name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; + path = fetchurl { + name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz"; + sha1 = "fa08aad501ed730f31cc043181d995c39a935e07"; }; } { @@ -897,6 +5073,38 @@ sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"; }; } + { + name = "tmp_promise___tmp_promise_1.1.0.tgz"; + path = fetchurl { + name = "tmp_promise___tmp_promise_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-1.1.0.tgz"; + sha1 = "bb924d239029157b9bc1d506a6aa341f8b13e64c"; + }; + } + { + name = "tmp___tmp_0.1.0.tgz"; + path = fetchurl { + name = "tmp___tmp_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz"; + sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877"; + }; + } + { + name = "tmp___tmp_0.0.33.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.33.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + } + { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + path = fetchurl { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + }; + } { name = "tough_cookie___tough_cookie_2.4.3.tgz"; path = fetchurl { @@ -905,6 +5113,22 @@ sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; }; } + { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + path = fetchurl { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + }; + } + { + name = "tslib___tslib_1.10.0.tgz"; + path = fetchurl { + name = "tslib___tslib_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; + sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + }; + } { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -921,6 +5145,110 @@ sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "uid_number___uid_number_0.0.6.tgz"; + path = fetchurl { + name = "uid_number___uid_number_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz"; + sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + }; + } + { + name = "umask___umask_1.1.0.tgz"; + path = fetchurl { + name = "umask___umask_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz"; + sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; + }; + } + { + name = "unhomoglyph___unhomoglyph_1.0.3.tgz"; + path = fetchurl { + name = "unhomoglyph___unhomoglyph_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.3.tgz"; + sha1 = "8d3551622b57754e10a831bf81442d7f15d1ddfd"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + }; + } + { + name = "unique_string___unique_string_1.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + } + { + name = "unique_string___unique_string_2.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; + sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } { name = "untildify___untildify_3.0.3.tgz"; path = fetchurl { @@ -929,6 +5257,30 @@ sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"; }; } + { + name = "unzip_response___unzip_response_2.0.1.tgz"; + path = fetchurl { + name = "unzip_response___unzip_response_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + } + { + name = "update_notifier___update_notifier_2.5.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz"; + sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6"; + }; + } + { + name = "update_notifier___update_notifier_4.1.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz"; + sha1 = "4866b98c3bc5b5473c020b1250583628f9a328f3"; + }; + } { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { @@ -937,6 +5289,22 @@ sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; }; } + { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + } { name = "url_regex___url_regex_3.2.0.tgz"; path = fetchurl { @@ -946,11 +5314,75 @@ }; } { - name = "uuid___uuid_3.3.2.tgz"; + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; path = fetchurl { - name = "uuid___uuid_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz"; - sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util_extend___util_extend_1.0.3.tgz"; + path = fetchurl { + name = "util_extend___util_extend_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz"; + sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; + }; + } + { + name = "util_promisify___util_promisify_2.1.0.tgz"; + path = fetchurl { + name = "util_promisify___util_promisify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz"; + sha1 = "3c2236476c4d32c5ff3c47002add7c13b9a82a53"; + }; + } + { + name = "util.promisify___util.promisify_1.0.0.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz"; + sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; + }; + } + { + name = "uuid___uuid_3.3.3.tgz"; + path = fetchurl { + name = "uuid___uuid_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz"; + sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; + path = fetchurl { + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; } { @@ -961,6 +5393,54 @@ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } + { + name = "wcwidth___wcwidth_1.0.1.tgz"; + path = fetchurl { + name = "wcwidth___wcwidth_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "widest_line___widest_line_2.0.1.tgz"; + path = fetchurl { + name = "widest_line___widest_line_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz"; + sha1 = "7438764730ec7ef4381ce4df82fb98a53142a3fc"; + }; + } + { + name = "widest_line___widest_line_3.1.0.tgz"; + path = fetchurl { + name = "widest_line___widest_line_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; + sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + }; + } { name = "winreg___winreg_1.2.4.tgz"; path = fetchurl { @@ -970,11 +5450,83 @@ }; } { - name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { - name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz"; - sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "worker_farm___worker_farm_1.7.0.tgz"; + path = fetchurl { + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; + }; + } + { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + } + { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz"; + sha1 = "1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.1.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz"; + sha1 = "558328352e673b5bb192cf86500d60b230667d4b"; + }; + } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } + { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + } + { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; }; } { @@ -994,27 +5546,123 @@ }; } { - name = "xml2js___xml2js_0.4.19.tgz"; + name = "xml2js___xml2js_0.4.22.tgz"; path = fetchurl { - name = "xml2js___xml2js_0.4.19.tgz"; - url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz"; - sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; + name = "xml2js___xml2js_0.4.22.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.22.tgz"; + sha1 = "4fa2d846ec803237de86f30aa9b5f70b6600de02"; }; } { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; path = fetchurl { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; + sha1 = "be9bae1c8a046e76b31127726347d0ad7002beb3"; }; } { - name = "xtend___xtend_4.0.1.tgz"; + name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { - name = "xtend___xtend_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_3.2.1.tgz"; + path = fetchurl { + name = "y18n___y18n_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + } + { + name = "y18n___y18n_4.0.0.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; + sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_16.1.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_16.1.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz"; + sha1 = "73747d53ae187e7b8dbe333f95714c76ea00ecf1"; + }; + } + { + name = "yargs_parser___yargs_parser_7.0.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + } + { + name = "yargs_parser___yargs_parser_9.0.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz"; + sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + }; + } + { + name = "yargs___yargs_11.1.1.tgz"; + path = fetchurl { + name = "yargs___yargs_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz"; + sha1 = "5052efe3446a4df5ed669c995886cc0f13702766"; + }; + } + { + name = "yargs___yargs_15.1.0.tgz"; + path = fetchurl { + name = "yargs___yargs_15.1.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz"; + sha1 = "e111381f5830e863a89550bd4b136bb6a5f37219"; + }; + } + { + name = "yargs___yargs_8.0.2.tgz"; + path = fetchurl { + name = "yargs___yargs_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + } + { + name = "zip_stream___zip_stream_2.1.2.tgz"; + path = fetchurl { + name = "zip_stream___zip_stream_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.2.tgz"; + sha1 = "841efd23214b602ff49c497cba1a85d8b5fbc39c"; }; } ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 3b4f968c12..e5b815e7c8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,20 +8,18 @@ let executableName = "riot-desktop"; - version = "1.6.0"; - riot-web-src = fetchFromGitHub { + version = "1.6.2"; + src = fetchFromGitHub { owner = "vector-im"; - repo = "riot-web"; + repo = "riot-desktop"; rev = "v${version}"; - sha256 = "16zm6l4c7vkfdlxh6gdw531k5r4v3mb0h66q41h94dvmj79dz2bj"; + sha256 = "1anmch9z3na7rphxb0p9cnk55388z22iwfnfjhmjps1ii5wx4rls"; }; electron = electron_7; in mkYarnPackage rec { name = "riot-desktop-${version}"; - inherit version; - - src = "${riot-web-src}/electron_app"; + inherit version src; packageJSON = ./riot-desktop-package.json; yarnNix = ./riot-desktop-yarndeps.nix; @@ -32,8 +30,8 @@ in mkYarnPackage rec { # resources mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" - cp -r './deps/riot-web' "$out/share/riot/electron" - cp -r './deps/riot-web/img' "$out/share/riot" + cp -r './deps/riot-desktop' "$out/share/riot/electron" + cp -r './deps/riot-desktop/res/img' "$out/share/riot" rm "$out/share/riot/electron/node_modules" cp -r './node_modules' "$out/share/riot/electron" @@ -80,7 +78,7 @@ in mkYarnPackage rec { description = "A feature-rich client for Matrix.org"; homepage = "https://about.riot.im/"; license = licenses.asl20; - maintainers = with maintainers; [ pacien worldofpeace ]; + maintainers = with maintainers; [ pacien worldofpeace ma27 ]; inherit (electron.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 3aeb715ac6..e61237dbb6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1mm4xk69ya1k3gz6jjhc4njx7b3rp157jmrqsxr5i382zs035ff7"; + sha256 = "1cyjw3x9yh96cn84r95zziwxgifkmzd5kdf4l69b7mwnqcr78dp0"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh index f516e4a76f..d6e7259f19 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh @@ -9,9 +9,9 @@ if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then exit 1 fi -RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-web/$1" +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" -wget "$RIOT_WEB_SRC/electron_app/package.json" -O riot-desktop-package.json -wget "$RIOT_WEB_SRC/electron_app/yarn.lock" -O riot-desktop-yarndeps.lock +wget "$RIOT_WEB_SRC/package.json" -O riot-desktop-package.json +wget "$RIOT_WEB_SRC/yarn.lock" -O riot-desktop-yarndeps.lock yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix rm riot-desktop-yarndeps.lock diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 16cf7f5fc7..f003bbec22 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.24"; + version = "0.4.25"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0rscmnwxvbdl0vfx1pz7x5gxs9qsjk905zmcad4f330j5l5m227z"; + sha256 = "17s4fxqirmzdw0sn9s9zyk90gr00ivsmz4s6i6knsq354zhy5fda"; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a4594a20ca..5c46a5a0fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.7"; + version = "0.6.8"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "13wz2c0n89aglqjfqlma1z4jr5xnp2qlg8cqng3v9axpkkynk996"; + sha256 = "0gcyj8r7156zn5zzfnabf0mw3kcaq7v29vsjb6mdvj8cjjm05dvd"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index be9cdbecc0..309da8f296 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.0"; # Please backport all updates to the stable channel. + version = "1.34.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 = "175iir85qlign5ns8wk4x4mf7xw8sriq8jyj61n76is79jjk7b3d"; + sha256 = "0v9mqn43vn1w6wppzydkgpbx2752bp7mmpf50wqgvrmhchnywnkj"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 0cc8cd848c..e7ba1e7f9a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/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.59.0.77"; + version = "8.60.0.76"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "1cnlwlp84942ywji3x60zvhijavazdxfym3rfzq3ysky28b6mn6i"; + sha256 = "1y919ki0c17vip90fln17impwky08qgprw0j1dgz239qqpwakn7a"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index b9835f45d2..7d2586c670 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl -, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib -, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config +, alsaLib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: let @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase qtwebengine qtwebchannel qtsvg - libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi ]; desktopItem = makeDesktopItem { @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.3.2"; + version = "3.5.3"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; sha256 = if stdenv.is64bit - then "1n916ds67dxj5bfgc5zm9nz2xh2914k85pzzspzvfyr7njcw7hpi" - else "0csl5xklcb4v8bzwvby5m2n38zjrnaw8dcvha7qvfbjllxr75yn2"; + then "0fp9v2rkxf0zgvf3wcx8nsmf93bzdc22xlqxk3r8cb0415adp76a" + else "0ni7hijprc8xygyz41568f1m9wwhl8lk5c3q28bm9m5r6qym39l6"; }; # grab the plugin sdk for the desktop icon diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1e1f952586..9b541f41d9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.4"; + version = "2.1.7"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1swmmklw2mcgag0c8zh4rk5cjfx6z2yl0nxd5yc43hg9hx76yqqi"; + sha256 = "0qnabi1g760y5wf4k9vnh78y0kwmni2wxr59rqr0lq3x39zv0i69"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index d69f22f32a..fc84bb7144 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -20,13 +20,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.16.3630"; - x86_64-linux = "3.16.2923"; + x86_64-darwin = "3.17.3666"; + x86_64-linux = "3.17.2924"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1lnjn45bhd36n9xgx6xx9cggwivvkr2s6r4zai2dwg0aac1bywr5"; - x86_64-linux = "0c8jmlsg2gnxsvly04xj1al80nj52rg4czfdha58sg14x14lyspz"; + x86_64-darwin = "0r3ckfrdx0ah6wn364ii1q1laya2nmmfz9jsikc6ss28lijb6ipn"; + x86_64-linux = "16f8zawdx7dyrb8hp3fd2j821jj7jlan60knmdlrrk84phlc9ldd"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 029ec23856..566371e3af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.0.403652.0509"; + version = "5.0.413237.0524"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "00bprrfc7mmf3yg6jddqm2qr73m2zycr8hy19dxqpzld9gbvyzik"; + sha256 = "09hr31pzjgwaa898akl953k7fcshkq8r065i2047mk247bjy278k"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix index 8245f5febc..1adfb71dd9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.0.0"; + version = "5.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0qwlhkzb3lbzk3piyfx8nn827kcafrl3j1nxrn18f8px9gwasinz"; + sha256 = "0rgvllm1pzg6smyjrhh8v1ial0dvav0h2zccxp4p5nqmq6zdvs3h"; name="${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix index 6a9bcaf32d..d137fcf296 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipget/default.nix @@ -1,32 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "ipget"; - version = "0.3.2"; - rev = "v${version}"; - - goPackagePath = "github.com/ipfs/ipget"; - - extraSrcPaths = [ - (fetchgx { - inherit src;name = "${pname}-${version}"; - sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8"; - }) - ]; - - goDeps = ../../../tools/package-management/gx/deps.nix; + version = "0.6.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; - inherit rev; - sha256 = "1ljf5ddvc1p5swmgn4m1ivfj74fykk56myk2r9c4grdjzksf4a15"; + rev = "v${version}"; + sha256 = "14ygij6hj6bd4g4aw6jgfbi1fgpal0jgf1hr22zxm16dpx3vva6b"; }; + vendorSha256 = "0vy21pdqk6q5fw7wlcv51myhh9y79n2qhvy61rmblwhxlrkh6sdv"; + meta = with stdenv.lib; { description = "Retrieve files over IPFS and save them locally"; homepage = "https://ipfs.io/"; license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix index fc5214f0d0..700ad011df 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lieer"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "gauteh"; repo = "lieer"; rev = "v${version}"; - sha256 = "19jx3sm925nrzl26km1bxbp6y5gk1mzwadd79vip2jl70b3xk9f8"; + sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5"; }; propagatedBuildInputs = with python3Packages; [ @@ -30,6 +30,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://lieer.gaute.vetsj.com/"; repositories.git = "https://github.com/gauteh/lieer.git"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kaiha ]; + maintainers = with maintainers; [ flokli kaiha ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index 736d7530be..c188e46d00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1y7racrhz06k9mwxw5qspfjfyvbj5fmwai3gsfgrm36k7al84bnz"; + sha256 = "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2"; }; patches = optional smimeSupport (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 800f7ff9e6..c7c5dab282 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.8.0"; + version = "68.8.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ar/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ar/thunderbird-68.8.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a45860fc124ef1c3ce15b1c91ab1d920beff2d6f886a646b6162bc5687e8910d559de6d616a36e7bdbd99fe18aa39720b44fcd4fe14e6d5fd4872750f209a740"; + sha512 = "0f604cf3e5efff225cc544b3f289056be05ec430cf1481162f3ab1a84234660802c2777de1552f2900ca9cbf43ff13a468d3c97a44896ea02189471676243d22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ast/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ast/thunderbird-68.8.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "21e025c3e28b46e1d6af0fa10f3ab5b6b86543bb422c2b3d4928ae733cf3387ab092a20af15f05bdcebf0108c376973982d099371a4b2c2f9a892defe144e160"; + sha512 = "4c5a5dfdc6d81577df445cee8e4f875c95394f87037feffd47fa22bf4e153fc260f48676e8ff005d3248c31aa346b6756ba9468ae95e542e5814c5a98cfcf7e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/be/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/be/thunderbird-68.8.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "5cb35465afbf6ba68aab98197ab6997e925d5e34db6deaf3b047fb679f32372e0524ac03d7988898f34c493349283088a3b4c0cfff679774760916673e49b757"; + sha512 = "fca5948534a7de3c8a6dafab22e45478b79c20d1722d58fc3f423e3c792d754bcf63993b9a8c1f1c6758ea1585dd700b1ce7631a21274b0f8a05e631992ae5ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/bg/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/bg/thunderbird-68.8.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a06dea6a215003ef5663cea4928cf201ee71cd021565f3a2f9317f21679047adc7f6c87427d65c4f919facb30e8dfaf941e308173f23c6c0b3e92606fa0220b8"; + sha512 = "907d252bdc8cf65b8d42ca5ee95cd7f43efe48f44d822558139ee04cee2b628966e11599f1d6db0ef5cff33a8ae424d514dc1df4e049a36432647dd3fa1039bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/br/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/br/thunderbird-68.8.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "194f7332e6c67dea103bae4001b555296b2a64259060bb63329aee95f774e4f3f82c9bf133a456989b43f05682eba7e73e16235f1530012aeb7cf323bc16a381"; + sha512 = "ca82cbb9f61c6ee285a7b075c79aaf4ae09a86b009ea004818fffb7abd8a12708943e5f2edeb89362f7841ed5f6b9099c9e15f6a7efb2dc261a1e63e569d83c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ca/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ca/thunderbird-68.8.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "99952f59100fe127fb274df641e02185a9416c315d5b023e990ca39fe6edb014a2e6e8ae702cce4d3133635a4c8488c42a72a6b3111147fc19dafeacae396943"; + sha512 = "3cc29b0a077b48ea0ab0d3cde6fb9cf6fe6cdcb1ea914be6ed6d38e1bf382f910fad7920e918d2c9c9131845bb24b2818cfc45349270ff636e8bc216fd2b3059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cak/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cak/thunderbird-68.8.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "9e4d9dd67fa7480c2897175d08ed250a14bb2595c9a69f74db7b7723d08e6218021a0916d637bb682f7e0e3e316cafcfe9a09408e5cced018616c00a752ccb0a"; + sha512 = "184f74a10722a72ad622c54f221b62193259cdd54cd9dc4d71326219fd6dc533c723d5e926bfa0e7a3231a41864fefe578030329f0e24765ddad7459945cc75d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cs/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cs/thunderbird-68.8.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "53d653b9eda30f7b5ce75ebd31a2bb9e5bde683ca65549cb5d67ed4173eb4f44524f2bd148a0b41368e183b2ec513b7b7c698fcdeb2679ffd6391f133db2a0c6"; + sha512 = "1f76a6f2e9a4804c697d2842389d9fe0aaf1e8b30eaaf0aaf9ccd252c64a20d10b876011ec6cf54e4d6778d03a51673f4d941d1875ba66d31946bd446006daf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cy/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/cy/thunderbird-68.8.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ba01e95181c8b0e04989681cffacbc48a57a7861ce7f60377e219823fc5c70096bdf4f0a38401a35fd442e28c62b0bbb38328e62800db82ea7d097b919f60d55"; + sha512 = "28f9314997024728691ea43b4bb2eec51a8ce8a0da26025c1f6213eb2f20c140dee0c87950a325589c7af8b037f7378025dc05346a7156ee8ea200e89705ed84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/da/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/da/thunderbird-68.8.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5b79cff38ae706023ef74799e66fb3e47e0cc4b1986f7df9b420dc27881c91db881311da9ac8c8d45c2a1c04a2e8b16b9a1d06e724e891f8a4e6323eedfd984b"; + sha512 = "d65d1b71b93b08bf783a691b26d39a6749c3b0ece109889ea9342f8dce681e47d4785010548f388d943e10632e9539f9747eb4b9ec7da524d8087300961fe3df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/de/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/de/thunderbird-68.8.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "de71986c0fecd12358a6ce01c708b7cfc1ebbc9a3f748f301bec76c1c4b23f584de224bfb8cca0bc59f545aa29990de0175af5a3005b33b77786c8b69065427f"; + sha512 = "e140fe5153f3c2eadc5bac3891d4c2d2e03e0823da146d78c21884a28bbaa1fc1ea394c726bceaa20ffd2bfd8c1f841966de22fedd3e789b39b8dfabc2bbd930"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/dsb/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/dsb/thunderbird-68.8.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e18851b7c709feb8c3bde88db8d9c297174ea3a7ff512f8a5d35d515e3693717f55631b4ab60fd134f0af056257e0b21947a400d305f91c904dc0848fa9ce5ec"; + sha512 = "6c17e859826e48d59777a022273540696ec9c1da026922b46f4538067e34561d3717d2e4d092eae8de9c98bdf7d06a76ddc1af7f2832cd690a466a05d0e0e317"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/el/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/el/thunderbird-68.8.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "10816787adb0d02712b1a200f0b7547d8b03ff44056690dcf41a8a74c0dd1faa86a073c5036527a34626e83f47742caa213bc953a0d80e3598b2a743bcfc4d78"; + sha512 = "c6d830ad93e67262e22dfc1b2551bd40034a3867fa61e5a4bba773db98405fc8c7683c5f606c591242ce95f1c520d754fbeb3eebb36458e3d78a4b8b19c5a3cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-GB/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/en-GB/thunderbird-68.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "295a440863622a263a8c157da9ae4d39f73c83d9e9fab3e8fad792480c84a1fdf0e073398c137c359e0dc078bd755bd024f2f15bb5129218df4cf54d02b9e565"; + sha512 = "b39dc8f17de38c94332ed3dabfcd29bd8d8334e83010630cf2fc19f2a601dba9d6db64140a604dd4e1fb401d4d5dca718795503345a4e7bdab666e6fa7776d9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-US/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/en-US/thunderbird-68.8.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "cce266a330866ec3368c7d3f596868a87e1e3d786ddb848402456c5d80e5dec60a93a6feeee596b1ad91492e1d07aa5cc5703b09f0703d44575db7a050d58864"; + sha512 = "ba1a090f72aa286d94dded8edfbadc7b9c05c4a7f37d485d0d91275dd97ec40322241b3c74f3c183ed13a6cdf6b1d8667858539fba130514eed72dc54e1f4a90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-AR/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/es-AR/thunderbird-68.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "78d7897c537807068ce92d6520086f921aa6530d893c7d1b662530bfee5a5082740ba4cbbecd7e8e57f5f600e8a288b259ed3d89a97f3e88d5e5ebc47b5bd6b4"; + sha512 = "8b280a3329421c9949821d78c891b7a0b9f7ac6e7ad40f99e49233ad6b3848188e7ed42c40bbaa67a31b270cb19644b033d4046ebeed0b1031567a2988ba98ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-ES/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/es-ES/thunderbird-68.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "df97856ec0f8cf1fd82ceeb93529d8560cfe80416db769eea290ea1c28dcdc60799822ef1cdde744dfe4fb9622d16f32b0ed992293481762cf45c44a5bd846e8"; + sha512 = "4f103d329c694c6b9d676739936ecb1fc61e23d7210252d8c87a28c916f063ef15437cb57949b5935269c922bc0221e2e9c6d536152503b087f0f00ea0946777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/et/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/et/thunderbird-68.8.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9028d26dc4393043b39c7c918163d50aba07d6c1c57916b7e1c607b92be0c16dd8d62ff41b0ff26991b70f63a9fc684904c266e1a18ca8fc3e5abf5c61c6d372"; + sha512 = "a3e61bfd84ac0c2087abdd2c311c53533ebcc79a87289469aa1708e4d276d44f41ddd657afec21b93d0b499a003014d500939af9d6bd0d4773072019cc19f59c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/eu/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/eu/thunderbird-68.8.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "adf9c6eedb1b086fa72af21b44a55bd9d8a1b3f4c45db4c232384abd570564e62fc9068dc1391b0bbe0adda4043c7893bf1cb15a9c3019230eed6f66001bcb97"; + sha512 = "898add1a1d7315993b18b2e0d0851f07379c346efe905ca1ef8ee9e5fb249f819b720a1de127ce558b576c0c6b4916c52069d117a0d050414ccdeee239e04e11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fi/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fi/thunderbird-68.8.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a436504ebc04f1214226a0555838fe5eda6e12dabd3b09e9c83e85cc8b6b7bfea00389202c9680bf14d147e8e0a9200de01fdb1bac2197b8d7e8a392aa3b617e"; + sha512 = "d8e6a78f615af1d99c5d23ad050e49add43b06e3cccc727dae512a066d348adda414869adebcce1a4d6b32b0bf666e3a793c9150f521591fd53ab3bb2df04f25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fr/thunderbird-68.8.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "16d02c3e7d6342fed0f785c0f6a65c06a04eb6915bf67c7ff7d80a59ae9f4e069c329d54a9dbc8add6b84755e18aa485db7950dd1e3231a6ac135d799b27656a"; + sha512 = "67541072216f3362d81bd0f2894a735562ad6703f583b51cfd114e9f591b3f4f7bf9ba70573f124e5209ff805e192d19ab37df6068306ed34ac98ef9292e7edd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fy-NL/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/fy-NL/thunderbird-68.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c5ddf9105d06b2b5cb45299d88bb7b753832d54a653a62d68695c88aa9cfa0d6e12f510139e924d142b867a5b1e10f7e9704c503fcc93dcb8d97d1b071a69b7a"; + sha512 = "1a2be59965ab12c8380373e0dfff660b62d6f9121549799055cb0318dc40bb517b64d203b7c18c80814f0f1a1426db04781ddc896bdcc5c679f7de234fe35068"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ga-IE/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ga-IE/thunderbird-68.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6479f7692fda207c51435691cbd6281a24fc6ad47101827516bad3c2b40ca8c0bb592aacd9936a22d9305ff8ffd53c376a79479ce82dee3af1eacf47a068b130"; + sha512 = "37159206d5d6533b431ed445bd0fe7d22b654531a4f0f9313db35b8c2c55345d1f6cad18a1711aab6042a082324a843e3362a1399ecb20b3595575dea356b220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gd/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/gd/thunderbird-68.8.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "43b94bbd76809f67078ae5248df2d25b399be35ca7d5261236b6149142083483d2871edf17eec7fd42812fa8f5d775bc141ffb8d0fd43d14f39d3d150dc83a41"; + sha512 = "b42fe49465f0bfc3d950006be6d6422f60572ad3e6be69e0bf78123e4672d5e93bc1abffc51226608a23a8786cd8689f46819cd1e098f38d94b201038ee7bf5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/gl/thunderbird-68.8.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "be4c49d737b2b6bc1a19c0e63df9558c04b448be44a4552fd4fe3d3d28d8cab59bc1bc05cc72acecc8e398fd75ef9785e61848c8f3e39b55b7a534dd337845ab"; + sha512 = "58be0afc433eb4ea47a2467efe8470cb710b56624cb64c308a7e54955b2792fef72b2f697e3055f86faee51f17a4e111f25f23e88e2e48f2377474e59a555d21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/he/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/he/thunderbird-68.8.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4f0a83e57ac97d3e278c727f49ffff615333812dd9708ebbdd687fc35848be8074705aca6f09b5bb868eb6535c61252272729241cfe46a96e500f7ab6604849c"; + sha512 = "15c24a2abfc20cd8ce7207f45707bb691b742ff07aa90cce1a79dbc20199ee06bb6f80d2db7cae521672678f37b824c567cc21844e234bb4e132866da490389d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hr/thunderbird-68.8.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "08a8f8d273b1fceec0151813439be41d6ff1b2b42b28711a782caab04800e1acf61019f0fa8c7be27036ece8184b4b7f587b58f436c0eb8c73f35aa13be8afba"; + sha512 = "c4bd90516b22c77ea3fe667d198dc9e304b06495bad96715ea90172488b09083920099d282768d11ff86b1518cf0a9d56613c9243ab7416b0495addd85081822"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hsb/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hsb/thunderbird-68.8.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1f64e9193fc44201e7bae329af94f7c18e6c0c0d30edf01b66dcca43e996f12622e795890e394c207ba20fc84198836b69e2fb1c61ae83c1875b1e424b5b3b97"; + sha512 = "e1ff1afdbb83579308927301e683d8c515928ce3dc50ca45391c81d9f66c0af8a61ca4ae140634760e0c0e4f3420a560e837d8490444282b480aea6c23ed92f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hu/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hu/thunderbird-68.8.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "4e8741809e8eb3b45a7931d4f5bdbceb1e7018a4f4cef97d32d16d00eb3713d85d70a2a4987830f1480633b07fa839cc8ed73fc1fa2d4b3a2944cf03221a3240"; + sha512 = "aaed51d4181ff7bd6eccd9801a21a653926ea448d8049c5a52a897f83a2cb463444e1f12d5c6d4a37b69a712a1bc5428a12d42eddb823c4a02732264fc5a1c1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hy-AM/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/hy-AM/thunderbird-68.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "07f817b7c3229ea993d65861b75c21f37e53e20db2645e68c90a1fc87fd151603580a1ecc67c9007284ab21167e781581a7727a885b760524ffa7079f44986c0"; + sha512 = "5df858d448b72d5a6f320048df9ec3cfb8c08914d7c7b63006eb01b1dc6c77e9b7487a951be7e89bc41922e9c3bb9087298a55ae9da146291ea1d284967bdc6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/id/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/id/thunderbird-68.8.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3753ae5cd20cc6a65ff1b1e5484fb596dc08d1a08e6747295904106db0f231006328e0a906d0f2d7fa98c53352cc61351eeefc32b8f35bde2ffe1b8c800d7640"; + sha512 = "3ac1a1acd6b85404594caa11da1be1e55a980179a027b23fb323fb735c4d3bcf1ad12d25608d0f1ac3a89c30cd73a81fbb031112822fccb10e93d0c911504451"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/is/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/is/thunderbird-68.8.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "26b1a7169221df476224ca5e1d9e5b97e9cbb8d84bbc12fef19685916f7b8e95e784aef6a86e7fc0078f9bddcc617823f2ca2af9de4412431e878f6efbff6fb9"; + sha512 = "fb9569aa59fb4a084fa1c578c4d1ac49765e2e1a5f8a2445081797999d6c877b2e4aa13879d03b54b3f885d5d1054647cd891cc38f7e54db58b5c58b7e906486"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/it/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/it/thunderbird-68.8.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "96049256ede8fb4ad1a6f20e3bf2d8513b21536c9dfd2acfd1679c41d25cafe5f938ed7cdc2bd0b11bdcd0a13d730f1d8056e85791211561ad4b3c1017ba23b7"; + sha512 = "0c3063e9deebdb4ef1bd08f0d7c0208fe16363fb87c7de0bae772987fa5a3800baf723482506c5957ed0b641cc04cdfa9a80e3e200cacf0eafd9b5fc1870a3b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ja/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ja/thunderbird-68.8.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "df162eff6af3bad1cf1a9ac359f977410f612885f005c989e928af3464d3cebe7511712cdea4e3951bdf4a69a40fc68e2b4f5efb35f25375f04bfae79ab70eaf"; + sha512 = "bd12eb6ba2ac0c2c7caab313b726909ba35b2eaf21d70c7df98bd970a18e943042c69b7269a038f7edb852d0036cd2e34273aae77a2a4e31dbc05b3c61ec251e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ka/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ka/thunderbird-68.8.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "74186db28403463f9bf8b41242ce7122d410106c21e369977b73d6e72aec9bdeafb3b47665b0450f5b5eaf75c515759e3d6752d0743a2b598c4c7158c47bc7c5"; + sha512 = "1ba48f3544e179b75c972c376a2dad256b7657124af9b4037cdef8a87bc0a3e237be79be8a53cf5286f6f5bfd048ecfa6f09624d4559bf5eb38432b4864995ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kab/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/kab/thunderbird-68.8.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "933fe5f2ae31ee322c4da4c985ed775f8a15b0290f22c2e9e6ecce2f856b0d1236a78659ba3909c9ef97fd4de9634d1ed6aa452174fc987ccdc42b0b65de565b"; + sha512 = "5f598ae0de491cf253860c87eb80fa15e1fbbd06f17667f0a78747f412ad8fee9b4a472c1a89f096c9e765ad289ad8d80f86aed50b538e52c68188c41caffa3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kk/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/kk/thunderbird-68.8.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "b7ae4f00d7c91e8609ba99592feedfe8f53d4257eacf0a6f206cf768cc4ba16abb54c86f9865416f617b1417601ce4408ba939d065a0a8d3e95aa38ae17444bf"; + sha512 = "7e9d7cb00122945a2b74650b71712d1c761cc6df93de74c11812f0d39d25666c911beba60eba97376d9c1212ad0604577cfb46053052be420da1d2f6d53ad445"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ko/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ko/thunderbird-68.8.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6f2d017af8755980f39fefe0d78b22115f33c7397917fb713c8e4fe34e88c7f4d0d6ce58767336dfe3f99d3b4a06b34305f92e4d414fc755a885c954eea97cad"; + sha512 = "5c4406cb82a5dc18235d158fc756eeeaa51bb2e791663ef00d315a56a595fa6290f030f0cad726a9ef98706a80146fe63a3cd5d3edea6869f7ceb4aeb1b7676e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/lt/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/lt/thunderbird-68.8.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8fc98daf3fe5eb8844d02cb56656aabd260d309ec6ac59055ba0f10f7470292bf942be1647b038103ff99c12cb34e3e03bad2fc8dfbebef0e356ecbfbe93b354"; + sha512 = "3bb3655934068fcb965fb73dd8ff455e48ea4cfe578e0f33a0c442f1f001731aef9fd3d426cf720b9decf610192d1d7722f408e9b8362e25932c3715e396ae27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ms/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ms/thunderbird-68.8.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5582840bff43eccb907187930286c47c54a10a9a2af1af3e23b61b5ad56ed3eff32e9b488f00a1e2fba7a47fd647e55f0562adf4c01b1fe843f8708e1dee859b"; + sha512 = "0c6635d9e366a85b29549ba3329861d7912f9e1493bc7becb8cfa0225980c0c67b8e671f4f841a5aebb17e123ac4d38aa90ce9cc0bf72525918557a474262931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nb-NO/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nb-NO/thunderbird-68.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "aae8ce8c919cc9621e99af620959427e732d5bab1515676b9ee7b7bd2a6d46af7163677f6601a52e2aa246f619b2206b7239663660e4bbe8dd2ab558e55c073d"; + sha512 = "2c9cca7bd403a0a20ad1911d924555612e8eba7b572d4ac3cc3d1fecf3ff294c729147e77675be1f1026702b41000e43b0930815cf08ea03f7fde757266bc15e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nl/thunderbird-68.8.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "7d166e84b3406ee0c5caf2309aa005c22779a78e7074f4a061b9e6df50722a95be3977802fafe10bc367f90e8a4e77895b28e2b6a2650b066d2d644962ad3557"; + sha512 = "a16f58d19f6ec59e9dd557a3b1cf8cc22326596d5505289b93bcd04e801e551608a286df03832e4711b91887c9a408bf36364e9a47be4840a828ce53e0f96f49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nn-NO/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/nn-NO/thunderbird-68.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ffc39e7398220dcf4deadd24aa63a0838326bf2b24c58d0507c00169b322f0e56c5d803c1b78c9bfbd8aa345122c928fe688780e6d5ef238de9e399f40998bfd"; + sha512 = "10a0ce11cf64713079143cf8f357f8abc5001e9d285eb56b4c7e9f4f560d660de7e3bce544b7099e588f599a4a4b1c73241ea5e542d149d41dc8a4ccf21b332e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pl/thunderbird-68.8.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f6f2302693af1f466733244f1cde764b0aed0b64afef085e91ba9f24c341007d8e8ab4ca58e777c307ae33bc5c1a78670317393b601d6fb2851095386d7dcb1b"; + sha512 = "8a6fec22b065d43ba320508992dca6d21f0782d4c4c28dbc6721852029f74c45b1451002c03f5deac70f09f3e9d07fcb161dd1a3943239231d10da4b2972f7ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-BR/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pt-BR/thunderbird-68.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f14380f5b22e9743a0e3b0c390ba4ea1decbb7aa85c1bcecd42f967e5f90416f8904b28b3c5f4b8fcebf55fb07505b96d9b9d8a39d99da5f8725b6bf48e05ab7"; + sha512 = "d57e6e42fef8a13bbe515089d2ee761509f464cc0a97a984e369bd96022dba7cd15dd40aaa9715b63531a161d708e06ec809bcda56c92968da1f11f5e66e62ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-PT/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/pt-PT/thunderbird-68.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "215fe20e131557f54091c80e7b2c09c07bcdfb57bbc145964ca37e66b39add37348ac0a08b6c46a6186e25a864447c8cbe2f485fa04687c4cf8e169a731bb8fa"; + sha512 = "064d2b04a60bceb7e300ec5f71e13fd1dd427bb89ae471760dc1933c574a36427581bd0d671335e9f52cdfc33f6b9addafcc703a093e2223d58e96e90982c491"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/rm/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/rm/thunderbird-68.8.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "dfb3e49c940b0332753fa9d2347ba833c8243d1f006fd7e463d514c38cd27a14069ccdcfa60847bc6bbdfac1cec95629a2ae699cd702ef1f40e4898fda4961f4"; + sha512 = "4a3025096ce81672a45de762c2ec2fa43d302310206fe04331fb6bd12d73e49427c3a9b9576f39fcfedceaedfa4d44f044b26245b15a8c2ef2fd8e127befe70a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ro/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ro/thunderbird-68.8.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "57d7bc23aaf3365b1a76f1bb8006f725a620d14773886dce9aa9bb4625fc062af08bb6bbd40248601569d7aab2a31794bbb79f7b208f36507c7a919d14872a8a"; + sha512 = "7b28416c0e2cbf248a7ab9cb6d72b5280f7e60f7bf8925a45575afb9a549dbed39f38a9d9984864d7c9dd246546b7597fa51ef7dc14597330fc4cd80cfebe95b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ru/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/ru/thunderbird-68.8.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5e85808686c79ebd323990ea2957c10714281d3f0d4a9b097d2e3820769bf1406f4400ac541eccb5a817a6aa639048d1767c2cf4bfd56a3262ac83ce01516275"; + sha512 = "da97be95512ca48f688ff04c701bc7a0e351ad979f9c3ecf2c493aec79f694ecb09cb5399613262b90132934d6600852213d26a3281b48f1598aa692d2e13bd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/si/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/si/thunderbird-68.8.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c4b3b8d62c0369c95c7f498eb319e839688b27cb23a49d15d9a4e15251d7555be7f65ec9a7b19237921dc71ec6dd5cbec02aa4bfc6c16382f917e0f66b1032bc"; + sha512 = "d97a111b90bea06760ea58dcafdfb279de340ea1cdecde008e47f9eb101e77e39466890e70f874bcb7f6061de96ce32807476da7aa97c867bf8d9ac4c4d022ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sk/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sk/thunderbird-68.8.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3cd7c89db92dee5ea3ce44df89749d5822659e7b83bcdf56ebcfe0ffd295393c9f5acea5bb836b5bb0a0a6a69e6ce1406efb39d2943357086e14a3802d9181f0"; + sha512 = "f35670ec66342aa95c50d5cff47a9eff9faf3123174bbf5cf4156bbb1fd3ba98f47972328c0c33513cb92767e0a5dc67550a4a3259981c84b1bca035731544d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sl/thunderbird-68.8.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d08549134713d50842b82d24ddc8f8fb5ff098c41d3baec30198e43435ac73cc620e7d9375a9aa9622e991c38e4e36241183a026b6aa63420038694d74833180"; + sha512 = "49a9f388c696c1708b0bf76dbe3fb7a2836c128f6d40055c585f83c0b62b84b5efa3cc4e2c26889846045340ed8bf95fead053e79b8d7064b1488c3d306d9c94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sq/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sq/thunderbird-68.8.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9c6849fa77de94df39d9e2615aa3392dea0f8adf7e61b0171243fa202b6747a4208279b0c0ce4b05f57544caa69a40641a3b145726d304df549f2b4e75d939d2"; + sha512 = "77e9090243b04cc1f0e3dbd074f55f40949556f0284962d5a4cdac53f7c31ca2740fc71602d6eb7b391f0ad71c9a8e81e699ea94871f209c5771745241783698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sr/thunderbird-68.8.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b52b146a4a54c4987d430eae6d7e922a0a43e57d38ef2956e84b4ab50bae2a896ad1350f98171f57b2e4cbf4a69f0b1123a540e4cc582721cda391b2ae7c7616"; + sha512 = "9fb67b03585edba5b1d25d4d5667f1cde44e53b7b9c32730fa294e2118698c63527c0abaecc90b2778943490f9167d8bc2cd4bba2aca7054a592fe653a11c759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sv-SE/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/sv-SE/thunderbird-68.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "73767026562ca540c6d3f77792a29b55938ba5d43bfc59d5a020809e020cc9e7c9fcedad8f0653be71e54c44b54374aa1e1d4f5a6e44a40436cf0a9b59e484cb"; + sha512 = "d8aa3a745266ab30aa8c32c7ef034576ec293a02f214f8ce96beefecba877e2de3b7944aeca9a218dc587ab77b95f327a619bab5c192857327810c6e81e1b05f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/tr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/tr/thunderbird-68.8.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "4ce31c5bcd8075d3f6edff2f8266c2c6546e4f19b8c00486b4dd15b68d7ea898b6e76a5745087c0c4a41b3462e4d8facb7ee0e9e988b8b76ff2374206fa3cd62"; + sha512 = "56ac7582ffd7fb8c0c8bc02216c2d0a5d4405e356385406c7fd6ae545d128c8c18488e75ea8d8d63de9313aa48f2fc93f3e5e1947298b2b32937af8d40c0fa51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uk/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/uk/thunderbird-68.8.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "affb8eb4049a2452a4f17a405d6228e6debc87802b77bca55848b66fe136ab0eab6bdb64817f43fc25652109fadf1dc830fd7c22339702684916d7cd95147e1a"; + sha512 = "d783440bdf153ee044204f1b1739f1fa771bfac6d8ed4c5e6fa2b72d406e3c50b3e76b5f9b644fcf5b5e0183584a51336670d5788a949070994206db7187c8e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uz/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/uz/thunderbird-68.8.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e4a6abf7ee0d6c2c0c7484911b025cd40b4f2d0fb5715a6333430336047deda5721f19abb3c5bf49ad3d16b0d128a495525fbf0a23bab7b1bd8ffd8539d17054"; + sha512 = "7aa40bf1d31cc59d42f90f821b75a75610ca2a66a37003d103f1aaa83d5897388599d41a61346f614db7005bf14fbe0c45cfabbe3dc304c9a2704d2c5466362f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/vi/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/vi/thunderbird-68.8.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f58a50ed7505be5903af948025cc2cb15cd6a3370fa6789f784c3d2cf512f7d51a03d7961ede14e6ecad87cdc207932c90741cdfa7325ba67bc44ff150f39b53"; + sha512 = "ebe1eb9914f489e679d7b4935681b3c5c266e5cb3868507f662e1b4c6a5f791f8a653f3d1cf788758b9aed13fc436a76b20b80fd293563f25543af41372e2f7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-CN/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/zh-CN/thunderbird-68.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "609d4b4cd3ff7f1501e7ca6e247ed29e8376b8bafeb140cc134565fffaf65b6051c158d8f4b90fa2e15b3aeb9bb92897f708a00d666ec2eca490c7dd856b28c8"; + sha512 = "b15026fffffba21ef50c98a8fe391a3f949a300b104d9d238c07d154d4279b70228e261083a00aca529f69739d3e79a36da3919bbb3cc19043faf182c25464c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-TW/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-x86_64/zh-TW/thunderbird-68.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "78bbba535a4cc284e7fde8c96739c29fb6998a5aa71a4ba424121cbcd0a44168412e54a0590cb6a1d7d9bfaabe0ddd343ce4cc4dbe63e4c88d99451ac6823143"; + sha512 = "d5f654661851b4079e7fab3f71e4135f8928d59b822d87e8fa6cc8388fcd5aecc067a88790c27fa8bc4e7d95ff9fa123b8841efaa0e3eaa7bb9e97a50e2c7076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ar/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ar/thunderbird-68.8.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1e5d29f706216ddcc8887e17826af397b54fbfe75d4b5c14a644e6c834eec60522ba401392977aaf40a6357713af68f274442288a01db65430acbd7549625c07"; + sha512 = "9608a6b9e2ad0fa3853f413ae644d5a1c9cf56432b3fe546ad9fb60cd6fda2f42cd8e1a4eff5ac4acc6b95817d03107d248cd6971f049f7f1d95419a3125b0cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ast/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ast/thunderbird-68.8.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "24bab81e6d36189635ae8f0da6f0153f1ef32eaaee388dcdb9f9cb5049c586b01e8de2c79372784645ba42749e48f1d77f7a91c857df69ff72566969a68619dc"; + sha512 = "1e06d68a8a7999005eee84e3da15c23c2bfc5b4fd03fd1c5ff9e8100f64f974bf894bd62e974d52db4ecf8030dc41de6446f797d83a62529679730b0f24861cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/be/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/be/thunderbird-68.8.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "70a4a9881cdb15b68c5fdcd85ce6234644119bbeb1a3dfdeb47899515303bc65013cde6fbec7d4b2997acca18abe298e9fcf7c7e236931a9f06b7f9c4a5032ce"; + sha512 = "82122ff9a1b1327bd3164f1d7c8d18e47d63dbb2981765f7fa7499ebf26f2937f714cddf7882c6c47a6b4f4a480e5a43c44c35eb7a4769988461945ff657e48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/bg/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/bg/thunderbird-68.8.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "80a0c836a7809ba49d067fb76fbb639d653f0a38cd77034d3265807da06c3212eb5c7cc522793fdb22c80be65f763a25ba55775d67a6e8716f7ece9dfcd6796a"; + sha512 = "1d95aa7716f43591943be6f2f5eedf502cdcb5f08d262e359e3560da7198e9108052d0c5bc5b5d594fd2d8a2560f9332acd661f518c1e3f534843d65dffd02a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/br/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/br/thunderbird-68.8.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "81bb47202578f138e135c7f4bc30af3a3ccbd3dbf127dfbb47bb6ff4fbb09c2fd54c68bc65d81e5c3e72cbda749bb0d69cba442e0f7a5336ffa6eb10ab9af4a1"; + sha512 = "6ee97fb0942474747676c191c25c27fffd91810b3ce3d4ae24bac25c3dd90b99192210c242192d533d6e85497f3d4638b0c8d2e939bae93f4dc1648c6b5c9dee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ca/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ca/thunderbird-68.8.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "61ae36d17fbbc8f91f517992966b59a687ce6e6c72f18cc3a8e8c6d29cb4dac18a7edaea2132bb258e77a0e6690df622aa35f9f0700d713c6411ef4363ba9028"; + sha512 = "6b7a0e8b8e42b62585ccb333c16ffb19337afd2d68c673bb364f92248248a814ca57d6409a49959d2b8fa7bed1f9031bad1296e24ee7091e62b78a81c059a0bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cak/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cak/thunderbird-68.8.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "eb0a3dccaae4cdc70fb3a1f5c25cde379ac3d9be65b3125428532ddd8e4ff8c7d65733a2eb101435ae14ac06d1a4ea32c1cba40d8c114b4b8025287ac7fa85c9"; + sha512 = "faf8b1a06ffc96cbc6a16e09290652f7a9c270d8dae4aba0d5685d250f8686957341b68459affc8215522cdd6166d1b5e7c498713e9ad8c981d07a97156ca4ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cs/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cs/thunderbird-68.8.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8b8cdfb5f0449e48ce50ab27f75dbb9cdb05ecc9df58dca52be3b72dc523d06248c14656f4a072645e5292e8b06a82b274307b7d4dec99228de7353b539937cb"; + sha512 = "5aaa310e3e67b174114b6c440cc1ceb2b7d0d934b10685ca89e3b7a1cc859bd026ca8fdb8607d70da16c039c853a9f1f11ef94701c90172220d988da03e902d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cy/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/cy/thunderbird-68.8.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "a265e96a1ba45a57999a905f21e45edb457004cc2a337d2b84e2d55d2b2a0f71d1f20d524701a2287f3038f76fd814b051d46b1f130a40713d745b701e66570f"; + sha512 = "7523a32ca26e46cd388142850c96ae256fa2e7774f5552771b3ea13a2b632feab637a2552b762b1f4bc56b81f92bed3b8139e994b46b515e98070115dd3624e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/da/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/da/thunderbird-68.8.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ff53dc463e51d14ae4cb7935f44cf2d2624e98469d7dd1285c7a8c512ee8c73aecf0067c6a695024a6e0588b9f567ef3ed12ea9c72bb6e525af348a52144ea2"; + sha512 = "0b528d5b0b4838fdb62e49c136f1d997ecfac946154a8c5515ac22a542e7c4e00c1a44dd8aefb4e20528301001d79c88e3fc97b60a10674ec4a3562c0807b508"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/de/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/de/thunderbird-68.8.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "aac47bce113450818c44d4c17f05be4a57bb33a7e41fc1fbf50b9123ebaf229d673484190538c6fdb6b1a02ad42e33f1644d4ee625707bd3776eb86e023366b3"; + sha512 = "792545f3fcbad3cb303bb5d91a90788374db1d41962180225f7d1ffaced19dd8b4352d36645df06926347dc31d6ff00eb0fee32efad27a15260115896e7cbcb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/dsb/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/dsb/thunderbird-68.8.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "35e4a54a82175a1f214a87718800a42743f81cd39e14971da9729cdcd863dbbb70d61d60d58387951cd3e470c764df22b225a4cf9ce894b97699073ca475d46e"; + sha512 = "105c814511f32d85ede8c1991074bcde6ce72eb67280a883de13b69de4f74c4f97828dc3e5c170b1346ad22b4ad8b51329c3600979ca468bdbc444cc49b880bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/el/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/el/thunderbird-68.8.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b919a771034e06e8b30ba9662930d7961fab757d2d6dd4603239063127702051a29c6401a983a0d0e4b232b16cf5780f8d1cb53037a22b0b2175653eb86e893a"; + sha512 = "e7000a3e243b77cdaf6b46cff8380dfd1ecad3d07f69566f5d34f8e1ae15c582ef56eca8227fc75a8983bbb78736e935fe94dd1e7814e9b95158c9620985da4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-GB/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/en-GB/thunderbird-68.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "70c979be649771596478d0ec9f33398baa862e12aadb5369af42a62c732f1cf40c3e1184ddabd12ac1cb4b21759d2b00f24c59e7f89ca6e221a62837813f9785"; + sha512 = "87446eebfdc281eac83e7ad67900d06a2088b67d809f6f5ba1551a069a75d4ec4e642a241954671800ed4900b2930a11c4b8080fff06888c78acc0521d50e39e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-US/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/en-US/thunderbird-68.8.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a0750ff269b11f52d8b001274257c7e4e35fe356e7ee0d31bf929c9336e7abef5f8670d19541f45900192ee72417d8b90a388e17896dc279e78a15c5faeae929"; + sha512 = "644a6d2b6df53d624dbc26301640d4b5f601f60fafafbd4a1ed07583d9258f89a4276655686187e09268c25dd9ecf1d8400ba3bc7e6c55d21dbd19a034614bca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-AR/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/es-AR/thunderbird-68.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ad524e9198f42cc06bcd6b6ea86ba64b4faca80e9fb5df45e34d49997d131973426edde698d3e6e9fd89f133e527ba7089f1c5b753f6614e597a74b80edb5626"; + sha512 = "227ddddf7bbf47527f8911b122d74f9c718639a3028ba56a22b2c93dd665521d82b543b0b0814b5bf1923fbc6ef2b39d52fa60616c1c5e5474de067b762c5af4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-ES/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/es-ES/thunderbird-68.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8bba8a570e58ba7e3091af1c1cea4fe6e4cef3ef2bd0ce14ea13087c80d3c01efe43e60497977be6ece54ecfd92d0f6c30afd0d561129e7589c18bf318e415c7"; + sha512 = "746cc55bfab6a7c71282ebf63738bd7f8c8cab67a01329a3d125a84bdc5a7c210958a52881734315612845a0d386baa75373cc26ce9c5f51c7ccbddbbd752db2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/et/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/et/thunderbird-68.8.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ad6b225169aea7b8634b57f7d1afe04b99a358a9f010915f2bf9fdf898c0f6dbbf5990e114a220584c1aa06bf750c9fd426587c07292dfc7082caeed1b5f7cc4"; + sha512 = "655bf1fe4942388f357d89c2e7cdeacc4c09f95e3c7a6e25d3991aebd571c6270d45fc52e4b80884c87705232d8113b50f28d657abe49f907878187e03f6b752"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/eu/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/eu/thunderbird-68.8.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "73f6ab9d2f285f1848f25af22339988b2993fb12a9e458ca7c6c67e57aaf53b660e182c4a99f6f1a424ac0336fb7c9e5e72209444dc4e99a1b74df0062e61f50"; + sha512 = "4581e53d1202bd5fbca9b20979a71d51752e8f1883855510722f499489fa40d77070bc71834d371843e6d5a601e0bde8a6c86a5c1c9857a1150a792ca9aeebb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fi/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fi/thunderbird-68.8.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "10f42882594f3cb3bc02afcfdac7171139cc11915440b7888ff9edd2d9b0a0a2cbc9fa6faba0f8044d085397e6a7f4fd4b5190990e5f67592ccb85dc24f0cc9b"; + sha512 = "4109ca4d181485ead1ed865b101787c6d12879764fd5c399f73eeb23b157f09ad12f237d8b9460634441601d51e5cd4a3365657e3269aef614b6306339a3682f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fr/thunderbird-68.8.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "bd50ba42353e3cc3b709d1f6f0f16b998dce896ac2b08df9e75eee715e90df5f84b128861af69a2587c1b288774b273d2ae2fca6337723e105fe6b42da0fdaf3"; + sha512 = "53437450a3d67c79c4e44a223e846ac59eb2c534121e923649e0c44891437d5c180d15b43a00955706ada271ecfe651f1a9ca1c1e28830b200bbd6689411a536"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fy-NL/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/fy-NL/thunderbird-68.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c5200ec273a85489e3975f87e0050a2de6e2033f7e5ef1bfe7416c4cb0abab8047cbb04b6b8018adf2d9ec9c2a2c362317a92bb90c43c2dab52bb4a8bab50ede"; + sha512 = "5c9cecc67893973aafad3b2eba78e82fe459b70a5b467fbeb9839ddad93371b6f6d77f96dad6f7a757821645d680f561f1cda45a360e556229e6202d60f2a75f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ga-IE/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ga-IE/thunderbird-68.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "cb4886d2a9f20f6deb600dd3338268b160934e42a0b73e74600c35694c83253bdcb4d77ddb5292294d38da23801fae7559dc6601fa40b873c7c71e2cc64707e0"; + sha512 = "2e23ae199d505493dff47191c599d116749d7d4d362906ab9022e1cf3b06d41694247167c96a3c92d58fc7e6c39e850773b7a2dfc2e1a8dbc63385e20a4ffa87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gd/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/gd/thunderbird-68.8.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "49fba7937ca3ab596ccd656267d7ebb5592623a1a8a9143fe25f84424fb2a9d27f72f3fafeca57e204911208671e9fad7acac97d4202a9adf89a7640ba001411"; + sha512 = "1d703587272271a8787c0ea6020888b202f5f07f529e8f5e448b57adab781946625511941d37d6527e52d027d02be121ef8e5b0d6ff05494a2aad775bfa467e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/gl/thunderbird-68.8.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b80131b5ced22d861fd2e6682149e2fde2d3106d2b4d4f528d8620b400acda0db497500bc489b7806a942dffe5001798a05a440d0b00a56879ccdfe81390d353"; + sha512 = "7f07e56433349000859c8dfa420160d9388c4fe70494f0b614b9740aed4cc00f17f3be475303a74a5ef58c16bd334dc8fa8e7d73d989202841a171afca4388bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/he/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/he/thunderbird-68.8.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "601f99613725276d801c8d0dee9ad25f98ffe8ccba42620551f5a41e02b6abede34547857f43a265f12be01ccf4b3e4b4479e1ec6f8ab5d3b5890f230d4b43b6"; + sha512 = "2ca1b2f949af32e3af1fa80de361c2d35bed79e7e832dc4d7dfa3b3ac3866ae0a5d7c1fe22fe2a49f4d92f4136abb06cdccb44daa4fbce41596a8cf3f30f3711"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hr/thunderbird-68.8.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b9c681c4b2edf89f789cfd6bb703670aa62d8e48bd6afd8147409a1154d01f1b59933acdcd0f1f6b88ddf131031a64237958ffc25572dc818b1e06f9c8cace4c"; + sha512 = "cc01c61ef5c2fd136283b035b3baa282b57643afdc4feb82e014475c6afc7aae73f41b607e16a19367b010fb551f39cccf48250bae6650cfc2882a40e8d59d00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hsb/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hsb/thunderbird-68.8.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a512ed1d095bc1077836486aa40a6f223fc2c37cada6bd59d5ebafb8bf17d47bca0acf7ef007dc6adf8141db2b81b6a6304bc85b36b929bb2b1375898e67472e"; + sha512 = "abd12a6378f51ef7ec3e5f3cfc4b5f5774a7386887bd39f0d4cf715483810436f258e80753eccc204eaec61f602e90525d63f027a3ac264127eaec3261c30cdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hu/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hu/thunderbird-68.8.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3333452d03a2e8436bdd8e7ed0195553d0dc86e74d55903aee4484d5e920bf81f979c4a482d5e44be6dd6bbdccd85d7d50dfe5d58c6590c5ea95c8b5164c71ac"; + sha512 = "d4ce5b41a15b40539bf123dbf4f075b00da495007eca83c9c49c5ba5578a0744fd3e38ee71d6746432eb8ef79490ea9b5991497946ed6246537ac4d592a85b62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hy-AM/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/hy-AM/thunderbird-68.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "e6a01f614533824e9d69a4feee3ff483ec57f42415a1854db4125479d38137102465050de140d113daedd6d0a4ede83f5c3aa5e9c27fb77f368c70079eb90c44"; + sha512 = "caea7744d3e7d5e76ab5bfb98d18ce27b869f8f3c8e8be206ef4ca8b34819ba8a552dbcbb409d53cb45ba709288fab550f2f46607dd8f67908272be3b64d55ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/id/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/id/thunderbird-68.8.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4c505da3cd0a57cd0d24199ad3df92b5ba28f0bbc3410e05000f1fc7d93bc0228b6c16e1ed4852d84e2f8bc25c15886312bc471538ec12ad3fcfc8bc7cf1f852"; + sha512 = "a4e7862dbc71b7af2eb2f348de8632ea7865408c72b8ae6a3f78aaf97746662020b61757072d49639293b529395359e35f459ee11c4f37cabbb848fc363fa16f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/is/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/is/thunderbird-68.8.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0088ca68a63d53f242e82c3d304417a3503a78301b6a4c1198671e55b5fcbcbf75b874ed783ac907dd5ed3415b955481fa699e0aeba0062de7de58e4ffa0eee1"; + sha512 = "cca9db1eba2143dc567ca454d33b7c6dbc7d1d3d3daa858bfe2e2db1910b8260c74af0a5b5cbe53d94487d42cd12e7bab143deec5dab33c2bd14f889f2ceeaa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/it/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/it/thunderbird-68.8.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1f70db3fa112f208a395202b18387fafdd8abceabce2717d33b295cae441353b759400d8ea5aacce07481f841523d932004105eed61551ec6271c796fdb6aec0"; + sha512 = "185e5c4246f73bb5fc46187bfcb73ea1bf8749f67558bb162f4557e35e8657ffb19b61a04fe425b7bad32c20bcbde67894848422c350ba38a27c32624ab0829b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ja/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ja/thunderbird-68.8.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3e43f8d7e52ffe9b7e7b4817756997f68171d08717020406410ffe999a55c9d4f83f1f30c7cedde4732923bf3ee3385828e6d0ec49f7e69d87cb97cd9f083d25"; + sha512 = "1ad054c656cb4d4ea906603aef9370014480f5bd4041d56027fb0f9602f5aacaee709e130fd29cf4a0b1fa638ea52085eb1b86e27e38731da9b22f5b69197e15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ka/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ka/thunderbird-68.8.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "3a1a8eb0c49bf963e9586c42128d2574dd04ef775749506e09f4d8d8256ffa5690f5c5e21d1cfa304c298388028e333ea5cb1964b6ff9b97a1f17c00e581ce3b"; + sha512 = "366542d5b1ca00092fecc577d92111a2db6bc7e3fcc66753d91fc971b9536717494c13a256ccf43522fcdb9964f629870a327488e8201ef5185d6d6e2fe2a1af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kab/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/kab/thunderbird-68.8.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d977575e4723c643c04209a875f15e6b7a00133c938dfceacb4a896bb65846348511ea2078971eb3b8fe413c484aab035134411d615d7c153b69452139d155a8"; + sha512 = "f19a99f2824cd65a10ee264ddc8d21516dcbe2c2d807e076e8d137b56375237307d3adedbaaaff5a3f88a1d4ed80faca292abb7941a349a42bad6207fd267ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kk/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/kk/thunderbird-68.8.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "5cb567862e9627b9c684045dba9342afa6f1f78064a941f19eb90e8c6ce30d102a611dae85ec3c6ca271ec57fe0fd2b7df07c1aaa8f5bc93c4501cfb0161b55f"; + sha512 = "12903b5f1df5ec077c5ea7cd53a8cec4489613fa87862bdb594819b87d70be76997f9b9c825e1335a3a5e785a070b25f75cc2ac19dac726638aa454822bd2a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ko/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ko/thunderbird-68.8.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "e3e83cfffcd472b22f60c3e65b458e534c7c76d8c6b637c69b7e1a062b11e3c7461cb8f3fda21e7f0f3a9512c2d713bc0d40a84e235dc6807ed6d7e96d9a4095"; + sha512 = "d246ac4a6f110075e7efa1da523e1a171d34415752536c8ecc40d296187d65e589e1a9a20e3da93813dbba058c6c3d820ce93f8473c207190d2b58bda6496326"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/lt/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/lt/thunderbird-68.8.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5f1438e9c1a71dbde9abd06b34c8d384fd3923ace38ab643fb0b16352c54efa94db83d4a86573b59c7f9bb418e23a6c158f3a3744b2114f0c535cf49e90f3439"; + sha512 = "cce06ce9899dd9cd50bcd09f2699fe8fce1a08666240bd997cf03a813befe4c1e15823e4e3ff16148a301e3725210a2bdf2af2ec72b9c55c470519860454a14c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ms/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ms/thunderbird-68.8.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "87e8e1fcef966a7a14700ea4113f28945bc25eb1351a67d2eaf55b9d54864de98cc86e494d3ef81a075c9bda8f6018ed3273796e422dd304abbfe1740ad4cd2a"; + sha512 = "f9facdfbde7ba320c9d16ca41194fed7a0b7aec758b83c57c64fb2a778aef90ad9840f0b0dea838598d8786ce5318d7ea790048c877d492f1f6f77ea7ce5ad44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nb-NO/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nb-NO/thunderbird-68.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9ce730dbf2e80c8badbd9c8f3277648deb44b00fb44d367bfc9ff8894ea7a945774aba9241300b01b04617040bcc82f7e65ae024483205a707cd1b63f585e0e8"; + sha512 = "994d93d68806ec039ae59fb9ef5a27a940305ca7919ebc427267affc797e5b386cf96d67cbacff0f708b659d4aec8692271f376dc4eb56e510096387a83af0f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nl/thunderbird-68.8.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "aada9422ada20cb8561da823b6a240a30c155cea774b369649f8423f6659d6bdee0d2b6ecba2dd0c64837e04e6e6a60235a588d1850fe5ca8a6b7a9d1dfa5fc8"; + sha512 = "8ae07cb28e0f777b79c005e0c6848854ed40f072f63b98d68841c3aab4dacab04d90131e4c76c65943eeee05ec01bdf79c3872f0a0df1b10e02be1707e2709ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nn-NO/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/nn-NO/thunderbird-68.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "adb4a038f4cd87ba6ef425911eed240adaf23a23d8719b5401b463578f9de7ad049a76ea1b9b9460afe7b18aa86a9be4e39eccfa42d0be7609077fda9c3381fc"; + sha512 = "994e22db5edc1d1b6ec4f51dbbcdd200695e468aaf7cefa228f54c5ec4eca7aaf5faea8afeb1efcc1db5dd221e2022e666bbee65a685409790dd7614d0dc4b20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pl/thunderbird-68.8.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "40fd0b0123f768e66f669566395e151a696a54445daf5ac30cc6e4dc42e1aa20545c12ed29bfcd0b3881928242b0d12bd7426497b7401ae6876a1a076a6d8dab"; + sha512 = "4efb0643491e7b469e277f98d16f106e046514a35a3f33d30ceb25809a037e521639c2c5c6304be6716fc9f7f39c216dd2ecc204d47f81bc9d1a3987808d8ac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-BR/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pt-BR/thunderbird-68.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "603f026cce3a097fc424e754393f9699f3a8639ccf8669e58ffde5eb7363071fc87ffcb2fbf1f04866cb403a0d08d3c8bfa801a0ea9e4290d63b106f657d7aba"; + sha512 = "008c6291daae9eb05a981db2e5931fc5a2b72c55b349978dd3e76c8bc632ef95b78f94af8934e2e89600877899218acd1352e910ab128e8796a30eec4734dc91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-PT/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/pt-PT/thunderbird-68.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3fed3c60cf4c77bc1336db22c65a0f84e4f2a4ca0476f016d289f5951b48e96394365c98e5025b42d51b8990a46151d2cf00eb3381ed98ac96bf3760b640f91b"; + sha512 = "be53376fc3f29cdc6f7bd13fcc4de35292dee928d9c65016dde0910333c028fa85563a688dbd644459aac9bf81a5dc68e5cba528f495170193dbeb5024042b5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/rm/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/rm/thunderbird-68.8.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "87ec8c6e2358df02baf3bd6a2241c4e83a4441be6c9ff465da9fb0a992d316ba1a3f2e5b41d7186769a8c8e4894c04158a4497a70a4c6c82a630954d5758c1fa"; + sha512 = "a66262a586bd1b79772fc791fb93bce764b9f0cd5d39c03b26b1b9743ceb83f54e64b30bfd1fc0e03236aef8f320b90017a4e4d997090910c7b8963e30f505e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ro/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ro/thunderbird-68.8.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0b740488109c97bf3a54d87de45f14063ba356d26da56651de7902de4264755f9837f8910a3b524ada953e6e1387d43c0f60572673af2d1cab0e6c7bdebca67c"; + sha512 = "43fa63b41001e01ae7e0183841d6efa5bda0c2518949b6925d035690f507586e39fe9d1bde404f15f34d807e0fb02efa8f7816efd2b584680b43896c6cdb603f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ru/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/ru/thunderbird-68.8.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "16f07bcc8bb6f49754fe6741ce2ce0f77d44dc6641a37b9b9fef601604abbd9c44861d4540e544daf67c871955cdcf141ad1db3ac2cdcc0fc371638bb0aa8058"; + sha512 = "2d5d700879d1c95bc7ba066ba336f3b9f5681d089c019279cf27c2a837b6a12527d92940378e1bdc794bdfd516deb09c97fd5fccc07571a9b9c92c7c24bed3ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/si/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/si/thunderbird-68.8.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "cbaeb62f5ca1ac9ea731e291d5988044ab86f7c26eec99ea4741f0db200685bb88b1358c4d29f1d641d01947dfd1ce5eccd971131e49f4373fad1074f15c004c"; + sha512 = "b78fa143b483cd6499cb7c4cc71821b8dc7bce79059765650d09876a3ddfa1d62a676f3b3326cd3ecfb6aff9823a7f26c7b83a2c74ada5e7aa57b59238ecb350"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sk/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sk/thunderbird-68.8.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "933e45cb5ee1832ad27aefed0ed99077957374727b00a227ae79a004add3fc395917e351d90ae522cf98fce50aafdccc86f3a74e5b4b7ec2e3fa5a9fd498a5df"; + sha512 = "b6cd21b14fdb6334b03a6e780c6fe4815a3b6124973233e5c783ddf0db9e6e7505b0569eacfa0c2c65d0e740e4616f4ed3fa6f2b9a2461643abca1b437436cdd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sl/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sl/thunderbird-68.8.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b46ec4da60c666ad13fd31269c3e06e5b50b6f5d37ef89a4cafbcd7d30f60dc0b5de5ce318930ac0aee404c2a72eaeb97698bd2a1d077ec29dd0335256af6e40"; + sha512 = "9c791c58cbcb91bd682d30feae3b85d8e30b016b9e64fe295b2c11dbae6f72464a2a2637858eb62815f76e83bf92c2ba1549e2e9d1b3a2c19b3720ad383a859b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sq/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sq/thunderbird-68.8.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "fc4bfd6355fc462fbf196f326291d98659a1c0ba4a5d4d829ec9b184917e524d925b301b2e1aaf3f03b334786c4974f8e2f218c5f96d1ce71a6642c2f46a53c9"; + sha512 = "735f2aa6020787f8119dc795af0e28d04f596a001d6ea0f1a2437b90658d571a9b2c96fe2f13e6ea919d8a12ff149e562bb1949d123f0573d8f53bcf0ad0f82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sr/thunderbird-68.8.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ef76ee6b540bed79743d223e80f997eb8c6bfb92085659df72d8360c3883ac4862b990334ed9412a2fde7eda01ea0a1bfc80adaf581feb54d5031c2352dda89f"; + sha512 = "456bc22b998665dfed7a8d87cf754d6d5cbda4e19074086c4a08176e8767244e8b16d90c25173c9f41c51dd27c8c2b83a400424e148dc266da46aed6e75b71a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sv-SE/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/sv-SE/thunderbird-68.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f431dbcba41510823b489a80699af68c32801b3a994ad5b596fea564f007697c26e2ce3c8cce39f9b56eb102adf6cf701ae8cbefb7bee84e37fcfb91a39a49db"; + sha512 = "1ad151afb1bf9324c03fc78c98a49d9fe6fd765d245eac3e35f17edd6e96ba3c2503d8569f72e95d22982736e33c391e7f44a5141a9f850f26f9d3504a312c11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/tr/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/tr/thunderbird-68.8.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "021b6f44f576e1b35e6e74d0ca40ab8b48def0f8f0159e7864929322cea2aedaadc3c9aa5e7294c1f91898b4eefed6f1032cf26afb560629308cd2ae081c56fa"; + sha512 = "ed539d023abf5adfcee314a3da0e1ebdf1a378720c87b75d059d072db65e5682338b58d4b9b0eb1b02920031fa253c2e237cce3635e4897ef618291df6b9a467"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uk/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/uk/thunderbird-68.8.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a2a14df4f815368a798f035a6d9a917bb88ed7e954e1ada08d1dd526b0c8e93653da2cfb7568912f1416eaa2912ce394d334a3fc38da32c5dd8cc9e8db920b4b"; + sha512 = "7f044b3d8d44d3f5177cf7f7fdec7fe8b8fc183a5a231ae64cd403f9a459d2d4b808e0ee08591410163358bf7841e94ba6a14ab74d955dcdddff9240c2bccc6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uz/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/uz/thunderbird-68.8.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2c63ab4db77702e8e975809f71e1a64fc2acf0bbafc8d24bb407ad5d3b79a9a20041320cf1716b2555b3d6843acc12762a07db4857acd6c1009f645198290a25"; + sha512 = "3dbb3a4bcf800621f191b11ca3e05e2acb114348dbab49695478fbc653ad154a92f0aa62cd6d86216e1447728d6d3ddd01da678f4a9feb2b7964794f5609f7e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/vi/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/vi/thunderbird-68.8.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f68610e7f1df34209212d8db6620fd038b1e8f6a5ef430b8b23fb1bb9a3f51ce5da8b98e576561693d0dc125e5d428246e4cbfd38ee991e3d3695dcbeeffa05e"; + sha512 = "8724cbf93d5d7ebf6fa67b85bf559bfe905cca6b76a4e386db99252d7460ce78d3b63f3c1e5a14782f72d1434906a2d7ad2497bb66ffa6cb66aaf44dc84d0a0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-CN/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/zh-CN/thunderbird-68.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "42bab5ba6dd11f185ed09b1826c1578b9f90caf8612558e6d4bc09038181f9559bece41eac9fb2060a21ddc11cee9522794fbfba3126b750ad1a283e3557be14"; + sha512 = "3cc8703dffdedc2de263c2ce10e2fc2f374c991ec7b34ab3d5530d3441ce8049577824cbeb0ec4ab233973e2d5c0120958360b1920e3f43ae9362132b4948cdd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-TW/thunderbird-68.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.1/linux-i686/zh-TW/thunderbird-68.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6f6f5365976c0eae38f26e83248c9cff718433ad4d9757732d87289a876f3c0023df71907ff43434ee0dbf5ba8ee737a44f33d832979dc1e260edb003702f817"; + sha512 = "bf37041bac13932ad283d49a2f4f552cd4422aaab7baec7a18e19ffd4101b155a8e864aa666eb85683a82668c393c7210631754a375d012e9c9e200c554776c3"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2ba2d2fca6..ee8d36b421 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.8.0"; + version = "68.8.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "18963ccclfvz85bkiy7dpxgzkf71yh4qjbr8hblwyha9d3h8xnm29mi1dd3a2bz05qi3ly1v3k5mrhcbivhy2can2ippsal6j8rky0s"; + "2zq65qhrg8xsz75yywcijdjbkndn79w73v5vyahiyyibc8lfjphz0zaihk67ja82fpnxlnsfvy45s8x5l42kcbb0wibkjy7m55bd6h7"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index 1e25b01259..93a899742b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.3"; + version = "2020.4"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "fac3896db78cc2ddac81abec8bc0aa324e66b453126ed35a501e422ce64b1362"; + sha256 = "17xi8g2k89vi4d0j7pr33bx9zjapa2qh4pymbrqvxwli3yhq6zwr"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index 0e80e1397f..d59cdff34f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,47 +1,81 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook -, openssl, curl, libevent, inotify-tools, systemd, zlib -, enableGTK3 ? false, gtk3 +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkgconfig +, openssl +, curl +, libevent +, inotify-tools +, systemd +, zlib +, pcre + # Build options +, enableGTK3 ? false +, gnome3 +, xorg +, wrapGAppsHook +, enableQt ? false +, qt5 , enableSystemd ? stdenv.isLinux , enableDaemon ? true , enableCli ? true }: -let inherit (stdenv.lib) optional optionals optionalString; in +let + version = "3.00"; -stdenv.mkDerivation rec { - name = "transmission-" + optionalString enableGTK3 "gtk-" + version; - version = "2.94"; +in stdenv.mkDerivation { + pname = "transmission"; + inherit version; - src = fetchurl { - url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"; - sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"; + src = fetchFromGitHub { + owner = "transmission"; + repo = "transmission"; + rev = version; + sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; + fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ] - ++ optionals enableGTK3 [ wrapGAppsHook ]; - buildInputs = [ intltool file openssl curl libevent zlib ] - ++ optionals enableGTK3 [ gtk3 ] - ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]; + cmakeFlags = + let + mkFlag = opt: if opt then "ON" else "OFF"; + in + [ + "-DENABLE_MAC=OFF" # requires xcodebuild + "-DENABLE_GTK=${mkFlag enableGTK3}" + "-DENABLE_QT=${mkFlag enableQt}" + "-DENABLE_DAEMON=${mkFlag enableDaemon}" + "-DENABLE_CLI=${mkFlag enableCli}" + ]; - postPatch = '' - substituteInPlace ./configure \ - --replace "libsystemd-daemon" "libsystemd" \ - --replace "/usr/bin/file" "${file}/bin/file" \ - --replace "test ! -d /Developer/SDKs/MacOSX10.5.sdk" "false" - ''; + nativeBuildInputs = [ + pkgconfig + cmake + ] + ++ lib.optionals enableGTK3 [ wrapGAppsHook ] + ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] + ; - configureFlags = [ - ("--enable-cli=" + (if enableCli then "yes" else "no")) - ("--enable-daemon=" + (if enableDaemon then "yes" else "no")) - "--disable-mac" # requires xcodebuild - ] - ++ optional enableSystemd "--with-systemd-daemon" - ++ optional enableGTK3 "--with-gtk"; + buildInputs = [ + openssl + curl + libevent + zlib + pcre + ] + ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] + ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ] + ++ lib.optionals enableSystemd [ systemd ] + ++ lib.optionals stdenv.isLinux [ inotify-tools ] + ; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; - meta = with stdenv.lib; { + # Reduce the risk of collisions + postInstall = "rm -r $out/share/doc"; + + meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' Transmission is a BitTorrent client which features a simple interface @@ -55,9 +89,9 @@ stdenv.mkDerivation rec { * Full encryption, DHT, and PEX support ''; homepage = "http://www.transmissionbt.com/"; - license = licenses.gpl2; # parts are under MIT - maintainers = with maintainers; [ astsmtl vcunat wizeman ]; - platforms = platforms.unix; + license = lib.licenses.gpl2; # parts are under MIT + maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ]; + platforms = lib.platforms.unix; }; -} +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index 8830881b69..9425f260e4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "09ajpsmgrgjhw7b91id76w84kwk2d678n0b81zzpwq7sgjcm0sb0"; + x86_64-linux = "1vpfyffg1g7f1m4mxmqghswihml9rm1cipm7krmr5wvxdmcphxnk"; i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.5.5"; + version = "5.5.6"; src = fetchurl { urls = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 92f76e5e6d..ee9ea66792 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "11s39xcy80rarkddw31v621zpai1vdr52iam367l69mcbc40xg36"; + sha256 = "0kc0akr5xvbq2bx3wsgf0hd8x5hjgshwrrzhwixp0584ydax89gv"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix new file mode 100644 index 0000000000..991780bd82 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, rpmextract, patchelf, bash }: + +stdenv.mkDerivation rec { + pname = "scaleft"; + version = "1.41.0"; + + src = + fetchurl { + url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; + sha256 = "a9a2f60cc85167a1098f44b35efd755b8155f0b88da8572e96ace767e7933c4d"; + }; + + nativeBuildInputs = [ patchelf rpmextract ]; + + libPath = + stdenv.lib.makeLibraryPath + [ stdenv.cc stdenv.cc.cc.lib ]; + + buildCommand = '' + mkdir -p $out/bin/ + cd $out + rpmextract $src + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + usr/bin/sft + patchelf \ + --set-rpath ${libPath} \ + usr/bin/sft + ln -s $out/usr/bin/sft $out/bin/sft + chmod +x $out/bin/sft + patchShebangs $out + ''; + + meta = with stdenv.lib; { + description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; + homepage = "https://www.scaleft.com"; + license = licenses.unfree; + maintainers = with maintainers; [ jloyet ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix index 9c295c2791..4cc4487c90 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/etherape/default.nix @@ -2,10 +2,10 @@ popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.18"; + name = "etherape-0.9.19"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv"; + sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7"; }; nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix index 5c536b8aec..b48edd6983 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "0fj13pim5bfm3a2nr05apspraf29klpmcnhmycklfmrlncq5xqdf"; + sha256 = "1dx5l48m4634y0zi6wjky412g80lfxqq1nphv7pi1kwvm1k5m5ri"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index 7602cb5fe6..7166ebe93d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.3"; + version = "3.2.4"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1fpsfjrap7j84sy728yhcr2gad9nq3n5gq03mwrmxnc6ijwf81zh"; + sha256 = "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index 2fde398b2f..6489c69b16 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.51.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0z4kaq6wnj5dgl52g7f86phxlvnk5pbpda7prgh3hahpyhxj0z7d"; + sha256 = "0v0f3pv8qgk8ggrhm4p9brra1ppj53b51jhgh5xi0rhgpxss0d6r"; }; goPackagePath = "github.com/rclone/rclone"; @@ -28,7 +28,7 @@ buildGoPackage rec { in '' installManPage $src/rclone.1 - for shell in bash zsh; do + for shell in bash zsh fish; do ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell installShellCompletion rclone.$shell done diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix new file mode 100644 index 0000000000..a890aefe8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -0,0 +1,68 @@ +{ atomEnv +, autoPatchelfHook +, dpkg +, fetchurl +, makeDesktopItem +, makeWrapper +, stdenv +, udev +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "termius"; + version = "5.10.1"; + + src = fetchurl { + url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; + sha256 = "04zh0zzyp906lf6mz3xzxybn2a55rv3vvrj0m12gnrb8kjb3pk5s"; + }; + + desktopItem = makeDesktopItem { + categories = "Network;"; + comment = "The SSH client that works on Desktop and Mobile"; + desktopName = "Termius"; + exec = "termius-app"; + genericName = "Cross-platform SSH client"; + icon = "termius-app"; + name = "termius-app"; + }; + + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + dontWrapGApps = true; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ]; + + buildInputs = atomEnv.packages; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + # Desktop file + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; + + runtimeDependencies = [ udev.lib ]; + + postFixup = '' + makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \ + "''${gappsWrapperArgs[@]}" + ''; + + meta = with stdenv.lib; { + description = "A cross-platform SSH client with cloud data sync and more"; + homepage = "https://termius.com/"; + downloadPage = "https://termius.com/linux/"; + license = licenses.unfree; + maintainers = with maintainers; [ filalex77 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix index 557e69b1ee..197756d8ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "13vvkn1hna1d1mj8ffg7psrv6ha2jcjrf50qrsb0v0p8hszibavy"; + sha256 = "0vfpj3g3il3imbydx3j8gx1pgzrxi0czcl9jmi749vnkf5mkmh8w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix index 67618e0e4f..40351ba64a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.46"; + version = "1.12.47"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "9fdc67377af52dfe69a7db4f533938024a75f454fc5d25ab43b8e6739be0b5e1"; + sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0"; }; configureFlags = [ "--disable-component" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index a34eadde36..1f60d7df92 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.1"; + name = "homebank-5.4.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1m1hpaby6zi8y0vmj2ljklp34a55l2qsr7pxw3852k2m4v5n9zsx"; + sha256 = "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix new file mode 100644 index 0000000000..53f3b8a315 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, autoPatchelfHook +, fetchurl +, glibc +, gcc-unwrapped +, gtk3 +, jre +, libsecret +, makeDesktopItem +, webkitgtk +, wrapGAppsHook +}: +let + desktopItem = makeDesktopItem { + name = "Portfolio"; + exec = "portfolio"; + icon = "portfolio"; + comment = "Calculate Investment Portfolio Performance"; + desktopName = "Portfolio Performance"; + categories = "Office;"; + }; + + runtimeLibs = stdenv.lib.makeLibraryPath [ gtk3 webkitgtk ]; +in +stdenv.mkDerivation rec { + pname = "PortfolioPerformance"; + version = "0.46.3"; + + src = fetchurl { + url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "0263v0ymqmf7kcwys4smwx1p1gh8d20dh10canjfqgl4c5lfx966"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + glibc + gcc-unwrapped + libsecret + ]; + + installPhase = '' + mkdir -p $out/portfolio + cp -av ./* $out/portfolio + + makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --prefix PATH : ${jre}/bin + + # Create desktop item + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm + ''; + + meta = with stdenv.lib; { + description = "A simple tool to calculate the overall performance of an investment portfolio."; + homepage = "https://www.portfolio-performance.info/"; + license = licenses.epl10; + maintainers = with maintainers; [ elohmeier ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index fb7f88829f..17af0b0591 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.42.1"; + version = "0.42.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0xcbkm6z1a0jh3qywlwcjk6l302cxgdfcq8sw30vbnz99cyarpvz"; + sha256 = "14vb5a2kad1h8kd1vipgaxpv6rch2fl6j0s2ja0y16xypga82wrx"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "012l36z0n3fcdajj3v4w2bcb1619sdhg6cvy3y89b6rxl0h2wdiw"; + sha256 = "16dz2i4g0vgwz4fi69lmg261aqb8hs6ipfy004wv73vg46wf1pnv"; }; in { diff --git a/third_party/nixpkgs/pkgs/applications/office/tudu/default.nix b/third_party/nixpkgs/pkgs/applications/office/tudu/default.nix index cb3b211137..6094e02c5c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/tudu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/tudu/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "tudu"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://code.meskio.net/tudu/${pname}-${version}.tar.gz"; - sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y"; + sha256 = "14srqn968ii3sr4v6xc5zzs50dmm9am22lrm57j7n0rhjclwbssy"; }; buildInputs = [ ncurses ]; - meta = { + preConfigure = stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace configure \ + --replace 'echo "main()' 'echo "int main()' + ''; + + meta = with stdenv.lib; { description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; homepage = "https://code.meskio.net/tudu/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix index 848e0ca3c0..377619f508 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200409"; + version = "20200430"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "16zhwg2xmp5kpqx5isavwwkfq1212zgfj8gbp453ngjcrvp3m4lq"; + sha256 = "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda"; }; propagatedBuildInputs = with python2.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index 6d788f77bc..7863cf84fb 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -1,18 +1,35 @@ -{ stdenv, fetchFromGitHub, writeText, makeWrapper +{ stdenv +, fetchFromGitHub +, makeWrapper +, writeText # Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html # => core dependencies -, cmake, pkgconfig, git, boost, cppunit, fftw +, cmake +, pkgconfig +, git +, boost +, cppunit +, fftw # => python wrappers # May be able to upgrade to swig3 -, python, swig2, numpy, scipy, matplotlib +, python +, swig2 +, numpy +, scipy +, matplotlib # => grc - the gnu radio companion -, Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 +, Mako +, cheetah +, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 # => gr-wavelet: collection of wavelet blocks , gsl # => gr-qtgui: the Qt-based GUI -, qt4, qwt, pyqt4 +, qt4 +, qwt +, pyqt4 # => gr-wxgui: the Wx-based GUI -, wxPython, lxml +, wxPython +, lxml # => gr-audio: audio subsystems (system/OS dependent) , alsaLib # linux 'audio-alsa' , CoreAudio # darwin 'audio-osx' @@ -21,7 +38,9 @@ # => gr-video-sdl: PAL and NTSC display , SDL # Other -, libusb1, orc, pyopengl +, libusb1 +, orc +, pyopengl }: stdenv.mkDerivation rec { @@ -37,17 +56,39 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig git makeWrapper cppunit orc + cmake + pkgconfig + git + makeWrapper + cppunit + orc ]; buildInputs = [ - boost fftw python swig2 lxml qt4 - qwt SDL libusb1 uhd gsl + boost + fftw + python + swig2 + lxml + qt4 + qwt + SDL + libusb1 + uhd + gsl ] ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; propagatedBuildInputs = [ - Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl + Mako + cheetah + numpy + scipy + matplotlib + pyqt4 + pygtk + wxPython + pyopengl ]; NIX_LDFLAGS = "-lpthread"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix index d75572e5e5..730b679ba6 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "1grak0vzlzqvg8bqaalyamwvkyzlmj9nbczqp6jcdf6w2vnbzhph"; + sha256 = "0knymy85n9kxj364jpxjc4v9c238b00nl40rafi1ripkqx36bsfv"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix index 0518744089..ce4c872821 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 +, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let @@ -30,6 +30,7 @@ in mkDerivation { qtmultimedia qtquickcontrols qtquickcontrols2 + qtgraphicaleffects rtl-sdr soapysdr-with-plugins ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix index 20eedfaaa1..cb88e92fe1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7 }: stdenv.mkDerivation rec { pname = "ANTs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk ]; + buildInputs = [ itk4 vtk_7 ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bppsuite/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bppsuite/default.nix new file mode 100644 index 0000000000..564a38708b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bppsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq, bpp-phyl, bpp-popgen }: + +stdenv.mkDerivation rec { + pname = "bppsuite"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq bpp-phyl bpp-popgen ]; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bppsuite/blob/master/ChangeLog"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index 1a3762f432..fc30252221 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1060"; + version = "1061"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0h0604rxg0z0h21dykrnxsb4679zfhibg79gss1v2ik5xpdxl8kk"; + sha256 = "1jbvcxfy5xrf90qbhif0bd6aywm9rjqrm0sx24yr312f7r7c1dnx"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 5073d0f0f3..4b455eaca6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.4"; + version = "2.22.8"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0gzna5df8nk42l7mc0qbp9h73gwr1030jnw10fawjp6ql6213kdd"; + sha256 = "0g387jlf7r1p2kx8gya3vxksbjy3y2ywxa7yjqmxg3y8725fyixl"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix index 08a6a0d250..d555f2873a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "1ffxswd2ngkpy1d6l3lb6a9cmyy1fglbdsws00b3m1k22zaqv60q"; + sha256 = "1ji3afn6yvx7ysg7p9j0d1g28zrnxg1b7x90mhs2bj3lgs7vfafn"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index 9512a288d8..1a22544c27 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.10.0"; + version = "20.12.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "042ndlns48pa6mn6wyrp4q9c1v0a2vzcnhw5l766zdnxdjyv0acx"; + sha256 = "1imfr56nbq2mbcyapwa8xmcmj5rjhbjz9r438387s73kd1avd6yl"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 9fc1111c7b..b7ab5fa70d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -8,7 +8,7 @@ , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice -, scriptingSupport ? true, swig, python, pythonPackages, wxPython +, scriptingSupport ? true, swig, python, wxPython , debug ? false, valgrind , withI18n ? true }: diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 2aa2686a29..a99f1b2d8d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -8,7 +8,7 @@ , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice -, scriptingSupport ? true, swig, python3, python3Packages +, scriptingSupport ? true, swig, python3 , debug ? false, valgrind , with3d ? true , withI18n ? true @@ -31,9 +31,9 @@ let # but brings high DPI support? else wxGTK31.override { withGtk2 = false; }; - pythonPackages = python3Packages; + pythonPackages = python.pkgs; python = python3; - wxPython = python3Packages.wxPython_4_0; + wxPython = pythonPackages.wxPython_4_0; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 2b7c91751e..4a9ed0cb86 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,49 +3,49 @@ { "kicad" = { kicadVersion = { - version = "5.1.5"; + version = "5.1.6"; src = { - rev = "52549c5d09cbfb0e807fcbcb07819bc9f7861544"; - sha256 = "15h3rwisjss3fdc9bam9n2wq94slhacc3fbg14bnzf4n5agsnv5b"; + rev = "c6e7f7de7df655fd59b57823499efc443009de6b"; + sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"; }; }; libVersion = { - version = "5.1.5"; + version = "5.1.6"; libSources = { - i18n.rev = "5122cbec6563fb7c8d6f960a639ac470353af91b"; - i18n.sha256 = "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3"; - symbols.rev = "dd122ec170b49e032179511c9d263126f52f4020"; - symbols.sha256 = "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h"; - templates.rev = "94761f10d06582b33cd55ea2149d72f269f65580"; - templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "e076f8f271f8db96d5fec45616b7554caebb7ef7"; - footprints.sha256 = "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j"; - packages3d.rev = "8d233cdcb109aa1c3b8ba4c934ee31f6a3b6e1f4"; - packages3d.sha256 = "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz"; + i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd"; + i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"; + symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708"; + symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"; + templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9"; + templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; + footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332"; + footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"; + packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c"; + packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2020-05-06"; + version = "2020-05-14"; src = { - rev = "c92181621e2e51dc8aae1bd9f4483bb3301ffaa5"; - sha256 = "0s50xn5gbjy7yxnp9yiynxvxi2mkcrp6yghgdzclpm40rnfyi0v5"; + rev = "3b8465359135e9f6dea4b0a5fcb62377753fe890"; + sha256 = "18xsg2s0pxx176rnblygq1f8xpmryw59lcjzm897gifz0sj0nhvx"; }; }; libVersion = { - version = "2020-05-06"; + version = "2020-05-14"; libSources = { - i18n.rev = "f29cab831eb823165fa2c5efab5d9c9b443e62e2"; - i18n.sha256 = "0cc0zvpml75yxphay3281f762ls08fzvv538cd5hmkr8xqlj3vbi"; - symbols.rev = "d4245ae8cf633095a0994ab01492bd56cd124112"; - symbols.sha256 = "11pynjgji3skw42q5mryz98f8z418k43jy6s2k90w6jv638z3cb0"; + i18n.rev = "c4460d0d8e1075691d43dc928ffc332fa1282592"; + i18n.sha256 = "1gkrbfyfzsr5q7sahhlyhgfpfwm6b83lzf0q1v854gwxdfabvi0y"; + symbols.rev = "614b5f6256fbae82c2bba399086506bbe435bd94"; + symbols.sha256 = "10ix3wdcl832r4ha5q8phpx8j97gzngb41nczdli1qkhjmiw9y8r"; templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; - footprints.rev = "3bff23ee339bc48490bb39deba5d8b2f1f42733e"; - footprints.sha256 = "0430r8k49ib6w1sjr8fx42szbz960yhlzg4w80jl5bwasq67nqwd"; - packages3d.rev = "889a3dd550233ec51baed4a04a01d4cc64a8d747"; - packages3d.sha256 = "152zv4j51v8skqlvrabblpcqpbn5yf3grisjj8vnwf7kdd41chb2"; + footprints.rev = "240804c6c89b66af808379e1fc94ea6011433cbe"; + footprints.sha256 = "1jh71004lrn7bl384zfmbqqdbs28gjb6diwn6hyb587jpivdnl3g"; + packages3d.rev = "9b560cf94a35b692ca516d37bdaf392ce10e549d"; + packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 315900d42b..39e7cbe7f3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -34,6 +34,7 @@ let "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz"; "8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; + "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix index 8c1b3bd036..591b04ab06 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "0ny5ln8fc0irprs04qw01c9mppps8q27lkx01a549zazwhj4b5rm"; + sha256 = "16lydnbd4rxfyabvvw7l4hbbby3yprcqqzrydd3n8rjbxibi4xyf"; }; buildInputs = [ python3 boost ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix index 743bbf163c..7a7da2c5f5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0aw538shvpfbk481y0gw3z97nsazdnk8qh8fwsb6ji62p2r51v6f"; + sha256 = "0ycw1r364g5gwh8796dpv1israpg7zqwx8mcvnacv2lqj5iijmby"; }; - cargoSha256 = "0zg3q31z516049v9fhli4yxldx9fg31k2qfx4ag8rmyvpgy9xh6c"; + cargoSha256 = "0hcaiy046d2gnkp6sfpnkkprb3nd94i9q8dgqxxpwrc1j157x6z9"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index c80c163562..2f5943dfa9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, gmp }: +{ stdenv, fetchFromGitHub, cmake, gmp, coreutils }: stdenv.mkDerivation rec { pname = "lean"; - version = "3.10.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0nmh09x3scfqg0bg1qf8b7z67s11hbfd7kr1h6k1zw94fyn2mg8q"; + sha256 = "1dlzap3j26rh93ick1lqb7g3jkqjpd33gl4gqfcbx22v62258y5b"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { cd src ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/bin/leanpkg \ + --replace "greadlink" "${coreutils}/bin/readlink" + ''; + meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix index 931ad2fc4f..6a9367b30a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "proverif"; - version = "2.00"; + version = "2.01"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "0vjphj85ch9q39vc7sd6n4vxy5bplp017vlshk989yhfwb00r37y"; + sha256 = "01wp5431c77z0aaa99h8bnm5yhr6jslpqc8iyg0a7gxfqnb19gxi"; }; buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix index f9b82b5d73..f1066abf69 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ haskell.compiler.ghc844 spass ]; patches = [ - ./patch + ./patch.patch # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with # the <> operator with a different meaning defined by this package ./monoid.patch diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/sad/patch b/third_party/nixpkgs/pkgs/applications/science/logic/sad/patch.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/science/logic/sad/patch rename to third_party/nixpkgs/pkgs/applications/science/logic/sad/patch.patch diff --git a/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix index 5e770cec13..97ef3dd754 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.17.5"; + version = "1.17.6"; pname = "clp"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "0y5wg4lfffy5vh8gc20v68pmmv241ndi2jgm9pgvk39b00bzkaa9"; + sha256 = "0ap1f0lxppa6pnbc4bg7ih7a96avwaki482nig8w5fr3vg9wvkzr"; }; propagatedBuildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix index 64cc4a9aa0..c1d408213b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation rec { pname = "nauty"; - version = "26r12"; + version = "27r1"; src = fetchurl { url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; - sha256 = "1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6"; + sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; }; outputs = [ "out" "dev" ]; configureFlags = { @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; + # I'm not sure if the filename will remain the same for future changelog or + # if it will track changes to minor releases. Lets see. Better than nothing + # in any case. + changelog = "http://pallini.di.uniroma1.it/changes24-27.txt"; homepage = "http://pallini.di.uniroma1.it/"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix index 4912b82d15..c383438002 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix @@ -9,16 +9,15 @@ let in stdenv.mkDerivation rec { pname = "palp"; - version = "2.1"; + version = "2.11"; src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; - sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs"; + sha256 = "00jpm73fw9jjq58z6rysr1mwv489j6rpfqqlhm9ab0dln4kyhh05"; }; hardeningDisable = [ "format" - "strictoverflow" # causes runtime failure (tested in checkPhase) ]; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -78,6 +77,9 @@ stdenv.mkDerivation rec { facet enumeration compares well with existing packages. ''; homepage = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; + # Not really a changelog, but a one-line summary of each update that should + # be reviewed on update. + changelog = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; # Just a link on the website pointing to gpl -- now gplv3. When the last # version was released that pointed to gplv2 however, so thats probably # the right license. diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index b4e4adbfa6..0db007f543 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, jre, makeWrapper, substituteAll, coreutils }: stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { - url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "125vgr8vqbmy2nsm1yl0h0q8p49lxxqfw5cmxzbx1caklcn4rryc"; + url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; + sha256 = "0kksx12m83cjprdygmcc286990byf25yqfx5s7c07cizc21aavyg"; }; + patches = [ + # By default, gen_vmoptions.sh tries to store custom options in $out/share + # at run time. This patch makes sure $HOME is used instead. + (substituteAll { + src = ./gen_vmoptions_to_homedir.patch; + inherit coreutils; + }) + ]; + buildInputs = [jre makeWrapper]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch new file mode 100644 index 0000000000..e31681e854 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch @@ -0,0 +1,19 @@ +diff -Nur a/gen_vmoptions.sh b/gen_vmoptions.sh +--- a/gen_vmoptions.sh 2020-03-30 21:57:47.000000000 +0100 ++++ b/gen_vmoptions.sh 2020-05-05 09:49:57.974989824 +0100 +@@ -1,13 +1,10 @@ + #!/bin/sh + # Generates the Cytoscape.vmoptions file + +-script_path="$(dirname -- $0)" +- +-#vm_options_path="$HOME/.cytoscape" +-vm_options_path=$script_path ++vm_options_path="$HOME/.cytoscape" + + if [ ! -e $vm_options_path ]; then +- /bin/mkdir $vm_options_path ++ @coreutils@/bin/mkdir $vm_options_path + fi + + # Determine amount of physical memory present: diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix index 72217689ff..91c3b8c779 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.9"; + version = "7.6.13"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "1fh7ybbp3qlqzh18c4gva3aaymv7d31mqchrv235a1axldha1s9s"; + sha256 = "0qfvhwc29cgqkwf2bkhq4gr2d1c4jgccfs58916ss03n4rwz9gng"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix index a35df65030..cdeed6536e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.6.9"; + version = "7.6.13"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "04wr86g11wpmsczzwzak4gvalcihb47rn3zp6qriawhxyac9nf93"; + sha256 = "09yfvk16j1iwx8h1xg678ks3bc8760gfdn7n32j8r893kd32cwyk"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 741330e4ad..63a727f9c8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.16.0"; + version = "5.17.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0jlf3y8b1gdv5xz37yk9b5g2b65zkk45p15x0ypvd2blpzy80537"; + sha256 = "0y652i3saqq2z61yvk0i6q3lnq2xfrygcxms5gygspj71q2n4f7k"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index 314fc52250..a672272e9e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.9"; + version = "2.2.10"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1z7vws97k6zfzyqx0dkv2kq8d83dibi73i5jiqk5a22yplp6bnjh"; + sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix new file mode 100644 index 0000000000..85838b04cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/physics/xflr5/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }: + +stdenv.mkDerivation rec { + pname = "xflr5"; + version = "6.47"; + + src = fetchurl { + url = "mirror://sourceforge/xflr5/${pname}_v${version}_src.tar.gz"; + sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + meta = with stdenv.lib; { + description = "An analysis tool for airfoils, wings and planes"; + homepage = https://sourceforge.net/projects/xflr5/; + license = licenses.gpl3; + maintainers = [ maintainers.esclear ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch b/third_party/nixpkgs/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch deleted file mode 100644 index a34ab0c6eb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff --git a/bzrlib/tests/test_ssh_transport.py b/bzrlib/tests/test_ssh_transport.py -index 9e37c3b..fe9f219 100644 ---- a/bzrlib/tests/test_ssh_transport.py -+++ b/bzrlib/tests/test_ssh_transport.py -@@ -22,6 +22,7 @@ from bzrlib.transport.ssh import ( - SSHCorpSubprocessVendor, - LSHSubprocessVendor, - SSHVendorManager, -+ StrangeHostname, - ) - - -@@ -161,6 +162,19 @@ class SSHVendorManagerTests(TestCase): - - class SubprocessVendorsTests(TestCase): - -+ def test_openssh_command_tricked(self): -+ vendor = OpenSSHSubprocessVendor() -+ self.assertEqual( -+ vendor._get_vendor_specific_argv( -+ "user", "-oProxyCommand=blah", 100, command=["bzr"]), -+ ["ssh", "-oForwardX11=no", "-oForwardAgent=no", -+ "-oClearAllForwardings=yes", -+ "-oNoHostAuthenticationForLocalhost=yes", -+ "-p", "100", -+ "-l", "user", -+ "--", -+ "-oProxyCommand=blah", "bzr"]) -+ - def test_openssh_command_arguments(self): - vendor = OpenSSHSubprocessVendor() - self.assertEqual( -@@ -171,6 +185,7 @@ class SubprocessVendorsTests(TestCase): - "-oNoHostAuthenticationForLocalhost=yes", - "-p", "100", - "-l", "user", -+ "--", - "host", "bzr"] - ) - -@@ -184,9 +199,16 @@ class SubprocessVendorsTests(TestCase): - "-oNoHostAuthenticationForLocalhost=yes", - "-p", "100", - "-l", "user", -- "-s", "host", "sftp"] -+ "-s", "--", "host", "sftp"] - ) - -+ def test_openssh_command_tricked(self): -+ vendor = SSHCorpSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_sshcorp_command_arguments(self): - vendor = SSHCorpSubprocessVendor() - self.assertEqual( -@@ -209,6 +231,13 @@ class SubprocessVendorsTests(TestCase): - "-s", "sftp", "host"] - ) - -+ def test_lsh_command_tricked(self): -+ vendor = LSHSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_lsh_command_arguments(self): - vendor = LSHSubprocessVendor() - self.assertEqual( -@@ -231,6 +260,13 @@ class SubprocessVendorsTests(TestCase): - "--subsystem", "sftp", "host"] - ) - -+ def test_plink_command_tricked(self): -+ vendor = PLinkSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_plink_command_arguments(self): - vendor = PLinkSubprocessVendor() - self.assertEqual( -diff --git a/bzrlib/transport/ssh.py b/bzrlib/transport/ssh.py -index eecaa26..6f22341 100644 ---- a/bzrlib/transport/ssh.py -+++ b/bzrlib/transport/ssh.py -@@ -46,6 +46,10 @@ else: - from paramiko.sftp_client import SFTPClient - - -+class StrangeHostname(errors.BzrError): -+ _fmt = "Refusing to connect to strange SSH hostname %(hostname)s" -+ -+ - SYSTEM_HOSTKEYS = {} - BZR_HOSTKEYS = {} - -@@ -360,6 +364,11 @@ class SubprocessVendor(SSHVendor): - # tests, but beware of using PIPE which may hang due to not being read. - _stderr_target = None - -+ @staticmethod -+ def _check_hostname(arg): -+ if arg.startswith('-'): -+ raise StrangeHostname(hostname=arg) -+ - def _connect(self, argv): - # Attempt to make a socketpair to use as stdin/stdout for the SSH - # subprocess. We prefer sockets to pipes because they support -@@ -424,9 +433,9 @@ class OpenSSHSubprocessVendor(SubprocessVendor): - if username is not None: - args.extend(['-l', username]) - if subsystem is not None: -- args.extend(['-s', host, subsystem]) -+ args.extend(['-s', '--', host, subsystem]) - else: -- args.extend([host] + command) -+ args.extend(['--', host] + command) - return args - - register_ssh_vendor('openssh', OpenSSHSubprocessVendor()) -@@ -439,6 +448,7 @@ class SSHCorpSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path, '-x'] - if port is not None: - args.extend(['-p', str(port)]) -@@ -460,6 +470,7 @@ class LSHSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path] - if port is not None: - args.extend(['-p', str(port)]) -@@ -481,6 +492,7 @@ class PLinkSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path, '-x', '-a', '-ssh', '-2', '-batch'] - if port is not None: - args.extend(['-P', str(port)]) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/add_certificates.patch b/third_party/nixpkgs/pkgs/applications/version-management/bazaar/add_certificates.patch deleted file mode 100644 index 18fac36dae..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/add_certificates.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py ---- orig/bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-02-01 20:49:17.000000000 +0100 -+++ bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-06-18 23:15:21.089511349 +0200 -@@ -95,6 +95,7 @@ - u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD - # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25 - u'/etc/openssl/certs/ca-certificates.crt', # Solaris -+ u'@certPath@', - ] - - diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bazaar/default.nix deleted file mode 100644 index fa0009d3ef..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, python2Packages -, withSFTP ? true - }: - -python2Packages.buildPythonApplication rec { - version = "2.7"; - release = ".0"; - name = "bazaar-${version}${release}"; - - src = fetchurl { - url = "https://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d"; - }; - - doCheck = false; - - propagatedBuildInputs = [] - ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; - - patches = [ - # Bazaar can't find the certificates alone - ./add_certificates.patch - ./CVE-2017-14176.patch - ]; - postPatch = '' - substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt - ''; - - meta = with stdenv.lib; { - homepage = "http://bazaar-vcs.org/"; - description = "A distributed version control system that Just Works"; - platforms = platforms.unix; - license = licenses.gpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix b/third_party/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix deleted file mode 100644 index d76260ad4b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/bazaar/tools.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "bzr-tools"; - version = "2.6.0"; - - src = fetchurl { - url = "https://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; - sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; - }; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Bazaar plugins"; - homepage = "http://wiki.bazaar.canonical.com/BzrTools"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix index d8a6ec0584..d9a98ecce2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix @@ -1,12 +1,12 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, pango, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; - version = "4.3.2.24472"; + version = "4.3.4.24657"; src = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "1msygg01yi0n8lpk8sl226p09ls7wvd3z3k067mdgrss8rjy5va5"; + sha256 = "031ivmpy0mk43skb30r7p5zwf0m90pmsqhaq5kc08gzy6g4s0wd0"; }; unpackPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib gtk2 - gnome2.pango + pango cairo kio kservice diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index 5d3c3976f3..0592f6e545 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,7 +7,7 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.53"; + version = "1.55"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; @@ -16,8 +16,8 @@ mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.53.tar.gz"; - sha256 = "01zda8qbi9cm2p23cxw0h5cx55ysr0v7dzzbpx9qa19wpv75kisb"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.55.tar.gz"; + sha256 = "06y2myhhv2ap08bq7d7shq0b7lq6wgznwrpz6622xq66cxkf2n5g"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix index 68c4e72e53..ae1929565b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, makeWrapper , python2Packages -, cvs, subversion, git, bazaar +, cvs, subversion, git, breezy }: python2Packages.buildPythonApplication rec { @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ makeWrapper ]; - checkInputs = [ subversion git bazaar ]; + checkInputs = [ subversion git breezy ]; checkPhase = "python run-tests.py"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index c591ef554e..9c0e0d74d2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -171,6 +171,8 @@ let gitflow = callPackage ./gitflow { }; + gitin = callPackage ./gitin { }; + gitstatus = callPackage ./gitstatus { }; gitui = callPackage ./gitui { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 2386ac87ce..300570f7ef 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,25 +2,27 @@ buildGoModule rec { pname = "gh"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7"; + sha256 = "050wqjng0l42ilaiglwm1mzrrmnk0bg9icnzq9sm88axgl4xpmdy"; }; vendorSha256 = "0s99bjmsafnzhl3s2lcybxgsw1s4i1h3vh6p40gz4vsfhndidqrq"; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" - ]; - - subPackages = [ "cmd/gh" ]; - nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + + buildPhase = '' + make GH_VERSION=${version} bin/gh manpages + ''; + + installPhase = '' + install -Dm755 bin/gh -t $out/bin + installManPage share/man/*/*.[1-9] + for shell in bash fish zsh; do $out/bin/gh completion -s $shell > gh.$shell installShellCompletion gh.$shell @@ -33,4 +35,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index d476b89660..fe14e7a5da 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "1da6h9hf98dnnqw9jpnj1x2gr7psmsa8219gpamylfg1ifk28rkr"; + sha256 = "1xjs5yjb0wj0nf3k3mpgh3hm16544gq7954k1y2r5lwammp0fsxk"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "1ba43m5ndyj4hwwfyg0c2hwv3ad7kzhrr7cvymsgaj2dxl7bif4w"; + cargoSha256 = "194ic3f60gpx35rs665vrnjsc3047f0msx1qp797xsz6pg0jx1zq"; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix new file mode 100644 index 0000000000..5964af6c0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, libgit2_0_27 +}: + +buildGoPackage rec { + version = "0.2.3"; + pname = "gitin"; + + goPackagePath = "github.com/isacikgoz/gitin"; + + src = fetchFromGitHub { + owner = "isacikgoz"; + repo = "gitin"; + rev = "v${version}"; + sha256 = "00z6i0bjk3hdxbc0cy12ss75b41yvzyl5pm6rdrvsjhzavry2fa3"; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgit2_0_27 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/isacikgoz/gitin"; + description = "Text-based user interface for git"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ kimat ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/deps.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/deps.nix new file mode 100644 index 0000000000..908665693b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/deps.nix @@ -0,0 +1,121 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; + sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "daf2830f2741ebb735b21709a520c5f37d642d85"; + sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; + }; + } + { + goPackagePath = "github.com/isacikgoz/gia"; + fetch = { + type = "git"; + url = "https://github.com/isacikgoz/gia"; + rev = "00556493579ec25f4e199b85ee1e2a73c98d15bb"; + sha256 = "16nqi4z1pgybcw05wbp3qnbbq407smcr56hq7npnhkirngc5j822"; + }; + } + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "c055c87ae801372cd74a0839b972db4f7697ae5f"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + { + goPackagePath = "github.com/justincampbell/timeago"; + fetch = { + type = "git"; + url = "https://github.com/justincampbell/timeago"; + rev = "027f40306f1dbe89d24087611680ef95543bf876"; + sha256 = "1p3va1cn9x5pyvq7k64mnvbxp5zy7h9z49syjyglixgg6avdbp1v"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/envconfig"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/envconfig"; + rev = "0b417c4ec4a8a82eecc22a1459a504aa55163d61"; + sha256 = "1a7b35njpqz94gbd7wvsl3wjzpd5y1fj1lrg2sdh00yq0nax1qj9"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "14e809f6d78fcf9f48ff9b70981472b64c05f754"; + sha256 = "1mvlxcdwr0vwp8b2wqs6y7hk72y28sqh03dz5x0xkg48d4y9cplj"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "38ba6e5628f1d70bac606cfd210b9ad1a16c3027"; + sha256 = "03xx5vbnavklsk6wykcc7qhmhvn2074sx0ql06b51vqsxwsa6zw2"; + }; + } + { + goPackagePath = "github.com/sahilm/fuzzy"; + fetch = { + type = "git"; + url = "https://github.com/sahilm/fuzzy"; + rev = "d88f8cb825ddd46a2ce86b60382e11645220ee33"; + sha256 = "0nl4l02s3961p11aj1vgajfy28rqlya2z6af2xjncra59gfhqvlq"; + }; + } + { + goPackagePath = "github.com/waigani/diffparser"; + fetch = { + type = "git"; + url = "https://github.com/waigani/diffparser"; + rev = "7391f219313d9175703f67561b222fd2a81bca30"; + sha256 = "0h3y3ivlghdvkyqsh5lcidqdajhc9g7m1xqm73j9a0ayby0sx1ql"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/libgit2/git2go.v27"; + fetch = { + type = "git"; + url = "https://gopkg.in/libgit2/git2go.v27"; + rev = "6cc7d3dc6aec2781fe0239315da215f49c76e2f8"; + sha256 = "0b2m4rjadngyd675bi1k21pyi9r91dsxngzd4mikacpd7yshgvaq"; + }; + } +] + diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 5ed4b0d372..f1e4663022 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "1vcdgzr71m9rlkaq5pc2vnli3hdh7vv8g3ji5ancnlk3zcqc78xy"; + sha256 = "0rdaschf6030zprz81g7xnx57idjsq3bjhjp5d9387ha5njq0bp1"; }; - cargoSha256 = "04g089y6k0p36h08v6swcg1ig2kcadkidnlc0rh04znmv0bkn84d"; + cargoSha256 = "1k24xabhgwwdvslq81w6b8jnnjxbafj4s0zpcq2c4hals2xxwfy4"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 613e5bf10d..d86fca1a6d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "Arkweid"; repo = "lefthook"; - sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0"; + sha256 = "1ciyxjx3r3dcl8xas49kqsjshs1bv4pafmfmhdfyfdvlaj374hgj"; }; vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 9488bb8ff7..eb3f95a354 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "19wn16m9sy8fv31zl90av5la60l5hsf5fvvfpgiy0470rkagvz6j"; + sha256 = "00sahddplisg55zpjz4v4sc7zqbh3apx36xv77g55nabwz7han8d"; }; patches = [ ./import-ssl-module.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 34a3d80470..fda47fb2d9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -29,6 +29,10 @@ buildGoPackage rec { url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; }) + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/e1c00bd6af677b944a102d84314eba8c487648b3.patch"; + sha256 = "1yf48fvky4as72w38lbrk4qpl4af31i2ckr90h3x5wf61yc105wv"; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index c5ee8f3944..88f8df4e25 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.6.0"; + version = "7.0.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1k94dyynsnm90mp7q9h6baq6q9zi539b1qszf3mqvd5i0id9kjcw"; + sha256 = "0ws1gb7fgy72s6hxkf9g16x565m58k1cdzx9ldcdghfffimz4cqx"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 7c84acc8f0..298897d670 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby, - bundlerEnv, pkgconfig, libgit2 }: + bundlerEnv, pkgconfig, libgit2_0_27 }: let rubyEnv = bundlerEnv rec { @@ -18,15 +18,6 @@ let }; }; }; - libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { - version = "0.27.8"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; - }; - }); in buildGoPackage rec { version = "12.8.10"; pname = "gitaly"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix index fb5b72be4e..f52fd30d83 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy -, bazaar ? null, cvs ? null, darcs ? null, fossil ? null +, breezy ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null , subversion ? null, cvs_fast_export ? null }: @@ -42,7 +42,7 @@ in mkDerivation rec { let binpath = makeBinPath ( filter (x: x != null) - [ out git bazaar cvs darcs fossil mercurial + [ out git breezy cvs darcs fossil mercurial monotone rcs src subversion cvs_fast_export ] ); pythonpath = makeSearchPathOutput "lib" python.sitePackages ( diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix index 173333fb75..f20ebbeae3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,6 +1,6 @@ { buildVersion, sha256, dev ? false }: -{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +{ fetchurl, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" , writeScript, common-updater-scripts, curl, gnugrep, coreutils }: @@ -40,7 +40,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $binary done diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index 2734028866..a8fb944319 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "1116"; - sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6"; + buildVersion = "2020"; + sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; } {}; sublime-merge-dev = common { - buildVersion = "1115"; - sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl"; + buildVersion = "2011"; + sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; dev = true; } {}; } diff --git a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix index 9b51746b14..bbbb60bdf5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -7,9 +7,9 @@ # be nice to add the native GUI (and/or the GTK GUI) as an option too, but that # requires invoking the Xcode build system, which is non-trivial for now. -{ stdenv, lib, fetchurl, fetchpatch, +{ stdenv, lib, fetchFromGitHub, # Main build tools - python2, pkgconfig, autoconf, automake, libtool, m4, lzma, + pkgconfig, autoconf, automake, libtool, m4, lzma, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -30,34 +30,64 @@ # for now we disable GTK GUI support on Darwin. (It may be possible to remove # this restriction later.) useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null, - intltool ? null, - glib ? null, - gtk3 ? null, - libappindicator-gtk3 ? null, - libnotify ? null, - gst_all_1 ? null, - dbus-glib ? null, - udev ? null, - libgudev ? null, - hicolor-icon-theme ? null, + intltool ? null, + glib ? null, + gtk3 ? null, + libappindicator-gtk3 ? null, + libnotify ? null, + gst_all_1 ? null, + dbus-glib ? null, + udev ? null, + libgudev ? null, + hicolor-icon-theme ? null, # FDK useFdk ? false, fdk_aac ? null }: -assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null - && libobjc != null && VideoToolbox != null; +assert stdenv.isDarwin -> AudioToolbox != null + && Foundation != null + && libobjc != null + && VideoToolbox != null; stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.3.1"; + version = "1.3.2"; - src = fetchurl { - url = ''https://download.handbrake.fr/releases/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0"; + src = fetchFromGitHub { + owner = "HandBrake"; + repo = "HandBrake"; + rev = version; + sha256 = "04z3hcy7m5yvma849rlrsx2wdqmkilkl1qds9yrzr2ydpw697f85"; + extraPostFetch = '' + echo "DATE=$(date +"%F %T %z" -r $out/NEWS.markdown)" > $out/version.txt + ''; }; + # we put as little as possible in src.extraPostFetch as it's much easier to + # add to it here without having to fiddle with src.sha256 + # only DATE and HASH are absolutely necessary + postPatch = '' + cat >> version.txt <<_EOF +HASH=${src.rev} +SHORTHASH=${src.rev} +TAG=${version} +URL=${src.meta.homepage} +_EOF + + patchShebangs scripts + + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + + # Force using nixpkgs dependencies + sed -i '/MODULES += contrib/d' make/include/main.defs + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py + ''; + nativeBuildInputs = [ - python2 pkgconfig autoconf automake libtool m4 + pkgconfig autoconf automake libtool m4 python3 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ @@ -70,26 +100,12 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev hicolor-icon-theme ] ++ lib.optional useFdk fdk_aac - ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" - ++ lib.optional stdenv.isLinux nv-codec-headers; + ++ lib.optional stdenv.isLinux nv-codec-headers; - preConfigure = '' - patchShebangs scripts - - substituteInPlace libhb/module.defs \ - --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - substituteInPlace libhb/module.defs \ - --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 - - # Force using nixpkgs dependencies - sed -i '/MODULES += contrib/d' make/include/main.defs - sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules - sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ - -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ - -i make/configure.py - ''; + enableParallelBuilding = true; configureFlags = [ "--disable-df-fetch" @@ -97,10 +113,10 @@ stdenv.mkDerivation rec { (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") (if useFdk then "--enable-fdk-aac" else "") (if stdenv.isDarwin then "--disable-xcode" else "") - ]; + ] ++ lib.optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden"; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = toString [ + NIX_LDFLAGS = [ "-lx265" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix index e4da20c848..1ef3c9ee70 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -179,8 +179,8 @@ in stdenv.mkDerivation { # libdvdcss libdvdnav libdvdread ] ++ lib.optional x11Support [ - libX11 xorgproto libXt libXmu libXext libXdmcp - libXinerama libXrandr libXtst libXfixes + libX11 xorgproto libXt libXmu libXext.dev libXdmcp + libXinerama libXrandr.dev libXtst libXfixes ] ++ lib.optional dbusSupport dbus ++ lib.optional joystickSupport cwiid diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 50b67f4555..9cb39d6814 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper, fetchpatch +{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -50,7 +50,6 @@ , vdpauSupport ? true, libvdpau ? null , xineramaSupport ? stdenv.isLinux, libXinerama ? null , xvSupport ? stdenv.isLinux, libXv ? null -, youtubeSupport ? true, youtube-dl ? null , zimgSupport ? true, zimg ? null , archiveSupport ? true, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -91,7 +90,6 @@ assert waylandSupport -> all available [ wayland wayland-protocols libxkbcom assert x11Support -> all available [ libGLU libGL libX11 libXext libXxf86vm libXrandr ]; assert xineramaSupport -> x11Support && available libXinerama; assert xvSupport -> x11Support && available libXv; -assert youtubeSupport -> available youtube-dl; assert zimgSupport -> available zimg; let @@ -112,6 +110,20 @@ in stdenv.mkDerivation rec { patchShebangs ./TOOLS/ ''; + passthru = { + inherit + # The wrapper consults luaEnv and lua.version + luaEnv + lua + # In the wrapper, we want to reference vapoursynth which has the + # `python3` passthru attribute (which has the `sitePrefix` + # attribute). This way we'll be sure that in the wrapper we'll + # use the same python3.sitePrefix used to build vapoursynth. + vapoursynthSupport + vapoursynth + ; + }; + NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext " + optionalString stdenv.isDarwin "-framework CoreFoundation"; @@ -135,7 +147,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ - addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 wafHook which + addOpenGLRunpath docutils perl pkgconfig python3 wafHook which ] ++ optional swiftSupport swift; @@ -164,7 +176,6 @@ in stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional xineramaSupport libXinerama ++ optional xvSupport libXv - ++ optional youtubeSupport youtube-dl ++ optional zimgSupport zimg ++ optional stdenv.isDarwin libiconv ++ optional stdenv.isLinux nv-codec-headers @@ -182,15 +193,6 @@ in stdenv.mkDerivation rec { python3 TOOLS/osxbundle.py -s build/mpv ''; - # Ensure youtube-dl is available in $PATH for mpv - wrapperFlags = - ''--prefix PATH : "${luaEnv}/bin" \'' - + optionalString youtubeSupport '' - --prefix PATH : "${youtube-dl}/bin" \ - '' + optionalString vapoursynthSupport '' - --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" - ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ # Fix cocoa backend. Remove with the next release (fetchpatch { @@ -203,24 +205,17 @@ in stdenv.mkDerivation rec { # Use a standard font mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - wrapProgram "$out/bin/mpv" \ - ${wrapperFlags} cp TOOLS/umpv $out/bin - wrapProgram $out/bin/umpv \ - --set MPV "$out/bin/mpv" - '' + optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r build/mpv.app $out/Applications - wrapProgram "$out/Applications/mpv.app/Contents/MacOS/mpv" \ - ${wrapperFlags} ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. postFixup = optionalString stdenv.isLinux '' - addOpenGLRunpath $out/bin/.mpv-wrapped + addOpenGLRunpath $out/bin/mpv ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix index 53def80e7d..1658f922ab 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix @@ -1,14 +1,83 @@ -{ stdenv, symlinkJoin, makeWrapper, mpv, scripts ? [] }: +# Arguments that this derivation gets when it is created with `callPackage` +{ stdenv +, lib +, symlinkJoin +, makeWrapper +, youtube-dl +}: -symlinkJoin { - name = "mpv-with-scripts-${mpv.version}"; +# the unwrapped mpv derivation - 1st argument to `wrapMpv` +mpv: - paths = [ mpv ]; +let + # arguments to the function (called `wrapMpv` in all-packages.nix) + wrapper = { + extraMakeWrapperArgs ? [], + youtubeSupport ? true, + # a set of derivations (probably from `mpvScripts`) where each is + # expected to have a `scriptName` passthru attribute that points to the + # name of the script that would reside in the script's derivation's + # `$out/share/mpv/scripts/`. + scripts ? [], + extraUmpvWrapperArgs ? [] + }: + let + binPath = lib.makeBinPath ([ + mpv.luaEnv + ] ++ lib.optionals youtubeSupport [ + youtube-dl + ] ++ lib.optionals mpv.vapoursynthSupport [ + mpv.vapoursynth.python3 + ]); + # All arguments besides the input and output binaries (${mpv}/bin/mpv and + # $out/bin/mpv). These are used by the darwin specific makeWrapper call + # used to wrap $out/Applications/mpv.app/Contents/MacOS/mpv as well. + mostMakeWrapperArgs = builtins.concatStringsSep " " ([ "--argv0" "'$0'" + # These are always needed (TODO: Explain why) + "--prefix" "LUA_CPATH" "\\;" "${mpv.luaEnv}/lib/lua/${mpv.lua.luaversion}/\\?.so" + "--prefix" "LUA_PATH" "\\;" "${mpv.luaEnv}/share/lua/${mpv.lua.luaversion}/\\?.lua" + ] ++ lib.optionals mpv.vapoursynthSupport [ + "--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/lib/${mpv.vapoursynth.python3.sitePackages}" + ] ++ lib.optionals (binPath != "") [ + "--prefix" "PATH" ":" binPath + ] ++ (lib.lists.flatten (map + # For every script in the `scripts` argument, add the necessary flags to the wrapper + (script: + [ + "--add-flags" + # Here we rely on the existence of the `scriptName` passthru + # attribute of the script derivation from the `scripts` + "--script=${script}/share/mpv/scripts/${script.scriptName}" + ] + ) scripts + )) ++ extraMakeWrapperArgs) + ; + umpvWrapperArgs = builtins.concatStringsSep " " ([ + "--argv0" "'$0'" + "--set" "MPV" "$out/bin/mpv" + ] ++ extraUmpvWrapperArgs) + ; + in + symlinkJoin { + name = "mpv-with-scripts-${mpv.version}"; - buildInputs = [ makeWrapper ]; + paths = [ mpv ]; - postBuild = '' - wrapProgram $out/bin/mpv \ - --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=${x}/share/mpv/scripts/${x.scriptName}") scripts}" - ''; -} + buildInputs = [ makeWrapper ]; + + passthru.unwrapped = mpv; + + postBuild = '' + # wrapProgram can't operate on symlinks + rm "$out/bin/mpv" + makeWrapper "${mpv}/bin/mpv" "$out/bin/mpv" ${mostMakeWrapperArgs} + rm "$out/bin/umpv" + makeWrapper "${mpv}/bin/umpv" "$out/bin/umpv" ${umpvWrapperArgs} + '' + lib.optionalString stdenv.isDarwin '' + # wrapProgram can't operate on symlinks + rm "$out/Applications/mpv.app/Contents/MacOS/mpv" + makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} + ''; + }; +in + lib.makeOverridable wrapper diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index be2a323943..8a2cd17282 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,7 @@ { config, stdenv , mkDerivation , fetchFromGitHub +, addOpenGLRunpath , cmake , fdk_aac , ffmpeg @@ -35,51 +36,62 @@ let inherit (stdenv.lib) optional optionals; + in mkDerivation rec { pname = "obs-studio"; - version = "25.0.3"; + version = "25.0.8"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; + sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; - buildInputs = [ curl - fdk_aac - ffmpeg - jansson - libjack2 - libv4l - libxkbcommon - libpthreadstubs - libXdmcp - qtbase - qtx11extras - qtsvg - speex - x264 - vlc - makeWrapper - mbedtls - ] - ++ optionals scriptingSupport [ luajit swig python3 ] - ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport libpulseaudio; + buildInputs = [ + curl + fdk_aac + ffmpeg + jansson + libjack2 + libv4l + libxkbcommon + libpthreadstubs + libXdmcp + qtbase + qtx11extras + qtsvg + speex + x264 + vlc + makeWrapper + mbedtls + ] + ++ optionals scriptingSupport [ luajit swig python3 ] + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport libpulseaudio; # obs attempts to dlopen libobs-opengl, it fails unless we make sure # DL_OPENGL is an explicit path. Not sure if there's a better way # to handle this. - cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ]; + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" + "-DOBS_VERSION_OVERRIDE=${version}" + "-Wno-dev" # kill dev warnings that are useless for packaging + ]; postInstall = '' wrapProgram $out/bin/obs \ --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + addOpenGLRunpath $out/lib/lib*.so + addOpenGLRunpath $out/lib/obs-plugins/*.so + ''; + meta = with stdenv.lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index 268905e3a4..993bdd67b0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.7.16"; + version = "1.8.0"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "1pnbdxaqnliwqfvv08gi7gdcvflg5vcbgk4g0fw75prgw54vnd9a"; + sha256 = "0fi0glnl7nr6754r9jk7d7dsnjbdm7civvhcj2l009yxiv2rxzj3"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix index aba6af7359..85c71e86a6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "smplayer"; - version = "19.10.2"; + version = "20.4.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0i2c15yxk4by2zyjhb7n08larz9pmpa6zw383aybjxqh0nd9zv9p"; + sha256 = "0kqdx6q2274gm83rycvdcglka60ymdk4iw2lc39iw7z1zgsv6ky3"; }; buildInputs = [ qtscript ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index 229eeffe8f..31ec6d9ef1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra stdenv.mkDerivation rec { pname = "vlc"; - version = "3.0.8"; + version = "3.0.10"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; - sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6"; + sha256 = "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix b/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix new file mode 100644 index 0000000000..41304c21ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 +, ffmpeg-full, gstreamer, gst_all_1, libpulseaudio, alsaLib, jack2 +, v4l-utils }: +mkDerivation rec { + pname = "webcamoid"; + version = "8.7.1"; + + src = fetchFromGitHub { + sha256 = "1d8g7mq0wf0ycds87xpdhr3zkljgjmb94n3ak9kkxj2fqp9242d2"; + rev = version; + repo = "webcamoid"; + owner = "webcamoid"; + }; + + buildInputs = [ + libxcb + qtbase qtdeclarative qtquickcontrols qtquickcontrols2 + ffmpeg-full + gstreamer gst_all_1.gst-plugins-base + alsaLib libpulseaudio jack2 + v4l-utils + ]; + + nativeBuildInputs = [ pkgconfig qmake ]; + + qmakeFlags = [ + "Webcamoid.pro" + "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" + ]; + + meta = with stdenv.lib; { + description = "Webcam Capture Software"; + longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; + homepage = "https://github.com/webcamoid/webcamoid/"; + license = [ licenses.gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ robaca ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 36e52ff1e4..be6196855e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -4,17 +4,18 @@ , glib , glibc , systemd +, nixosTests }: stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.16"; + version = "2.0.17"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0z0hds95mjxm703ig2aisghvpd2l3wn6m72jnnlv8jnz2iq2nc4g"; + sha256 = "01bicv0qr4aiahkw9cp6igk3jv1fqkbxmsp80nfvq6rxx873v0q7"; }; nativeBuildInputs = [ pkg-config ]; @@ -23,6 +24,8 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + passthru.tests.podman = nixosTests.podman; + meta = with stdenv.lib; { homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 3796b8857b..95f8580cb3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; + sha256 = "1fd7ix329kqimysqfh8yl29c0hwrddlirq9bnz95mrllhsgn8kw2"; }; vendorSha256 = null; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix new file mode 100644 index 0000000000..1578eaf4f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -0,0 +1,53 @@ +{ cri-o-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, cri-o +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +, socat +}: + +let + cri-o = cri-o-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + utillinux + iptables + socat + ] ++ extraPackages); + +in runCommand cri-o.name { + name = "${cri-o.pname}-wrapper-${cri-o.version}"; + inherit (cri-o) pname version; + + meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${cri-o.man} $man + + mkdir -p $out/bin + ln -s ${cri-o-unwrapped}/share $out/share + + for p in ${cri-o-unwrapped}/bin/*; do + makeWrapper $p $out/bin/''${p##*/} \ + --prefix PATH : ${binPath} + done +'' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index ded793449f..a11d5d356d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -9,6 +9,7 @@ , python3 , systemd , yajl +, nixosTests }: let @@ -62,6 +63,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.podman = nixosTests.podman; + meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index f7c49526fb..69378da2b8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -197,9 +197,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.8"; - rev = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3"; - sha256 = "15iq16rlnkw78lvapcfpbnsnxhdjbvfvgzg3xzxhpdg1dmq40b6j"; + version = "19.03.9"; + rev = "9d988398e765e4b97f27f93c4d04b272ac64c9c7"; + sha256 = "0g2jpmqryfpvhdkapl8syi4hccx6czpihp1p1gsp1mfwz9aycsqv"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix index 31755f87f6..de3d944bac 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi, podman, pyyaml }: +{ lib, buildPythonApplication, fetchPypi, pyyaml }: buildPythonApplication rec { version = "0.1.5"; @@ -9,13 +9,13 @@ buildPythonApplication rec { sha256 = "1sgbc889zq127qhxa9frhswa1mid19fs5qnyzfihx648y5i968pv"; }; - propagatedBuildInputs = [ pyyaml podman ]; + propagatedBuildInputs = [ pyyaml ]; - meta = with lib; { + meta = { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index e88e0a60c5..3ed029e55f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0jvqzn1q52z6aka98d2i3dyn2i8xld7xvmi2zfxgm9g53wdgi2g2"; + sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s"; }; vendorSha256 = null; @@ -45,7 +45,7 @@ buildGoModule rec { patchShebangs . ${if stdenv.isDarwin then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" - else "make binaries docs"} + else "make podman docs"} ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix index d7fb6fa107..d97d182496 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix @@ -5,12 +5,12 @@ , extraPackages ? [] , podman # Docker compat , runc # Default container runtime -, crun # Default container runtime (cgroups v2) +, crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs , utillinux # nsenter -, cni-plugins +, cni-plugins # not added to path , iptables }: diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qboot/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qboot/default.nix index d770308239..800d601c76 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qboot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qboot/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, meson, ninja, fetchFromGitHub }: stdenv.mkDerivation { - name = "qboot-20170330"; + name = "qboot-20200423"; src = fetchFromGitHub { owner = "bonzini"; repo = "qboot"; - rev = "ac9488f26528394856b94bda0797f5bd9c69a26a"; - sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy"; + rev = "de50b5931c08f5fba7039ddccfb249a5b3b0b18d"; + sha256 = "1d0h29zz535m0pq18k3aya93q7lqm2858mlcp8mlfkbq54n8c5d8"; }; + nativeBuildInputs = [ meson ninja ]; + installPhase = '' mkdir -p $out - cp bios.bin* $out/. + cp bios.bin bios.bin.elf $out/. ''; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rkt/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rkt/default.nix deleted file mode 100644 index f3b68e5c22..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/rkt/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools, - cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: - -let - # Always get the information from - # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1478.0.0"; - coreosImageSystemdVersion = "233"; - - # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. - stage1Flavours = [ "coreos" "fly" ]; - stage1Dir = "lib/rkt/stage1-images"; - -in stdenv.mkDerivation rec { - version = "1.30.0"; - pname = "rkt"; - BUILDDIR="build-${pname}-${version}"; - - src = fetchFromGitHub { - owner = "coreos"; - repo = "rkt"; - rev = "v${version}"; - sha256 = "0dqf83b7iin1np8k8k1m8i99ybga8vx932q7n2q64yghkw7p6i00"; - }; - - stage1BaseImage = fetchurl { - url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq"; - }; - - buildInputs = [ - glibc.out glibc.static - autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd - makeWrapper - ]; - - preConfigure = '' - ./autogen.sh - configureFlagsArray=( - --with-stage1-flavors=${builtins.concatStringsSep "," stage1Flavours} - ${if lib.findFirst (p: p == "coreos") null stage1Flavours != null then " - --with-coreos-local-pxe-image-path=${stage1BaseImage} - --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion} - " else "" } - --with-stage1-default-location=$out/${stage1Dir}/stage1-${builtins.elemAt stage1Flavours 0}.aci - ); - ''; - - preBuild = '' - export BUILDDIR - export GOCACHE="$TMPDIR/go-cache" - ''; - - installPhase = '' - mkdir -p $out/bin - cp -Rv $BUILDDIR/target/bin/rkt $out/bin - - mkdir -p $out/lib/rkt/stage1-images/ - cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ - - wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ - --prefix PATH : ${iptables}/bin - ''; - - meta = with lib; { - description = "A fast, composable, and secure App Container runtime for Linux"; - homepage = "https://github.com/coreos/rkt"; - 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/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 1bf6b3d574..367767c72a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -9,6 +9,7 @@ , apparmor-parser , libseccomp , libselinux +, nixosTests }: buildGoPackage rec { @@ -45,6 +46,8 @@ buildGoPackage rec { installManPage man/*/*.[1-9] ''; + passthru.tests.podman = nixosTests.podman; + meta = with lib; { homepage = "https://github.com/opencontainers/runc"; description = "A CLI tool for spawning and running containers according to the OCI specification"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix index f07bb0fc16..d8a1f36dd5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix @@ -1,6 +1,11 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib +, fetchFromGitHub +, buildGoModule +, go-md2man +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "umoci"; version = "0.4.5"; @@ -11,10 +16,18 @@ buildGoPackage rec { sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; }; - goPackagePath = "github.com/openSUSE/umoci"; + vendorSha256 = null; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postInstall = '' + sed -i '/SHELL =/d' Makefile + make local-doc + installManPage doc/man/*.[1-9] + ''; + meta = with lib; { description = "umoci modifies Open Container images"; homepage = "https://umo.ci"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index 7ef91e6f60..cbaa0a5799 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "0p1ypgy45ngxxjczd986pkfh4cn5bs45cwzlfv9fm2p58fkx3aar"; + sha256 = "1skdgr2hipd7yx9c7r7nr3914gm9cm1xj6h3qdsa9f92xxm3aml1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix index 568258ee2c..176c2a0ddf 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "05dhd2gy7ysrnchdimrdd7jvzs1db9fyrk4ci7850jhrgavfd7c4"; + sha256 = "1a3dpawxgi8d2a6w5jzvzm5q13rvqd656ris8mz77gj6f8qp7ddl"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0zkbps8vsjcvy7x0sgb07kacszi57dlyq8j6ia6yy0jyqnvlaqa7"; + cargoSha256 = "12b6fdhj13axhwf854n071dpiycg73g4kvl7igk1qn7l3gqwsfqn"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix index 062a8c4b8d..c5e203ab1a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.12.c.1"; + version = "2.12.c.4"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "1q09cfgkikqbrkk1kljg8dsgbs5nacixhdqaww18h94hmlnbbssc"; + sha256 = "1jbk7kd49vgmakbldwwnbsp484fwh1pbzg8k8qvbq4dzbzf3q5hs"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/openbox/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/openbox/default.nix index a4ec6d067d..39329e8004 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/openbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python2 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -7,22 +7,24 @@ stdenv.mkDerivation rec { version = "3.6.1"; nativeBuildInputs = [ + autoreconfHook pkgconfig makeWrapper - python2.pkgs.wrapPython + python3.pkgs.wrapPython ]; buildInputs = [ libxml2 libXinerama libXcursor libXau libXrandr libICE libSM libstartup_notification + python3 ]; propagatedBuildInputs = [ pango imlib2 ]; - pythonPath = with python2.pkgs; [ + pythonPath = with python3.pkgs; [ pyxdg ]; @@ -36,6 +38,15 @@ stdenv.mkDerivation rec { sha256 = "1ci9lq4qqhl31yz1jwwjiawah0f7x0vx44ap8baw7r6rdi00pyiv"; }; + patches = [ + # Use fetchurl to avoid "fetchpatch: ignores file renames" #32084 + # This patch adds python3 support + (fetchurl { + url = "https://git.archlinux.org/svntogit/community.git/plain/openbox/trunk/py3.patch?id=90cb57ef53d952bb6ab4c33a184f815bbe1791c0"; + sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc"; + }) + ]; + postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc"; # Openbox needs XDG_DATA_DIRS set or it can't find its default theme diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix index ad5f73ab17..8ea724aa69 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "7.5"; + version = "8"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "1l48fxl04vkzr4r94sl37nbbw7a621rn8sxmkbdv4252i1gjxd4z"; + sha256 = "04svbv7v73q8yn9la69451rda6l2pgxcphv2zlkdqaxxdbp69195"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix index dcff3a5c47..7cbba5e981 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { description = "Screen locker for Wayland"; longDescription = '' swaylock is a screen locking utility for Wayland compositors. + Important note: If you don't use the Sway module (programs.sway.enable) + you need to set "security.pam.services.swaylock = {};" manually. ''; inherit (src.meta) homepage; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 1b7c575072..36177ec2e3 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -8,6 +8,7 @@ { name ? "" , stdenvNoCC , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell +, zlib ? null , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? cc != null && cc ? man , extraTools ? [], extraPackages ? [], extraBuildCommands ? "" @@ -205,6 +206,10 @@ stdenv.mkDerivation { wrap ${targetPrefix}gnatlink ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatlink '' + + optionalString cc.langD or false '' + wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc + '' + + optionalString cc.langFortran or false '' wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 @@ -220,7 +225,7 @@ stdenv.mkDerivation { ''; strictDeps = true; - propagatedBuildInputs = [ bintools ] ++ extraTools; + propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; depsTargetTargetPropagated = extraPackages; wrapperName = "CC_WRAPPER"; @@ -262,8 +267,9 @@ stdenv.mkDerivation { # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags + '' + optionalString (!(cc.langD or false)) '' echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags - '' + optionalString isGNU '' + '' + optionalString (isGNU && (!(cc.langD or false))) '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags done @@ -307,6 +313,8 @@ stdenv.mkDerivation { ln -s ${cc.man} $man ln -s ${cc.info} $info + '' + optionalString (cc.langD or false) '' + echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags '' + '' @@ -366,9 +374,9 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString cc.langAda or false '' hardening_unsupported_flags+=" stackprotector strictoverflow" - '' - - + optionalString targetPlatform.isWasm '' + '' + optionalString cc.langD or false '' + hardening_unsupported_flags+=" format" + '' + optionalString targetPlatform.isWasm '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index f2a1378b8b..83f4a9e0c0 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -95,7 +95,7 @@ rec { sourceURL = "docker://${imageName}@${imageDigest}"; destNameTag = "${finalImageName}:${finalImageTag}"; } '' - skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. @@ -392,14 +392,10 @@ rec { (cd layer; eval "$extraCommands") fi - # Tar up the layer and throw it into 'layer.tar'. + # Tar up the layer and throw it into 'layer.tar', while calculating its checksum. echo "Packing layer..." mkdir $out - tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . - - # Compute a checksum of the tarball. - echo "Computing layer checksum..." - tarhash=$(tarsum < $out/layer.tar) + tarhash=$(tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. @@ -449,11 +445,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . - - # Compute a checksum of the tarball. - echo "Computing layer checksum..." - tarhash=$(tarsum < $out/layer.tar) + tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. @@ -537,11 +529,10 @@ rec { echo "Packing layer..." mkdir -p $out - tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . + tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf - . | + tee $out/layer.tar | + ${tarsum}/bin/tarsum) - # Compute the tar checksum and add it to the output json. - echo "Computing checksum..." - tarhash=$(${tarsum}/bin/tarsum < $out/layer.tar) cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json # Indicate to docker that we're using schema version 1.0. echo -n "1.0" > $out/VERSION diff --git a/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker b/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker index 839dc87487..1b6785189c 100755 --- a/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker +++ b/third_party/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker @@ -38,7 +38,7 @@ get_image_digest(){ imageTag="latest" fi - skopeo inspect "docker://$imageName:$imageTag" | jq '.Digest' -r + skopeo --insecure-policy --tmpdir=$TMPDIR inspect "docker://$imageName:$imageTag" | jq '.Digest' -r } get_name() { @@ -127,9 +127,9 @@ trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)" if test -z "$QUIET"; then - skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" else - skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null fi # Compute the hash. diff --git a/third_party/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh b/third_party/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh index 7e8efeea1c..7437da51cc 100755 --- a/third_party/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh +++ b/third_party/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh @@ -11,39 +11,36 @@ echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" # Make sure /nix and /nix/store appear first in the archive. +# # We create the directories here and use them because # when there are other things being added to the # nix store, tar could fail, saying, # "tar: /nix/store: file changed as we read it" mkdir -p nix/store -tar -cf "$layerPath/layer.tar" \ - --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 \ - --transform='s,nix,/nix,' \ - nix -# We change into the /nix/store in order to avoid a similar -# "file changed as we read it" error as above. Namely, -# if we use the absolute path of /nix/store/123-pkg -# and something new is added to the nix store while tar -# is running, it will detect a change to /nix/store and -# fail. Instead, if we cd into the nix store and copy -# the relative nix store path, tar will ignore changes -# to /nix/store. In order to create the correct structure -# in the tar file, we transform the relative nix store -# path to the absolute store path. -for storePath in "$@"; do - n=$(basename "$storePath") - tar -C /nix/store -rpf "$layerPath/layer.tar" \ +# Then we change into the /nix/store in order to +# avoid a similar "file changed as we read it" error +# as above. Namely, if we use the absolute path of +# /nix/store/123-pkg and something new is added to the nix +# store while tar is running, it will detect a change to +# /nix/store and fail. Instead, if we cd into the nix store +# and copy the relative nix store path, tar will ignore +# changes to /nix/store. In order to create the correct +# structure in the tar file, we transform the relative nix +# store path to the absolute store path. +tarhash=$( + basename -a "$@" | + tar --create --preserve-permissions --absolute-names nix \ + --directory /nix/store --verbatim-files-from --files-from - \ --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 \ - --transform="s,$n,/nix/store/$n," \ - $n -done - -# Compute a checksum of the tarball. -tarhash=$(tarsum < $layerPath/layer.tar) + --transform 's,^nix$,/\0,' \ + --transform 's,^nix/store$,/\0,' \ + --transform 's,^[^/],/nix/store/\0,rS' | + tee "$layerPath/layer.tar" | + tarsum +) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. diff --git a/third_party/nixpkgs/pkgs/build-support/fetchbzr/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchbzr/default.nix index f9250de4ee..2cf169de7a 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchbzr/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchbzr/default.nix @@ -1,11 +1,11 @@ -{ stdenvNoCC, bazaar }: +{ stdenvNoCC, breezy }: { url, rev, sha256 }: stdenvNoCC.mkDerivation { name = "bzr-export"; builder = ./builder.sh; - nativeBuildInputs = [ bazaar ]; + nativeBuildInputs = [ breezy ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix index 6c4d52a053..f1850fbaa1 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix @@ -12,10 +12,11 @@ let ((optional (group != null) group) ++ [ owner repo ]); escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug; + escapedRev = replaceStrings ["+"] ["%2B"] rev; in fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${rev}"; + url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; meta.homepage = "https://${domain}/${slug}/"; } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; } diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index ed81005370..c47bc00938 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -179,9 +179,9 @@ in '' export $env done - CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") + CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g") grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ - | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env + | awk -F= "/^cargo:/ { sub(/^cargo:/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \$2 }" > target/env set -e fi runHook postConfigure diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix index 5597e4b0dd..bdd6c86d5f 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -344,6 +344,40 @@ let buildTests = true; expectedTestOutputs = [ "test baz_false ... ok" ]; }; + # Regression test for https://github.com/NixOS/nixpkgs/pull/88054 + # Build script output should be rewritten as valid env vars. + buildScriptIncludeDirDeps = let + depCrate = mkCrate { + crateName = "bar"; + src = symlinkJoin { + name = "build-script-and-include-dir-bar"; + paths = [ + (mkFile "src/lib.rs" '' + fn main() { } + '') + (mkFile "build.rs" '' + use std::path::PathBuf; + fn main() { println!("cargo:include-dir={}/src", std::env::current_dir().unwrap_or(PathBuf::from(".")).to_str().unwrap()); } + '') + ]; + }; + }; + in { + crateName = "foo"; + src = symlinkJoin { + name = "build-script-and-include-dir-foo"; + paths = [ + (mkFile "src/main.rs" '' + fn main() { } + '') + (mkFile "build.rs" '' + fn main() { assert!(std::env::var_os("DEP_BAR_INCLUDE_DIR").is_some()); } + '') + ]; + }; + buildDependencies = [ depCrate ]; + dependencies = [ depCrate ]; + }; # Regression test for https://github.com/NixOS/nixpkgs/issues/74071 # Whenevever a build.rs file is generating files those should not be overlayed onto the actual source dir buildRsOutDirOverlay = { diff --git a/third_party/nixpkgs/pkgs/build-support/skaware/clean-packaging.nix b/third_party/nixpkgs/pkgs/build-support/skaware/clean-packaging.nix index 16bae04b21..762fe25c0a 100644 --- a/third_party/nixpkgs/pkgs/build-support/skaware/clean-packaging.nix +++ b/third_party/nixpkgs/pkgs/build-support/skaware/clean-packaging.nix @@ -26,11 +26,11 @@ let writeScript "common-file-actions.sh" '' #!${stdenv.shell} set -e - DOCDIR="$1" + DOCDIR="''${1?commonFileActions: DOCDIR as argv[1] required}" shopt -s globstar extglob nullglob - ${rmNoise noiseFiles} mkdir -p "$DOCDIR" ${mvDoc docFiles} + ${rmNoise noiseFiles} ''; # Shell script to check whether the build directory is empty. diff --git a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix new file mode 100644 index 0000000000..0d57b8e261 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "scheme-manpages-unstable"; + version = "2020-05-17"; + + src = fetchFromGitHub { + owner = "schemedoc"; + repo = "scheme-manpages"; + rev = "e97bd240d398e4e5ffc62305e506a2f2428322a4"; + sha256 = "0c0n3mvghm9c2id8rxfd829plb64nf57jkqgmxf83w7x9jczbqqb"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/man + cp -r man3/ man7/ $out/share/man/ + ''; + + meta = with stdenv.lib; { + description = "Manpages for Scheme"; + homepage = "https://github.com/schemedoc/scheme-manpages"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix index 37169d1548..2048bc797c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "3.1"; + version = "4"; in fetchzip { name = "fira-code-${version}"; - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "1rk5hiix282b1gsxq9kqma2q9fnydj0xl9vbrd88rf7ywvn75817"; + sha256 = "0n9qkng31ydvpdjc1an4ylpfy4x883c6czhyzvhjsmavd7bv4j9a"; meta = with stdenv.lib; { homepage = "https://github.com/tonsky/FiraCode"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix b/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix index 724d975e53..8c228fd91a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,21 +1,19 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "1.2"; + version = "2.0"; in fetchzip rec { name = "marathi-cursive-${version}"; - url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; + url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - cd MarathiCursive - + tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0wq4w79x8r5w6ikm9amcmapf0jcdgifs9zf1pbnw3fk4ncz5s551"; + sha256 = "17pj60ajnjghxhxka8a046mz6vfwr79wnby7xd6pg5hgncin2hgg"; meta = with lib; { homepage = "https://github.com/MihailJP/MarathiCursive"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix b/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix index fbca0283d2..e0e783fd80 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix @@ -1,26 +1,25 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "0.1"; + version = "1.0"; in fetchzip rec { name = "oldsindhi-${version}"; - url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; + url = "https://github.com/MihailJP/oldsindhi/releases/download/v${version}/OldSindhi-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - - install -m444 -Dt $out/share/fonts/truetype OldSindhi/*.ttf - install -m444 -Dt $out/share/doc/${name} OldSindhi/README OldSindhi/*.txt + tar -xJf $downloadedFile --strip-components=1 + install -m444 -Dt $out/share/fonts/truetype *.ttf + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0d4l9cg2vmh2pvnqsla8mgcwvc7wjxzcabhlli6633h3ifj2yp7b"; + sha256 = "03c483vbrwz2fpdfbys42fmik9788zxfmjmc4fgq4s2d0mraa0j1"; meta = with lib; { homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.bsd2; + license = with licenses; [mit ofl]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix b/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix index 210858c5ae..25a111c580 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.051"; + version = "1.052"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "1cqlljbzvrxamswcqx8jbr61q4kji7yil5ic1mh60x4yfsk9x5wn"; + sha256 = "1kam7wcn0rg89gw52pn174sz0r9lc2kjdz88l0jg20gwa3bjbpc6"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/tamzen/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tamzen/default.nix new file mode 100644 index 0000000000..6ecc03d731 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/tamzen/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub, mkfontscale, stdenv }: + +stdenv.mkDerivation rec { + pname = "tamzen-font"; + version = "1.11.5"; + + src = fetchFromGitHub { + owner = "sunaku"; + repo = "tamzen-font"; + rev = "Tamzen-${version}"; + sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; + }; + + nativeBuildInputs = [ mkfontscale ]; + + installPhase = '' + install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc" + install -m 644 -D psf/*.psf -t "$out/share/consolefonts" + install -m 644 -D otb/*.otb -t "$otb/share/fonts/misc" + mkfontdir "$out/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" + ''; + + outputs = [ "out" "otb" ]; + + meta = with stdenv.lib; { + description = "Bitmapped programming font based on Tamsyn"; + longDescription = '' + Tamzen is a monospace bitmap font. It is programatically forked + from Tamsyn version 1.11, which backports glyphs from older + versions while deleting deliberately empty glyphs to allow + secondary/fallback fonts to provide real glyphs at those codepoints. + Tamzen also has fonts that additionally provide the Powerline + symbols. + ''; + homepage = "https://github.com/sunaku/tamzen-font"; + license = licenses.free; + maintainers = with maintainers; [ wishfort36 ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix b/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix index 289f6d6634..d74a9cebce 100644 --- a/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cldr-emoji-annotation"; - version = "36.12.120191002_0"; + version = "36.12.120200305_0"; src = fetchFromGitHub { owner = "fujiwarat"; repo = "cldr-emoji-annotation"; rev = version; - sha256 = "0nxigzs3mxjgi7c8mmdaxsy5sfl7ihsc2nysaj0db198b33w9clw"; + sha256 = "1zg4czaqnfjkd4hx06h8q56z8iiw22crwqr69w94s4hy9zcanfrs"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 7fb2aa2f81..4460e7b40d 100644 --- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200214"; + version = "20200515"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6"; + sha256 = "1m9idmmb1sjf24lp9lgng2m1jj09mn9fa9pnz36fdv5q0lskgscj"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix index 1c68569a29..20931c8ad2 100644 --- a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "1pfy0vbs7sk7m670mclmlkpcanizdmgsm1qgwzrw28w3hxfq7gdb"; + sha256 = "0qf0g7a3jby8sngdjdic30xrb6ch56d6gzpphs8lkm6giir142rj"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/canta/default.nix b/third_party/nixpkgs/pkgs/data/themes/canta/default.nix index f1c8ad1555..8534fe7a50 100644 --- a/third_party/nixpkgs/pkgs/data/themes/canta/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/canta/default.nix @@ -1,26 +1,57 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, librsvg +, gtk-engine-murrine +, gtk3 +, gnome3 +, gnome-icon-theme +, numix-icon-theme-circle +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "canta-theme"; - version = "2020-01-31"; + version = "2020-05-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "070lhbhh3n7nd6rkwm52v1x4v8spyb932w6qmgs2r19g0whyn55w"; + sha256 = "0b9ffkw611xxb2wh43sjqla195jp0ygxph5a8dvifkxdw6nxc2y0"; }; - buildInputs = [ gdk-pixbuf librsvg ]; + nativeBuildInputs = [ + gtk3 + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; + + propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + gnome-icon-theme + numix-icon-theme-circle + hicolor-icon-theme + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontDropIconThemeCache = true; installPhase = '' patchShebangs . mkdir -p $out/share/themes - name= ./install.sh -d $out/share/themes - install -D -t $out/share/backgrounds wallpaper/canta-wallpaper.svg + name= ./install.sh --dest $out/share/themes rm $out/share/themes/*/{AUTHORS,COPYING} + install -D -t $out/share/backgrounds wallpaper/canta-wallpaper.svg + mkdir -p $out/share/icons + cp -a icons/Canta $out/share/icons + gtk-update-icon-cache $out/share/icons/Canta ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index e54d235413..f0617e56d7 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-05-09"; + version = "2020-05-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww"; + sha256 = "186ypnkyaqjw671ny363xmixw6zdvrgj9xvmsrdgr8i0h3z8qwr8"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/plano/default.nix b/third_party/nixpkgs/pkgs/data/themes/plano/default.nix index ff1825f634..7ac245b920 100644 --- a/third_party/nixpkgs/pkgs/data/themes/plano/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/plano/default.nix @@ -1,27 +1,40 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine, librsvg }: +{ stdenv +, fetchFromGitHub +, meson +, ninja +, gdk-pixbuf +, gtk_engines +, gtk-engine-murrine +, librsvg +, sassc +}: stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.34-2"; + version = "3.36-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0spbyvzb47vyfhcn3gr0z1gdb5xrprynm6442y1z32znai2bgpnd"; + sha256 = "1rngn5a7hwjqpznbg5kvgs237d2q1anywg37k1cz153ipa96snrv"; }; - buildInputs = [ gdk-pixbuf gtk_engines librsvg ]; + nativeBuildInputs = [ + meson + ninja + sassc + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; - dontBuild = true; - - installPhase = '' - install -dm 755 $out/share/themes/Plano - cp -a * $out/share/themes/Plano/ - rm $out/share/themes/Plano/{LICENSE,README.md} - ''; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; meta = with stdenv.lib; { description = "Flat theme for GNOME and Xfce"; diff --git a/third_party/nixpkgs/pkgs/data/themes/plata/default.nix b/third_party/nixpkgs/pkgs/data/themes/plata/default.nix index 3ccd58ccdc..6437bb1543 100644 --- a/third_party/nixpkgs/pkgs/data/themes/plata/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0rm3xl7d3082kdkbds7ib8b85wpynvpaqravpyb4r5pys0y16fws"; + sha256 = "1sqmydvx36f6r4snw22s2q4dvcyg30jd7kg7dibpzqn3njfkkfag"; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix index 665452a91d..b63d70b3c6 100644 --- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "20.04.6"; + version = "20.04.7"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "04z16bcv1xdq4acnchd6cq9a8j46zl2bjp50cj90qmd6plpiiz50"; + sha256 = "05fpr928kgyly7ac3zf6hfw9wqgc7fjn6980ih54iqc2qffcglsk"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/zuki/default.nix b/third_party/nixpkgs/pkgs/data/themes/zuki/default.nix index 45f3862ea6..f68f238312 100644 --- a/third_party/nixpkgs/pkgs/data/themes/zuki/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.34-2"; + version = "3.36-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1nc0qh6qai6ybmz3a44q0rirri0gfg7lyqy4k4l1sci5q5ckl7x4"; + sha256 = "02gfik9g6kkwcf9h2xlb9nbniajkczhj1xzdnsyk5rlabbvllxcd"; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix deleted file mode 100644 index 06d921cce6..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchFromGitHub -, jq -, libxml2 -, go-dbus-generator -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dbus-factory"; - version = "3.1.17"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1llq8wzgikgpzj7z36fyzk8kjych2h9nzi3x6zv53z0xc1xn4256"; - }; - - nativeBuildInputs = [ - jq - libxml2 - go-dbus-generator - ]; - - makeFlags = [ - "GOPATH=${placeholder "out"}/share/go" - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Generates static DBus bindings for Golang and QML at build-time"; - homepage = "https://github.com/linuxdeepin/dbus-factory"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix index 325f62f378..011be982df 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix @@ -6,7 +6,6 @@ , bc , blur-effect , coreutils -, dbus-factory , deepin , deepin-gettext-tools , fontconfig @@ -43,7 +42,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig deepin-gettext-tools # build - dbus-factory # build deepin.setupHook # TODO: using $PATH to find run time executable does not work with cross compiling diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix index be2846fc87..850e39b936 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix @@ -121,7 +121,7 @@ mkDerivation rec { substituteInPlace dde-control-center.desktop \ --replace "dbus-send" "${dbus}/bin/dbus-send" substituteInPlace com.deepin.controlcenter.addomain.policy \ - --replace "/bin/systemctl" "${systemd}/bin/systemctl" + --replace "/bin/systemctl" "/run/current-system/sw/bin/systemctl" ''; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix index b89b2c2544..c4edcef15a 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , pkgconfig -, dbus-factory , go-dbus-factory , go-gir-generator , go-lib @@ -59,7 +58,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig - dbus-factory deepin-gettext-tools gettext networkmanager diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix index 464d6f19ce..b56b219faf 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -3,19 +3,19 @@ , gtk3 , xcursorgen , papirus-icon-theme -, deepin , hicolor-icon-theme +, deepin }: stdenv.mkDerivation rec { pname = "deepin-icon-theme"; - version = "15.12.71"; + version = "2020.05.21"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "12rzzjp906np95ckbxrd4mb345lm198wz69kxy48f8q1zg78q8iw"; + sha256 = "0b1s6kf0q804zbbghly981wzacy1spi8168shf3x8w95rqj6463p"; }; nativeBuildInputs = [ @@ -30,22 +30,29 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - postPatch = '' - patchShebangs tools/hicolor.links - patchShebangs tools/display_unused_links.sh - patchShebangs cursors-src/cursors/bitmaps/make.sh - patchShebangs cursors-src/render-cursors.sh + buildTargets = "all hicolor-links"; - # keep icon-theme.cache - sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile + postPatch = '' + # fix: hicolor links should follow the deepin -> bloom naming change + # https://github.com/linuxdeepin/deepin-icon-theme/pull/24 + substituteInPlace tools/hicolor.links --replace deepin bloom + + substituteInPlace Sea/index.theme --replace Inherits=deepin Inherits=bloom ''; - buildTargets = "all hicolor-links"; - installTargets = [ "install-icons" "install-cursors" ]; - installFlags = [ "PREFIX=${placeholder "out"}" ]; + installPhase = '' + runHook preInstall - postInstall = '' - cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ + mkdir -p $out/share/icons + cp -vai bloom* Sea $out/share/icons + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + cp -vai usr/share/icons/hicolor $out/share/icons + + runHook postInstall ''; passthru.updateScript = deepin.updateScript { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix deleted file mode 100644 index 0ccc350962..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, cmake -, pkgconfig -, xdg_utils -, qttools -, qtx11extras -, dtkcore -, dtkwidget -, dtkwm -, deepin-turbo -, deepin-shortcut-viewer -, deepin -}: - -mkDerivation rec { - pname = "deepin-screenshot"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0h1kcf9i8q6rz4jhym3yf84zr6svzff0hh9sl7b24sflzkxx6zwk"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - deepin-shortcut-viewer - deepin-turbo - dtkcore - dtkwidget - dtkwm - qtx11extras - ]; - - patches = [ - (fetchpatch { - url = "https://github.com/linuxdeepin/deepin-screenshot/pull/52/commits/e14508b223fd9965854ed41c944cea2ea19e6e0c.patch"; - sha256 = "18zvz98z3hr8pcdyb706za6h2nwx23zsjb1hgyp21ycinhzr9j9h"; - }) - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs generate_translations.sh - fixPath ${deepin-turbo} /usr/bin/deepin-turbo-invoker src/dbusservice/com.deepin.Screenshot.service - fixPath $out /usr/bin/deepin-screenshot src/dbusservice/com.deepin.Screenshot.service - substituteInPlace src/mainwindow.cpp --replace '"xdg-open,%1"' '"${xdg_utils}/bin/xdg-open,%1"' - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-screenshot"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo flokli ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix index 8d33ac154a..b177b2ccf3 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix @@ -12,7 +12,6 @@ let ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; }; - dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-control-center = callPackage ./dde-control-center { }; @@ -36,7 +35,6 @@ let deepin-image-viewer = callPackage ./deepin-image-viewer { }; deepin-menu = callPackage ./deepin-menu { }; deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; - deepin-screenshot = callPackage ./deepin-screenshot { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { @@ -50,12 +48,11 @@ let dtkwidget = callPackage ./dtkwidget { }; dtkwm = callPackage ./dtkwm { }; go-dbus-factory = callPackage ./go-dbus-factory { }; - go-dbus-generator = callPackage ./go-dbus-generator { }; go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; qcef = callPackage ./qcef { }; - qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; + qt5platform-plugins = callPackage ./qt5platform-plugins { }; startdde = callPackage ./startdde { }; udisks2-qt5 = callPackage ./udisks2-qt5 { }; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/disomaster/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/disomaster/default.nix index 758c8ff76c..89cbe34cea 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/disomaster/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/disomaster/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "disomaster"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "13144gq0mpbpclzxc79fb1kirh0vvi50jvjnbpla9s8lvh59xl62"; + sha256 = "1kmhlnw37pdmlf7k9zry657xlhz40m9nzg361kiyisn186pfqpws"; }; nativeBuildInputs = [ @@ -32,11 +32,12 @@ mkDerivation rec { postPatch = '' searchHardCodedPaths # debugging - - sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \ - libdisomaster/libdisomaster.pro ''; + qmakeFlags = [ + "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" + ]; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix deleted file mode 100644 index d0b2d8c07e..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv -, fetchFromGitHub -, go -, go-lib -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-generator"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "17rzicqizyyrhjjf4rild7py1cyd07b2zdcd9nabvwn4gvj6lhfb"; - }; - - nativeBuildInputs = [ - go - go-lib - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Convert dbus interfaces to go-lang or qml wrapper code"; - homepage = "https://github.com/linuxdeepin/go-dbus-generator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix index d45351fd6d..7129d912e3 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "go-lib"; - version = "5.0.0"; + version = "5.4.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0j1ik5hfrysqgync8cyv815cwyjn67k8n69x6llxdp39jli1k8q0"; + sha256 = "021sq7nzvfwsa5ccsb3vdjk53m7cf693xm4wkdkrkf8pja6vz94q"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/qcef/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/qcef/default.nix index fb6bb89d93..c37915377d 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/qcef/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/qcef/default.nix @@ -64,14 +64,14 @@ let in mkDerivation rec { pname = "qcef"; - version = "1.1.7"; + version = "1.1.8"; srcs = [ (fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1x0vb4nkfa1lq0nh6iqpxfvsqmb6qfn305pbc92bsqpgiqd7jvb1"; + sha256 = "14a33af1h3wj3yph080c1ri3m27bqj1v1k0jdqc63x7c3smnpwfk"; name = pname; }) (fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix index cc427611c3..e3bbaba068 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix @@ -8,7 +8,7 @@ , qtx11extras , qtmultimedia , qtsvg -, qt5dxcb-plugin +, qt5platform-plugins , qtstyleplugins , dtkcore , dtkwidget @@ -34,7 +34,7 @@ mkDerivation rec { buildInputs = [ dtkcore dtkwidget - qt5dxcb-plugin + qt5platform-plugins mtdev lxqt.libqtxdg qtstyleplugins diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/qt5platform-plugins/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix rename to third_party/nixpkgs/pkgs/desktops/deepin/qt5platform-plugins/default.nix index 4aa10fb1a9..33e4863c0d 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/qt5platform-plugins/default.nix @@ -12,15 +12,15 @@ }: mkDerivation rec { - pname = "qt5dxcb-plugin"; - version = "5.0.1"; + pname = "qt5platform-plugins"; + version = "5.0.11"; srcs = [ (fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1pkhbx4hzjv7n4mscv7dng9ymjcc1csdc82iy62yxshhq32bcfja"; + sha256 = "14xkr3p49716jc9v7ksj6jgcmfa65qicqrmablizfi71srg3z2pr"; }) qtbase.src ]; @@ -51,13 +51,11 @@ mkDerivation rec { "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" ]; - enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; - homepage = "https://github.com/linuxdeepin/qt5dxcb-plugin"; + homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/startdde/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/startdde/default.nix index 7d03b00928..75b36e85de 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/startdde/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/startdde/default.nix @@ -4,7 +4,6 @@ , pkgconfig , alsaLib , coreutils -, dbus-factory , dde-api , dde-daemon , dde-dock @@ -53,7 +52,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig - dbus-factory jq wrapGAppsHook deepin.setupHook diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix index 385fedfc47..0fcc2e9f9f 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "udisks2-qt5"; - version = "5.0.0"; + version = "5.0.3"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0mqxm6ixzpbg0rr6ly2kvnkpag8gjza67ya7jv4i4rihbq1d0wzi"; + sha256 = "0c87ks9glwhk4m2s7kf7mb43q011yi6l3qjq2ammmfqwl8xal69a"; }; nativeBuildInputs = [ @@ -27,11 +27,15 @@ mkDerivation rec { ]; postPatch = '' - searchHardCodedPaths + searchHardCodedPaths # debugging ''; + qmakeFlags = [ + "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" + ]; + postFixup = '' - searchHardCodedPaths $out + searchHardCodedPaths $out # debugging ''; passthru.updateScript = deepin.updateScript { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch b/third_party/nixpkgs/pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch new file mode 100644 index 0000000000..55a3501ef8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch @@ -0,0 +1,114 @@ +From a1e54ae0097a3b6a0dabf4639fe8bc594c4f602d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Thu, 14 May 2020 16:36:34 -0300 +Subject: [PATCH] wrapped setuid executables + +Installing programs with root ownership and setuid/setgid permissions +in /nix/store is not allowed. They should be wrapped in the +enlightenment service module, and the wrapped ones should be used +instead. +--- + meson/meson_inst.sh | 4 ++-- + src/bin/e_auth.c | 6 ++---- + src/bin/e_fm/e_fm_main_eeze.c | 6 +++--- + src/bin/e_start_main.c | 2 +- + src/bin/e_system.c | 2 +- + 5 files changed, 9 insertions(+), 11 deletions(-) + +diff --git a/meson/meson_inst.sh b/meson/meson_inst.sh +index 321143e40..cd2399306 100755 +--- a/meson/meson_inst.sh ++++ b/meson/meson_inst.sh +@@ -1,6 +1,6 @@ + #!/bin/sh + + for x in "$@" ; do +- chown root "$DESTDIR/$x" +- chmod a=rx,u+xs "$DESTDIR/$x" ++ echo TODO: chown root "$DESTDIR/$x" ++ echo TODO: chmod a=rx,u+xs "$DESTDIR/$x" + done +diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c +index 8b0aa6641..63c68c4bc 100644 +--- a/src/bin/e_auth.c ++++ b/src/bin/e_auth.c +@@ -12,8 +12,7 @@ e_auth_begin(char *passwd) + if (pwlen == 0) goto out; + + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_ckpasswd pw", +- e_prefix_lib_get()); ++ "/run/wrappers/bin/enlightenment_ckpasswd pw"); + exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); + if (!exe) goto out; + if (ecore_exe_send(exe, passwd, pwlen) != EINA_TRUE) goto out; +@@ -47,8 +46,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid) + if (pwlen == 0) goto out; + + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_ckpasswd pk", +- e_prefix_lib_get()); ++ "/run/wrappers/bin/enlightenment_ckpasswd pk"); + exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); + if (!exe) goto out; + snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd); +diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c +index 9b10b3117..0f0aa5b53 100644 +--- a/src/bin/e_fm/e_fm_main_eeze.c ++++ b/src/bin/e_fm/e_fm_main_eeze.c +@@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v) + { + char buf[PATH_MAX]; + +- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx)); ++ snprintf(buf, sizeof(buf), "/run/wrappers/bin/enlightenment_sys"); + eeze_disk_mount_wrapper_set(v->disk, buf); + } + v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v); +@@ -512,7 +512,7 @@ _e_fm_main_eeze_volume_unmount(E_Volume *v) + { + char buf[PATH_MAX]; + +- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx)); ++ snprintf(buf, sizeof(buf), "/run/wrappers/bin/enlightenment_sys"); + eeze_disk_mount_wrapper_set(v->disk, buf); + } + v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v); +@@ -548,7 +548,7 @@ _e_fm_main_eeze_volume_mount(E_Volume *v) + { + char buf2[PATH_MAX]; + +- snprintf(buf2, sizeof(buf2), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx)); ++ snprintf(buf2, sizeof(buf2), "/run/wrappers/bin/enlightenment_sys"); + eeze_disk_mount_wrapper_set(v->disk, buf2); + } + v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v); +diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c +index 8534a7a8e..f0f0061a4 100644 +--- a/src/bin/e_start_main.c ++++ b/src/bin/e_start_main.c +@@ -709,7 +709,7 @@ main(int argc, char **argv) + "E_ALERT_FONT_DIR=%s/data/fonts", eina_prefix_data_get(pfx)); + putenv(buf2); + snprintf(buf3, sizeof(buf3), +- "E_ALERT_SYSTEM_BIN=%s/enlightenment/utils/enlightenment_system", eina_prefix_lib_get(pfx)); ++ "E_ALERT_SYSTEM_BIN=/run/wrappers/bin/enlightenment_system"); + putenv(buf3); + + if ((valgrind_mode || valgrind_tool) && +diff --git a/src/bin/e_system.c b/src/bin/e_system.c +index 1e7aabb64..5084933a1 100644 +--- a/src/bin/e_system.c ++++ b/src/bin/e_system.c +@@ -132,7 +132,7 @@ _system_spawn(void) + else _respawn_count = 0; + if (_respawn_count > 5) return; + snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_system", e_prefix_lib_get()); ++ "/run/wrappers/bin/enlightenment_system"); + _system_exe = ecore_exe_pipe_run + (buf, ECORE_EXE_NOT_LEADER | ECORE_EXE_TERM_WITH_PARENT | + ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_WRITE, NULL); +-- +2.26.2 + diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix index 78f8f3966e..449c16e13b 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/efl.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7"; + sha256 = "0w3srvigg4kfi7xq76c7y4hnq5yr2gxrrsvlyj1g2wc1igz1vyg1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix index 8ba0dffc8a..833a3ba29a 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc, - bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi, - libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms, - xkeyboard_config, +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, alsaLib +, acpid +, bc +, ddcutil +, efl +, pam +, xkeyboard_config +, udisks2 - bluetoothSupport ? true, bluez5, - pulseSupport ? !stdenv.isDarwin, libpulseaudio, +, bluetoothSupport ? true, bluez5 +, pulseSupport ? !stdenv.isDarwin, libpulseaudio }: stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0d1cyl07w9pvi2pf029kablazks2q9aislzl46b6fq5m1465jc75"; + sha256 = "01053hxdmyjfb6gmz1pqmw0llrgc4356np515h5vsqcn59mhvfz7"; }; nativeBuildInputs = [ @@ -25,58 +35,35 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib - bc # for the Everything module calculator mode - bzip2 + acpid # for systems with ACPI for lid events, AC/Battery plug in/out etc + bc # for the Everything module calculator mode + ddcutil # specifically libddcutil.so.2 for backlight control efl - gdbm - libXdmcp - libXrandr - libffi - libpthreadstubs - libxcb - luajit - mesa pam - pcre - xcbutilkeysyms xkeyboard_config + udisks2 # for removable storage mounting/unmounting ] - ++ stdenv.lib.optional stdenv.isLinux libcap - ++ stdenv.lib.optional bluetoothSupport bluez5 - ++ stdenv.lib.optional pulseSupport libpulseaudio + ++ stdenv.lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control + ++ stdenv.lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection ; patches = [ - # Some programs installed by enlightenment (to set the cpu frequency, - # for instance) need root ownership and setuid/setgid permissions, which - # are not allowed for files in /nix/store. Instead of allowing the - # installer to try to do this, the file $out/e-wrappers.nix is created, - # containing the needed configuration for wrapping those programs. It - # can be used in the enlightenment module. The idea is: - # - # 1) rename the original binary adding the extension .orig - # 2) wrap the renamed binary at /run/wrappers/bin/ - # 3) create a new symbolic link using the original binary name (in the - # original directory where enlightenment wants it) pointing to the - # wrapper - - ./enlightenment.suid-exes.patch + # Executables cannot be made setuid in nix store. They should be + # wrapped in the enlightenment service module, and the wrapped + # executables should be used instead. + ./0001-wrapped-setuid-executables.patch ]; postPatch = '' - # edge_cc is a binary provided by efl and cannot be found at the directory - # given by e_prefix_bin_get(), which is $out/bin - - substituteInPlace src/bin/e_import_config_dialog.c \ - --replace "e_prefix_bin_get()" "\"${efl}/bin\"" - substituteInPlace src/modules/everything/evry_plug_calc.c \ --replace "ecore_exe_pipe_run(\"bc -l\"" "ecore_exe_pipe_run(\"${bc}/bin/bc -l\"" ''; - mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ]; + mesonFlags = [ + "-D systemdunitdir=lib/systemd/user" + ]; - enableParallelBuilding = true; + passthru.providedSessions = [ "enlightenment" ]; meta = with stdenv.lib; { description = "The Compositing Window Manager and Desktop Shell"; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch b/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch deleted file mode 100644 index f53f6ffa7c..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- enlightenment-0.22.0.orig/meson/meson_inst.sh 2017-09-25 10:55:43.000000000 -0300 -+++ enlightenment-0.22.0/meson/meson_inst.sh 2017-11-15 08:31:03.336844920 -0200 -@@ -1,6 +1,19 @@ --#!/bin/sh -+#!/bin/sh -x -+ -+w="$out"/e-wrappers.nix -+ -+echo "# Wrappers for programs installed by enlightenment that should be setuid" > $w -+echo "" >> $w -+echo "{" >> $w -+echo " security.wrappers = {" >> $w - - for x in "$@" ; do -- chown root "$DESTDIR/$x" -- chmod a=rx,u+xs "$DESTDIR/$x" -+ f="$DESTDIR$x"; -+ b=$(basename "$f".orig) -+ mv -v "$f" "$f".orig -+ ln -sv /run/wrappers/bin/"$b" "$f" -+ echo " \"$b\".source = \"$f.orig\";" >> $w - done -+ -+echo " };" >> $w -+echo "}" >> $w diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 7494d66cc0..b64094002b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -27,22 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc"; + sha256 = "8RsbIuwfKF5QmINoTAsfSlFJauoQVZEjnlsm+JhnUeY="; }; - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; - }; - }; - - doCheck = true; - nativeBuildInputs = [ vala meson @@ -55,6 +46,7 @@ stdenv.mkDerivation rec { libxml2 gobject-introspection # for finding vapi files ]; + buildInputs = [ gtk3 glib @@ -76,6 +68,15 @@ stdenv.mkDerivation rec { ) ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome3.gnome-clocks"; + }; + }; + meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 7eda4a706c..acd4386d2e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,26 +1,58 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, glib +, gtk3 +, wrapGAppsHook +, gettext +, itstool +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, systemd +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m"; + sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA="; }; + nativeBuildInputs = [ + python3 + meson + ninja + pkgconfig + wrapGAppsHook + gettext + itstool + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + gtk3 + systemd + gsettings-desktop-schemas + gnome3.adwaita-icon-theme + ]; + mesonFlags = [ "-Dman=true" ]; - nativeBuildInputs = [ - python3 - meson ninja pkgconfig wrapGAppsHook gettext itstool - libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - ]; - buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index 2852c816e4..88e5d78c4c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.36.0"; + version = "3.36.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a7v534sqbg7rlrvg9x1rffdf6p9n37blp3wix6anyfl6i99n7c5"; + sha256 = "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 46201629ce..9f51227f23 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b5b1k0a531c2jyf4g59dw7lblga8xrba38mzfdl57dnknbvbafs"; + sha256 = "0vkgpy2afb33rrk94zqlm2q728xhzjj8s24n9wh9ylw00z3nckad"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix index d38339425c..1fefa7dd39 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,24 +1,60 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3, gobject-introspection }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, itstool +, python3 +, wrapGAppsHook +, cairo +, gdk-pixbuf +, colord +, glib +, gtk3 +, gusb +, packagekit +, libwebp +, libxml2 +, sane-backends +, vala +, gnome3 +, gobject-introspection +}: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.2"; + version = "3.36.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; + sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs="; }; - buildInputs = [ - cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb - gtk3 libwebp packagekit sane-backends vala - ]; nativeBuildInputs = [ - meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 - # For setup hook - gobject-introspection + meson + ninja + gettext + itstool + pkgconfig + python3 + wrapGAppsHook + libxml2 + gobject-introspection # For setup hook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + colord + glib + gnome3.adwaita-icon-theme + gusb + gtk3 + libwebp + packagekit + sane-backends + vala ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index bc2afb5197..ef87571e03 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -24,13 +24,13 @@ let pname = "gnome-applets"; - version = "3.36.2"; + version = "3.36.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hlblnajjkvlcd45lxfdxscx7j51nwyvri5jci6ylgpaxlwwm1s8"; + sha256 = "02jwh5yxka2mnzdqnr55lfijplvscy97isv7lqx1zvsi2p7hy38m"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix index 54ea8dcf48..bf6441f682 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix @@ -8,13 +8,13 @@ , libXmu }: let - version = "0.27.0"; + version = "0.28.0"; in gsmakeDerivation { name = "gnustep-back-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "0j400892ysxygh50i3918nn87vkxh15h892jwvphmkd34j8wdn9f"; + sha256 = "1ynd27zwga17mp2qlym90k2xsypdvz24w6gyy2rfvmv0gkvlgrjr"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix index 7017100565..deeca1d600 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix @@ -12,13 +12,13 @@ , libiberty }: let - version = "1.26.0"; + version = "1.27.0"; in gsmakeDerivation { name = "gnustep-base-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "0ws16rwqx0qvqpyjsxbdylfpkgjr19nqc9i3b30wywqcqrkc12zn"; + sha256 = "10xjrv5d443wzll6lf9y65p6v9kvx7xxklhsm1j05y93vwgzl0w8"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/gorm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/gorm/default.nix index c977c61dd0..3817edad36 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/gorm/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/gorm/default.nix @@ -1,13 +1,13 @@ { fetchurl, base, back, gsmakeDerivation, gui }: let - version = "1.2.24"; + version = "1.2.26"; in gsmakeDerivation { name = "gorm-${version}"; - + src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "1jw7vm5ia7ias1mm5if7vvvb66q50zwiqw0ksj5g14f11v8l61rf"; + sha256 = "063f8rlz8py931hfrh95jxvr68bzs33bvckfigzbagp73n892jnw"; }; buildInputs = [ base back gui ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix index 72d109b697..e945af64d9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix @@ -1,12 +1,12 @@ { gsmakeDerivation, fetchurl, base }: let - version = "0.27.0"; + version = "0.28.0"; in gsmakeDerivation { name = "gnustep-gui-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; - sha256 = "1m6k3fa2ndxv0kl2fazi76mwa27gn5jyp24q0rk96f2djhsy94br"; + sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z"; }; buildInputs = [ base ]; patches = [ ./fixup-all.patch ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix index 10c10c33a9..0124e91a9b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libobjc2"; - version = "2.0"; + version = "1.9"; src = fetchFromGitHub { owner = "gnustep"; repo = "libobjc2"; rev = "v${version}"; - sha256 = "1b4h0a4pqr8j6300qr2wmi33r7ysvp705gs0ypx69hbmifln0mlf"; + sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix index 9b8692f0da..9b803be025 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, clang, which, libobjc }: let - version = "2.7.0"; + version = "2.8.0"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "1khiygfkz0zhh9b5nybn40g0xnnjxchk24n49hff1bwanszir84h"; + sha256 = "0pfaylrr3xgn5026anmja4rv4l7nzzaqsrkxycyi0p4lvm12kklz"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix index aa74be8d5f..7451fa3fac 100644 --- a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lumina-calculator"; - version = "2019-04-27"; + version = "1.6.0"; src = fetchFromGitHub { owner = "lumina-desktop"; repo = pname; - rev = "ccb792fc713aa7163fffd37fc20c83ffe9ca7523"; - sha256 = "0cdyz94znycsc3qxg5bmg51bwms7586d4ja1bsmj8cb9pd3lv980"; + rev = "v${version}"; + sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y"; }; sourceRoot = "source/src-qt5"; diff --git a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix index af9d469e1b..b4e5039af1 100644 --- a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, poppler }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lumina-pdf"; - version = "2019-04-27"; + version = "1.6.0"; src = fetchFromGitHub { owner = "lumina-desktop"; repo = pname; - rev = "645ed591ef91c3607d3ab87dd86f7acfd08b05c9"; - sha256 = "0gl943jb9c9rcgb5wksx3946hwlifghfd27r97skm9is8ih6k0vn"; + rev = "v${version}"; + sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6"; }; sourceRoot = "source/src-qt5"; diff --git a/third_party/nixpkgs/pkgs/desktops/lumina/lumina/default.nix b/third_party/nixpkgs/pkgs/desktops/lumina/lumina/default.nix index 048b559c34..1b30b8cdb1 100644 --- a/third_party/nixpkgs/pkgs/desktops/lumina/lumina/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lumina/lumina/default.nix @@ -1,28 +1,28 @@ -{ stdenv, - fetchFromGitHub, - desktop-file-utils, - fluxbox, - numlockx, - qmake, - qtbase, - qtmultimedia, - qtsvg, - qttools, - qtx11extras, - xorg, - xscreensaver, - wrapGAppsHook +{ stdenv +, mkDerivation +, fetchFromGitHub +, fluxbox +, numlockx +, qmake +, qtbase +, qtmultimedia +, qtsvg +, qttools +, qtx11extras +, xorg +, xscreensaver +, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "lumina"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "lumina-desktop"; repo = pname; rev = "v${version}"; - sha256 = "0rj2gzifr98db7i82cg3hg7l5yfik810pjpawg6n54qbzq987z25"; + sha256 = "0bvs12c9pkc6fnkfcr7rrxc8jfbzbslch4nlfjrzwi203fcv4avw"; }; nativeBuildInputs = [ @@ -32,19 +32,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libxcb + fluxbox # window manager for Lumina DE + numlockx # required for changing state of numlock at login + qtbase + qtmultimedia + qtsvg + qtx11extras xorg.libXcursor xorg.libXdamage - xorg.xcbutilwm + xorg.libxcb xorg.xcbutilimage - qtbase - qtsvg - qtmultimedia - qtx11extras - fluxbox + xorg.xcbutilwm xscreensaver - desktop-file-utils - numlockx ]; patches = [ @@ -66,6 +65,12 @@ stdenv.mkDerivation rec { # Fix location of fluxbox styles substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" + + # Fix desktop files + for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do + echo ===== $i + substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina' + done ''; qmakeFlags = [ @@ -74,6 +79,8 @@ stdenv.mkDerivation rec { "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; + passthru.providedSessions = [ "Lumina-DE" ]; + meta = with stdenv.lib; { description = "A lightweight, portable desktop environment"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix index ba83f0e316..fc97906ab7 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "0isshh627zr69kdmjxsy75i1nh95ky2wfhgy90g8j4zijpkdrd3l"; + sha256 = "1gjxml6c9m3xn094zbr9835sr4749dpxk4nc0ap9lg27qim63gx3"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix index ae772272c4..93e5ffec2a 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "0c0y8sy12laqyanvy6mmnpjvy1yb8k3241pbxhc3nyl5zrq3hzdh"; + sha256 = "1cip2dbvxbdlx1axz5sn4mwigwvfxb1q14byn09crv71adyfprw5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix index 705d6aec79..a0bdd9bfae 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -3,40 +3,40 @@ , fetchFromGitHub , cmake , pkgconfig +, alsaLib +, kguiaddons +, kwindowsystem +, libXdamage +, libdbusmenu +, liblxqt +, libpulseaudio +, libqtxdg +, libstatgrab +, libsysstat +, lm_sensors +, lxmenu-data , lxqt-build-tools +, lxqt-globalkeys +, lxqtUpdateScript +, menu-cache +, pcre , qtbase +, qtsvg , qttools , qtx11extras -, qtsvg -, libdbusmenu -, kwindowsystem , solid -, kguiaddons -, liblxqt -, libqtxdg -, lxqt-globalkeys -, libsysstat , xorg -, libstatgrab -, lm_sensors -, libpulseaudio -, alsaLib -, menu-cache -, lxmenu-data -, pcre -, libXdamage -, lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-panel"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0k2gqf9f4g8fpny8p5m1anzk7mdxm9dgh6xlngz25nj4mshnq3xs"; + sha256 = "0f3sjzkria61nz342daxps2w57wnx6laq9iww8hha7rbi24yw2sd"; }; nativeBuildInputs = [ @@ -46,28 +46,28 @@ mkDerivation rec { ]; buildInputs = [ + alsaLib + kguiaddons + kwindowsystem + libXdamage + libdbusmenu + liblxqt + libpulseaudio + libqtxdg + libstatgrab + libsysstat + lm_sensors + lxmenu-data + lxqt-globalkeys + menu-cache + pcre qtbase + qtsvg qttools qtx11extras - qtsvg - libdbusmenu - kwindowsystem solid - kguiaddons - liblxqt - libqtxdg - lxqt-globalkeys - libsysstat - xorg.libpthreadstubs xorg.libXdmcp - libstatgrab - lm_sensors - libpulseaudio - alsaLib - menu-cache - lxmenu-data - pcre - libXdamage + xorg.libpthreadstubs ]; passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index f5a5b18cfc..7465eefc3c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16zwd2jfrmsnzfpywirkrpyilq1jj99liwvg77l20b1dbql9dc0q"; + sha256 = "12rzcv5n4s299c8787islkn4xcjb9bbrj12mxcd5ii91jq39aii4"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/maxx/default.nix b/third_party/nixpkgs/pkgs/desktops/maxx/default.nix deleted file mode 100644 index fc48514ff0..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/maxx/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, gnused -, gcc, bash, gtk-engine-murrine, gtk_engines, librsvg - -, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm -, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 -, gdk-pixbuf, libGL, ncurses5 - -, dmidecode, pciutils, usbutils -}: - -stdenv.mkDerivation rec { - pname = "MaXX"; - version = "2.0.1"; - codename = "Indigo"; - - srcs = [ - (fetchurl { - url = "http://maxxdesktop.arcadedaydream.com/${codename}-Releases/Installers/MaXX-${codename}-${version}-x86_64.tar.gz"; - sha256 = "17hd3j8773kmvvhyf657in6zmhnw4mbvyn4r6dfip5bdaz66pj01"; - }) - ]; - - nativeBuildInputs = [ makeWrapper autoPatchelfHook gnused ]; - buildInputs = [ - stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm - libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 - gdk-pixbuf libGL ncurses5 - ]; - - buildPhase = '' - sed -i "s/\(LD_LIBRARY_PATH=.*\)$/\1:\$LD_LIBRARY_PATH/p" etc/system.desktopenv - - substituteInPlace bin/adminterm \ - --replace /bin/bash ${bash}/bin/bash - - substituteInPlace share/misc/HOME/initMaXX-Desktop-Home.sh \ - --replace "cp " "cp --no-preserve=mode " - ''; - - installPhase = '' - maxx=$out/opt/MaXX - mkdir -p "$maxx" $out/share $maxx/sbin - - mv -- ./* "$maxx" - ln -s $maxx/share/icons $out/share - - wrapProgram $maxx/etc/skel/Xsession.dt \ - --prefix GTK_PATH : "${gtk-engine-murrine}/lib/gtk-2.0:${gtk_engines}/lib/gtk-2.0" \ - --prefix GDK_PIXBUF_MODULE_FILE : "$(echo ${librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)" - - while IFS= read -r -d ''$'\0' i; do - if isExecutable "$i"; then - wrapProgram "$i" \ - --prefix PATH : ${gcc}/bin - fi - done < <(find "$maxx" -type f -print0) - - wrapProgram $maxx/bin/hinv \ - --prefix PATH : ${stdenv.lib.makeBinPath [ dmidecode pciutils usbutils ]} - ''; - - meta = with stdenv.lib; { - description = "A replica of IRIX Interactive Desktop"; - homepage = "https://www.facebook.com/maxxdesktop/"; - license = { - fullName = "The MaXX Interactive Desktop for Linux License Agreement"; - url = "http://maxxdesktop.arcadedaydream.com/Indigo-Releases/docs/license.html"; - free = false; # redistribution is only allowed to *some* hardware, etc. - }; - maintainers = [ maintainers.gnidorah ]; - platforms = ["x86_64-linux"]; - longDescription = '' - A clone of IRIX Interactive Desktop made in agreement with SGI. - Provides simple and fast retro desktop environment. - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix index 65fc5446c1..e53e986060 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, - networkmanager-qt, plasma-workspace, qtx11extras, solid, udev + ddcutil, networkmanager-qt, plasma-workspace, qtx11extras, solid, udev }: mkDerivation { @@ -13,5 +13,9 @@ mkDerivation { kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen networkmanager-qt plasma-workspace qtx11extras + ddcutil + ]; + cmakeFlags = [ + "-DHAVE_DDCUTIL=On" ]; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index 24df606e24..00da58f662 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "1.8.14"; + version = "1.8.15"; - sha256 = "1ph9bcqfm2nccliagl8zdl1dizh62qnr8m5hacri3cs2jhc0jjpy"; + sha256 = "1y9d88i0kwl7ak4d65gy3qf4bpkiyaqxd4g6px3v1ykf274k8al8"; nativeBuildInputs = [ docbook_xsl diff --git a/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index f8be40eeca..04420370ff 100644 --- a/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -82,7 +82,10 @@ rec { }; clang = wrapCCWith { - cc = binaries; + cc = binaries // { + # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib) + lib = targetAndroidndkPkgs.libraries; + }; bintools = binutils; libc = targetAndroidndkPkgs.libraries; extraBuildCommands = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix b/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix index db1a864075..d3208b12dd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -18,9 +18,9 @@ stdenv.mkDerivation { buildInputs = [ stdenv gcc glibc libtool gnumake autoconf automake - file which zsh m4 gnome2.gtk zlib gmp + file which zsh m4 gtk2 zlib gmp gnome2.libgnomecanvas pango sqlite - libxml2 pkgconfig perl smlnj + libxml2 pkg-config perl smlnj ]; makePatch = ./make.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix new file mode 100644 index 0000000000..be39d81f55 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ciao"; + version = "1.19.0"; + src = fetchFromGitHub { + owner = "ciao-lang"; + repo = "ciao"; + rev = "v${version}"; + sha256 = "03qzcb4ivgkiwdpw7a94dn74xqyxjwz5ilrr53rcblsh5ng299jp"; + }; + + configurePhase = '' + ./ciao-boot.sh configure --instype=global --prefix=$prefix + ''; + + buildPhase = '' + ./ciao-boot.sh build + ''; + + installPhase = '' + ./ciao-boot.sh install + ''; + + meta = with stdenv.lib; { + homepage = "https://ciao-lang.org/"; + description = "A general purpose, multi-paradigm programming language in the Prolog family"; + license = licenses.lgpl21; + maintainers = with maintainers; [ suhr ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix index 896b3a7678..b8b02cb9d6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200406"; + version = "20200517"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "1dd6fakavnadpm8h8r4d1saf9flm7ilhknfy0q6i5i237psjf7i5"; + sha256 = "05bbsrxw2nxjlcfc22w1ympi66jnmzymivg29cvidh5n28jgwba2"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix index 6f4237d2dc..20abc1c78b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/buildDotnet.nix @@ -13,14 +13,16 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; , curl }: let pname = if type == "aspnetcore" then "aspnetcore-runtime" else if type == "netcore" then "dotnet-runtime" else "dotnet-sdk"; + platform = if stdenv.isDarwin then "osx" else "linux"; suffix = { x86_64-linux = "x64"; aarch64-linux = "arm64"; + x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); urls = { - aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; - netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; - sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; + aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; + netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; + sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; }; descriptions = { aspnetcore = "ASP .NET Core runtime ${version}"; @@ -50,7 +52,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = '' + postFixup = stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet patchelf --set-rpath "${rpath}" $out/dotnet find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; @@ -65,7 +67,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ kuznero ]; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix index 6497e8bdf9..dd1510548a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -19,6 +19,7 @@ rec { sha512 = { x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; aarch64-linux = null; # no aarch64 version of this package is available + x86_64-darwin = "1psqqpin4hipr2hzfp79712d6cag892jx4fx5001nlsynwrdq3vi4liakz4yz41rvk0jyd7f07z90wj97xlxyrqiqcc1fdbgn2q0px9"; }; }; @@ -27,6 +28,7 @@ rec { sha512 = { x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710"; + x86_64-darwin = "2pxqpcw3djr18m0y124fbd6pz4lb5brlgvpvd9pdirkpsar8dmipsrhxcsk0d902zyxzgj1ac1ygzxsz49xvrkmh6s1m3w5fk8fws2f"; }; }; @@ -35,6 +37,7 @@ rec { sha512 = { x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g"; + x86_64-darwin = "0fjn18vizgfdbziklhgppnvka5iw2hb4pfi6047i46il8ydb6z1m40cflq436sdf07sivi0mnldg9247qvqrl6f078w3fwnh3bwlac8"; }; }; @@ -49,6 +52,7 @@ rec { sha512 = { x86_64-linux = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; aarch64-linux = "2xkg4q88q5jw6jdz6cxj8vsjr475nd0fcvifkv1shdm2j9dsjy233hwpxbr140m5n5ggyh6z99238z9j4kp2az977y8y8irz8m8ppvf"; + x86_64-darwin = "2p04j6p4j93pan71ih13hv57zxalcirh0n3vfjq0cfb80pbhf1f5cgxl24pw6kifh6hhh38rj62c4mr69lxzlqc8sfcfaws8dyz2avm"; }; }; @@ -57,6 +61,7 @@ rec { sha512 = { x86_64-linux = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; aarch64-linux = "1lp8din7d5jv5fkyq1a7m01i1xg9jwpiljvam1kcyzsnwzvi0cb4ji336cfx4lqrn95gvc75gkzi6q8b4fz0h21gvk6z6kmlcr63nyg"; + x86_64-darwin = "0s20k7xawwd09xhy4xdcxp1rw6jd418ibrvhb509dnj480g48xryda2203g4mpswd24v2kx0n9qzxgbrbq9lvasfglkxi84bbqayp83"; }; }; @@ -65,6 +70,7 @@ rec { sha512 = { x86_64-linux = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; aarch64-linux = "32843q2lj7dgciq62g9v1q31vwfjyv5vaxrz712d942mcg5lyzjygwri106bv4naq3a22131ldzwnsifbdn2vq1iz60raqdb7ss9vnf"; + x86_64-darwin = "3apswk2bhalgi0hm7h2j9p152jvp39h4xilxxzix5j1n36b442l1pwk7lj7019lxafjqkz5y850xkfcp14ks5wcvs33xs2c0aqwxvcn"; }; }; @@ -75,6 +81,7 @@ rec { sha512 = { x86_64-linux = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; aarch64-linux = "2sm5yf376w5dm0za3gbcj251kc909fmlasmlyn70zhqp2jiii075vcqh40racjlwlhsfydx32cw7kgnv238lad5mw5jxy143zql5xl3"; + x86_64-darwin = "311sihjzg0x5inyrz0px29jikxcibd6l56xfdmxkncgwaikf3663x10dfl246qhz8v0f3lvg2vndgp5icbaqrp8awsnrhsl0vi5d7fh"; }; }; @@ -83,6 +90,7 @@ rec { sha512 = { x86_64-linux = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; aarch64-linux = "3hf61d5adlfffy51627ypp36qc5r55g9xwgfxqd0c7vj9bqmpiph673bvqqpr189df9shxr21p94cwrc5n36z72a37vw4ic8ks2yayx"; + x86_64-darwin = "35flr1p5zpcd77mjsl6qy9ipxc5k9j6pk7ca6mnvqqjf0r3agm3qf8cs5fbraprvkwj8fha3giwbp5xir6050fbb374375idn9x12d8"; }; }; @@ -91,6 +99,7 @@ rec { sha512 = { x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks"; + x86_64-darwin = "00xs87zj94v6yr6xs294bficp6lxpghyfswhnwqfkx62jy80qr5fa2y7s10ich3cbm2daa8dby56iizdvi7rnlvp23gfkq12gq4w1g8"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix index 5947b572ce..701dcae2fc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, makeWrapper , fpc, gtk2, glib, pango, atk, gdk-pixbuf , libXi, xorgproto, libX11, libXext +, gdb, gnumake, binutils }: stdenv.mkDerivation rec { pname = "lazarus"; @@ -34,8 +35,12 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ - --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" + wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' \ + "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ + --prefix NIX_${binutils.infixSalt}_LDFLAGS ' ' \ + "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ + --prefix LCL_PLATFORM ' ' "$LCL_PLATFORM" \ + --prefix PATH ':' "${fpc}/bin:${gdb}/bin:${gnumake}/bin:${binutils}/bin" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix index 2fb9e3ce2f..ec963ab3b8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchurl, autoconf, gcc, coreutils, ... }: +# This derivation is a reduced-functionality variant of Gambit stable, +# used to compile the full version of Gambit stable *and* unstable. -stdenv.mkDerivation { +{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +# As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better + +gccStdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; @@ -16,29 +20,25 @@ stdenv.mkDerivation { CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out + ./configure --prefix=$out/gambit ''; buildPhase = '' # Copy the (configured) sources now, not later, so we don't have to filter out # all the intermediate build products. - mkdir -p $out ; cp -rp . $out/ + mkdir -p $out/gambit ; cp -rp . $out/gambit/ # build the gsc-boot* compiler - make bootstrap + make -j$NIX_BUILD_CORES bootstrap ''; installPhase = '' - cp -fa ./ $out/ + cp -fa ./ $out/gambit/ ''; forceShare = [ "info" ]; - meta = { + meta = gambit-support.meta // { description = "Optimizing Scheme to C compiler, bootstrap step"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix index e17241b6d9..c6a48bd744 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -1,11 +1,13 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, gcc, src, coreutils }: +{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, + src, version, git-version, + gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling # Gambit output, producing code that is 3x slower. IIRC the benchmarks from Gambit@30, # the numbers were still heavily in favor of GCC in October 2019. # Thus we use GCC over clang, even on macOS. - +# # Also note that I (fare) just ran benchmarks from https://github.com/ecraven/r7rs-benchmarks # with Gambit 4.9.3 with -O1 vs -O2 vs -Os on Feb 2020. Which wins depends on the benchmark. # The fight is unclear between -O1 and -O2, where -O1 wins more often, by up to 17%, @@ -13,29 +15,33 @@ # However, -Os seems more consistent in winning slightly against both -O1 and -O2, # and is overall 15% faster than -O2. As for compile times, -O1 is fastest, # -Os is about 29%-33% slower than -O1, while -O2 is about 40%-50% slower than -O1. -# Overall, -Os seems like the best choice, and that's what we now use. +# +# Overall, -Os seems like the best choice, but I care more about compile-time, +# so I stick with -O1 (in the defaults above), which is also the default for Gambit. + +gccStdenv.mkDerivation rec { -stdenv.mkDerivation rec { pname = "gambit"; - inherit version; - inherit src; - - bootstrap = import ./bootstrap.nix ( pkgs ); + inherit src version git-version; + bootstrap = gambit-support.gambit-bootstrap; # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. buildInputs = [ git autoconf bootstrap openssl ]; + # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more? + # Or wrap relevant programs to add a suitable PATH ? + #runtimeDeps = [ gnused gnugrep ]; + configureFlags = [ "--enable-single-host" - "--enable-c-opt=-Os" + "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. - "--enable-poll" "--enable-openssl" - "--enable-default-runtime-options=f8,-8,t8" # Default to UTF-8 for source and all I/O + "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -50,14 +56,22 @@ stdenv.mkDerivation rec { # "--enable-coverage" # "--enable-inline-jumps" # "--enable-char-size=1" # default is 4 - ]; + ] ++ + # due not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 + lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' - export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \ - CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ + export CC=${gcc}/bin/gcc \ + CXX=${gcc}/bin/g++ \ + CPP=${gcc}/bin/cpp \ + CXXCPP=${gcc}/bin/cpp \ + LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out ${builtins.concatStringsSep " " configureFlags} + + ${gambit-params.fix-stamp git-version} + + ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ @@ -69,28 +83,26 @@ stdenv.mkDerivation rec { buildPhase = '' # Make bootstrap compiler, from release bootstrap mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && + cp -rp ${bootstrap}/gambit/. boot/. && chmod -R u+w boot && cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */ ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && + for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done && cd .. && cp boot/gsc/gsc gsc-boot && # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch + make -j$NIX_BUILD_CORES from-scratch + ''; + + postInstall = '' + mkdir $out/bin + cd $out/bin + ln -s ../gambit/bin/* . ''; doCheck = true; - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - # NB regarding platforms: only actually tested on Linux, *should* work everywhere, - # but *might* need adaptation e.g. on macOS. - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; - }; + meta = gambit-support.meta; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix index 303f6a30aa..8f77daa417 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: -callPackage ./build.nix { +callPackage ./build.nix rec { version = "4.9.3"; + git-version = version; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; }; - inherit stdenv; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix new file mode 100644 index 0000000000..0e78831f2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix @@ -0,0 +1,33 @@ +{ pkgs, lib }: + +rec { + stable-params = { + defaultRuntimeOptions = "f8,-8,t8"; + buildRuntimeOptions = "f8,-8,t8"; + fix-stamp = git-version : ""; + }; + + unstable-params = { + defaultRuntimeOptions = "iL,fL,-L,tL"; + buildRuntimeOptions = "i8,f8,-8,t8"; + fix-stamp = git-version : '' + substituteInPlace configure \ + --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ + --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + ''; + }; + + export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; + + gambit-bootstrap = import ./bootstrap.nix ( pkgs ); + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = lib.licenses.lgpl21; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux, + # tested on macOS once in a while, *should* work everywhere. + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index 4c33c83c67..3ac4f53631 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, fetchFromGitHub }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-02-24"; -# git-version = "4.9.3-979-gc69e9f70"; + version = "unstable-2020-05-15"; + git-version = "4.9.3-1109-g3c4d40de"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc"; - sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k"; + rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c"; + sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr"; }; - inherit stdenv; + gambit-params = gambit-support.unstable-params; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 5785782a67..4ceeda3183 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -3,6 +3,7 @@ , langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin +, langD ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false @@ -58,6 +59,7 @@ let majorVersion = "9"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ ++ optional langAda ../gnat-cflags.patch + ++ optional langD ../libphobos.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { @@ -136,10 +138,10 @@ stdenv.mkDerivation ({ ) else "") + stdenv.lib.optionalString targetPlatform.isAvr '' - makeFlagsArray+=( - 'LIMITS_H_TEST=false' - ) - ''; + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; @@ -196,6 +198,7 @@ stdenv.mkDerivation ({ enableShared langC + langD langCC langFortran langAda @@ -235,14 +238,14 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit stdenv crossStageStatic langD libcCross threadsCross; }) EXTRA_TARGET_FLAGS EXTRA_TARGET_LDFLAGS ; passthru = { - inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; + inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index c78a281489..437042baf4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -14,6 +14,7 @@ , langC , langCC +, langD ? false , langFortran , langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null , langAda ? false @@ -114,6 +115,7 @@ let lib.concatStrings (lib.intersperse "," ( lib.optional langC "c" ++ lib.optional langCC "c++" + ++ lib.optional langD "d" ++ lib.optional langFortran "fortran" ++ lib.optional langJava "java" ++ lib.optional langAda "ada" @@ -174,6 +176,9 @@ let "libat_cv_have_ifunc=no" "--disable-gnu-indirect-function" ] + ++ lib.optionals (langD) [ + "--with-target-system-zlib=yes" + ] ; in configureFlags diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix index bce9a8d473..62d9818ca9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -1,18 +1,21 @@ -{ stdenv, crossStageStatic, libcCross, threadsCross }: +{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: let inherit (stdenv) lib hostPlatform targetPlatform; in { + # For non-cross builds these flags are currently assigned in builder.sh. + # It would be good to consolidate the generation of makeFlags + # ({C,CXX,LD}FLAGS_FOR_{BUILD,TARGET}, etc...) at some point. EXTRA_TARGET_FLAGS = let - mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([ - "-idirafter ${lib.getDev dep}${dep.incdir or "/include"}" + mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([ + "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}" ] ++ stdenv.lib.optionals (! crossStageStatic) [ "-B${lib.getLib dep}${dep.libdir or "/lib"}" ]); - in mkFlags libcCross - ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross) + in mkFlags libcCross langD + ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross langD) ; EXTRA_TARGET_LDFLAGS = let diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/libphobos.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/libphobos.patch new file mode 100644 index 0000000000..a16ea5416f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/libphobos.patch @@ -0,0 +1,119 @@ +diff --git a/Makefile.in b/Makefile.in +index a375471..83c5ecb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -804,7 +804,7 @@ BASE_FLAGS_TO_PASS = \ + "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \ + "GNATBIND=$(GNATBIND)" \ + "GNATMAKE=$(GNATMAKE)" \ +- "GDC=$(GDC)" \ ++ "`echo 'GDC=$(GDC)' | sed -e 's/-idirafter [^ ]*//g'`" \ + "GDCFLAGS=$(GDCFLAGS)" \ + "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ + "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ +@@ -817,7 +817,7 @@ BASE_FLAGS_TO_PASS = \ + "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ + "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \ + "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \ +- "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \ ++ "`echo 'GDC_FOR_TARGET=$(GDC_FOR_TARGET)' | sed -e 's/-idirafter [^ ]*//g'`" \ + "GDCFLAGS_FOR_TARGET=$(GDCFLAGS_FOR_TARGET)" \ + "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ + "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \ +@@ -890,7 +890,7 @@ EXTRA_HOST_FLAGS = \ + 'DLLTOOL=$(DLLTOOL)' \ + 'GFORTRAN=$(GFORTRAN)' \ + 'GOC=$(GOC)' \ +- 'GDC=$(GDC)' \ ++ "`echo 'GDC=$(GDC)' | sed -e 's/-idirafter [^ ]*//g'`" \ + 'LD=$(LD)' \ + 'LIPO=$(LIPO)' \ + 'NM=$(NM)' \ +@@ -966,8 +966,11 @@ EXTRA_TARGET_FLAGS = \ + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ + "TFLAGS=$$TFLAGS" ++EXTRA_TARGET_FLAGS_D = \ ++ "`echo $(EXTRA_TARGET_FLAGS) | sed -e 's/-idirafter [^ ]*//g'`" + + TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) ++TARGET_FLAGS_TO_PASS_D = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS_D) + + # Flags to pass down to gcc. gcc builds a library, libgcc.a, so it + # unfortunately needs the native compiler and the target ar and +@@ -47285,7 +47288,7 @@ check-target-libphobos: + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libphobos && \ +- $(MAKE) $(TARGET_FLAGS_TO_PASS) check) ++ $(MAKE) $(TARGET_FLAGS_TO_PASS_D) check) + + @endif target-libphobos + +@@ -47300,7 +47303,7 @@ install-target-libphobos: installdirs + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libphobos && \ +- $(MAKE) $(TARGET_FLAGS_TO_PASS) install) ++ $(MAKE) $(TARGET_FLAGS_TO_PASS_D) install) + + @endif target-libphobos + +@@ -47315,7 +47318,7 @@ install-strip-target-libphobos: installdirs + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libphobos && \ +- $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) ++ $(MAKE) $(TARGET_FLAGS_TO_PASS_D) install-strip) + + @endif target-libphobos + +diff --git a/Makefile.tpl b/Makefile.tpl +index 41cae58..b3d32e7 100644 +--- a/Makefile.tpl ++++ b/Makefile.tpl +@@ -721,8 +721,11 @@ EXTRA_TARGET_FLAGS = \ + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ + "TFLAGS=$$TFLAGS" ++EXTRA_TARGET_FLAGS_D = \ ++ "`echo $(EXTRA_TARGET_FLAGS) | sed -e 's/-idirafter [^ ]*//g'`" + + TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) ++TARGET_FLAGS_TO_PASS_D = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS_D) + + # Flags to pass down to gcc. gcc builds a library, libgcc.a, so it + # unfortunately needs the native compiler and the target ar and +diff --git a/libphobos/Makefile.in b/libphobos/Makefile.in +index e894417..2d18dcb 100644 +--- a/libphobos/Makefile.in ++++ b/libphobos/Makefile.in +@@ -365,6 +365,7 @@ AM_MAKEFLAGS = \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ ++ "`echo 'MAKEFLAGS=$(MAKEFLAGS)' | sed -e 's/-j[0-9]+/-j1/'`" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ +@@ -694,6 +695,8 @@ uninstall-am: + + .PRECIOUS: Makefile + ++.NOTPARALLEL: ++ + # GNU Make needs to see an explicit $(MAKE) variable in the command it + # runs to enable its job server during parallel builds. Hence the + # comments below. +diff --git a/libphobos/configure b/libphobos/configure +index b3cb5f3..25adf2b 100755 +--- a/libphobos/configure ++++ b/libphobos/configure +@@ -5122,6 +5122,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++GDC=`$as_echo "$GDC" | sed -e 's/-idirafter [^ ]*//g'` + + ac_ext=d + ac_compile='$GDC -c $GDCFLAGS conftest.$ac_ext >&5' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix index 21c2936fa0..8297dafff8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix @@ -1,34 +1,34 @@ -{ stdenv, makeStaticLibraries, - coreutils, rsync, bash, +{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, gambit, src }: + version, git-version, + gambit-support, + gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: + +# We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix +let stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "gerbil"; inherit version; inherit src; - # Use makeStaticLibraries to enable creation of statically linked binaries buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; - buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - buildInputs = [ gambit rsync bash ] - ++ buildInputs_libraries ++ buildInputs_staticLibraries; + # TODO: either fix all of Gerbil's dependencies to provide static libraries, + # or give up and delete all tentative support for static libraries. + #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ gambit ] + ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' - echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm - - patchShebangs . - + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; + patchShebangs . ; grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do - substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - done - grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do - substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' - done - substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\"" + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; + done ; ''; ## TODO: make static compilation work. @@ -47,22 +47,31 @@ stdenv.mkDerivation rec { # LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF + configurePhase = '' + (cd src && ./configure \ + --prefix=$out/gerbil \ + --with-gambit=${gambit}/gambit \ + --enable-libxml \ + --enable-libyaml \ + --enable-zlib \ + --enable-sqlite \ + --enable-mysql \ + --enable-lmdb \ + --enable-leveldb) + ''; + buildPhase = '' runHook preBuild - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' - - # Enable autodetection of a default GERBIL_HOME - for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out\")" - done - for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out\")" - done - # gxprof testing uses $HOME/.cache/gerbil/gxc - export HOME=$$PWD + export HOME=$PWD + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_GXC=$PWD/bin/gxc + export GERBIL_BASE=$PWD + export GERBIL_HOME=$PWD + export GERBIL_PATH=$PWD/lib + export PATH=$PWD/bin:$PATH + ${gambit-support.export-gambopt gambit-params} # Build, replacing make by build.sh ( cd src && sh build.sh ) @@ -72,19 +81,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/ - cp -fa bin lib etc doc $out/ - - cat > $out/bin/gxi < "${version-path}" + fi + patchShebangs . ; + ''; + + postConfigure = '' + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_PATH=$PWD/.build + export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs} + ${pkgs.gambit-support.export-gambopt gambit-params} + ''; + + buildPhase = '' + runHook preBuild + ./build.ss + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil/lib + cp -fa .build/lib $out/gerbil/ + bins=(.build/bin/*) + if [ 0 -lt ''${#bins} ] ; then + cp -fa .build/bin $out/gerbil/ + mkdir $out/bin + cd $out/bin + ln -s ../gerbil/bin/* . + fi + runHook postInstall + ''; + + dontFixup = true; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix new file mode 100644 index 0000000000..075a63d7bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-utils"; + version = "unstable-2020-05-17"; + git-version = "33ef720"; + package = "clan"; + gerbil = gerbil-unstable; + gambit-params = gambit-support.unstable-params; + version-path = ""; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-utils"; + rev = "33ef720799ba98dc9eec773c662f070af4bac016"; + sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf"; + }; + meta = { + description = "Gerbil Clan: Community curated Collection of Common Utilities"; + homepage = "https://github.com/fare/gerbil-utils"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix index eb78eed35e..9de6dc4290 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix @@ -1,15 +1,15 @@ -{ stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }: +{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: -callPackage ./build.nix { - version = "unstable-2020-02-27"; - git-version = "0.16-DEV-493-g1ffb74db"; - #gambit = gambit-unstable; - gambit = gambit; +callPackage ./build.nix rec { + version = "unstable-2020-05-17"; + git-version = "0.16-1-g36a31050"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41"; - sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097"; + rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698"; + sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv"; }; - inherit stdenv; + inherit gambit-support; + gambit = gambit-unstable; + gambit-params = gambit-support.unstable-params; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix index 8fee93cc4a..b524d3d6b0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.8"; + version = "1.13.11"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; + sha256 = "0y86q2k00lh8c7wj3lha43g804iwr61nap8j3i907l2sway1mvc9"; }; # perl is used for testing go vet @@ -229,8 +229,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - setupHook = ./setup-hook.sh; - disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix new file mode 100644 index 0000000000..858da31101 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, clang, chez +}: + +# Uses scheme to bootstrap the build of idris2 +stdenv.mkDerivation { + name = "idris2"; + version = "0.2.0-840e020"; + + src = fetchFromGitHub { + owner = "idris-lang"; + repo = "Idris2"; + rev = "840e020d8ccc332135e86f855ad78053ca15d603"; + sha256 = "1l6pdjiglwd13pf56xwzbjzyyxgz48ypfggjgsgqk2w57rmbfy90"; + }; + + strictDeps = true; + nativeBuildInputs = [ makeWrapper clang chez ]; + buildInputs = [ chez ]; + + prePatch = '' + patchShebangs --build tests + + # Do not run tests as part of the build process + substituteInPlace bootstrap.sh --replace "make test" "# make test" + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + # The name of the main executable of pkgs.chez is `scheme` + buildFlags = [ "bootstrap" "SCHEME=scheme" ]; + + # idris2 needs to find scheme at runtime to compile + postInstall = '' + wrapProgram "$out/bin/idris2" --prefix PATH : "${chez}/bin" + ''; + + meta = { + description = "A purely functional programming language with first class types"; + homepage = https://github.com/idris-lang/Idris2; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ wchresta ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index 2d28954b22..510fca1838 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "06imnpbc5mn1dis051f54q6nq80dbm51nhxmba61rdyhf1131ml8"; + sha256 = "0wxhc0ghjk88zrrn9a18h979ipkia2rx12489515gzhlplfx6724"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix new file mode 100644 index 0000000000..db77d989c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "11"; + patch_version = "0+alpha1"; + sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg"; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index ed313a9d00..3c4a2b7850 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "241"; - sha256.i686-linux = "1niiwifby8zqvsh0ccdf3n21vlqfvvms223dc3kw2c2rksch3yg4"; - sha256.x86_64-linux = "1jz8d6663jspxgw8yxxx5ca6jaa3g67dbbi5d83pdxjmg1kk57a1"; - sha256.armv7l-linux = "1pjzyi1qd4nzfwvh0z5fpwga7j8mksiv5h8wzirv2ccdyy4wqw24"; - sha256.aarch64-linux = "1zliv4a0ygrsdpq36b89yl7jf7kidmxqbnp1sk2661y471x02p9l"; + patchVersion = "251"; + sha256.i686-linux = "0c6d25c09459e435570204f1a22a1cb765ce5d62c5bced92c9a9546b7be337f2"; + sha256.x86_64-linux = "777a8d689e863275a647ae52cb30fd90022a3af268f34fc5b9867ce32f1b374e"; + sha256.armv7l-linux = "f1b0c979e1b61ec52ebd5e1d0b754d7681d8623b09ac90c69718a553ef9b0cd1"; + sha256.aarch64-linux = "58baeaab7da97dd5a6b02ad2dcd77c14b3b6ba014029ee67dbc2bd5f0fa98d1b"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix index a1cf5b2deb..ac4bc32486 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, boost, cmake, ncurses, python2 +{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , cln ? null, gmp ? null }: @@ -16,12 +16,12 @@ in stdenv.mkDerivation rec { pname = "solc"; - version = "0.5.15"; + version = "0.6.8"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y"; + sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0"; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ] ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python2 ]; + checkInputs = [ ncurses python3 ]; # Test fails on darwin for unclear reason doCheck = stdenv.hostPlatform.isLinux; @@ -56,13 +56,7 @@ stdenv.mkDerivation rec { pushd .. # IPC tests need aleth avaliable, so we disable it sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh; do - patchShebangs "$i" - done - for i in ./scripts/*.py; do - patchShebangs "$i" - done - for i in ./test/*.sh; do + for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do patchShebangs "$i" done TERM=xterm ./scripts/tests.sh diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix index b955cd7f87..b3176cac78 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix @@ -6,13 +6,13 @@ let main = ./main.go; in buildGoModule rec { pname = "tinygo"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa"; + sha256 = "0das5z5y2x1970yi9c4yssxvwrrjhdmsj495q0r5mb02amvc954v"; }; overrideModAttrs = (_: { diff --git a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix index 7ac59cc586..273873c880 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix @@ -1,19 +1,19 @@ { lib, rustPlatform, fetchFromGitHub, makeWrapper, z3 }: rustPlatform.buildRustPackage rec { - pname = "zz-unstable"; - version = "2020-03-02"; + pname = "zz"; + version = "0.1"; src = fetchFromGitHub { owner = "aep"; repo = "zz"; - rev = "2dd92b959f7c34bf99af84b263e3864a5c41a0fe"; - sha256 = "14ch5qgga2vpxvb53v4v4y6cwy3kkm10x1vbfpyfa7im57syib85"; + rev = version; + sha256 = "0kqrfm2r9wn0p2c3lcprsy03p9qhrwjs990va8qi59jp704l84ad"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "1m9az3adbkx2ab6fkg64cr7f9d73jbx8kx2pmgpw29csmh9hzqjy"; + cargoSha256 = "0yllcqxyyhwr9h0z8q84l0ms8x6jrqhpg79ik4xng6h5yf4ab0pq"; postInstall = '' wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix index d37608658b..a53caac621 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/extra.nix @@ -80,7 +80,7 @@ let ############################ rec-mathcomp-extra-config = { initial = { - mathcomp-finmap = version: { + mathcomp-finmap = {version, coqPackages}: { meta = { description = "A finset and finmap library"; repo = "finmap"; @@ -89,7 +89,7 @@ let passthru.compatibleCoqVersions = flip elem [ "8.8" "8.9" "8.10" "8.11" ]; }; - mathcomp-bigenough = version: { + mathcomp-bigenough = {version, coqPackages}: { meta = { description = "A small library to do epsilon - N reasonning"; repo = "bigenough"; @@ -98,7 +98,7 @@ let passthru.compatibleCoqVersions = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; }; - multinomials = version: { + multinomials = {version, coqPackages}: { buildInputs = [ which ]; propagatedBuildInputs = with coqPackages; [ mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; @@ -110,7 +110,7 @@ let passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ]; }; - mathcomp-analysis = version: { + mathcomp-analysis = {version, coqPackages}: { propagatedBuildInputs = with coqPackages; [ mathcomp.field mathcomp-finmap mathcomp-bigenough ]; meta = { @@ -122,9 +122,9 @@ let passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; }; - mathcomp-real-closed = version: { + mathcomp-real-closed = {version, coqPackages}: { propagatedBuildInputs = with coqPackages; - [ coq mathcomp.field mathcomp-bigenough ]; + [ mathcomp.field mathcomp-bigenough ]; meta = { description = "Mathematical Components Library on real closed fields"; repo = "real-closed"; @@ -133,7 +133,7 @@ let passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; }; - coqeal = version: { + coqeal = {version, coqPackages}: { buildInputs = [ which ]; propagatedBuildInputs = with coqPackages; [ mathcomp-algebra bignums paramcoq multinomials ]; @@ -240,7 +240,7 @@ let "1.10.0" = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";}; }; "8.10" = { - "1.11.0+beta1" = v5; + "1.11.0+beta1" = removeAttrs v5 ["coqeal"]; "1.10.0" = v4; "1.9.0" = removeAttrs v3 ["coqeal"]; }; @@ -260,8 +260,8 @@ let "8.7" = { "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; - "1.9.0" = removeAttrs v3 ["coqeal"]; - "1.8.0" = removeAttrs v2 ["coqeal"]; + "1.9.0" = removeAttrs v3 ["coqeal" "mathcomp-analysis"]; + "1.8.0" = removeAttrs v2 ["coqeal" "mathcomp-analysis"]; "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; }; }; @@ -318,13 +318,14 @@ let rec-mathcomp-extra-override = generic: old: let version = getVersion generic; package = old.meta.package or "math-comp-nix"; - cfg = pkgUp ((mathcomp-extra-config.initial.${package} or (_: {})) version) old + cfg = pkgUp ((mathcomp-extra-config.initial.${package} or (_: {})) + { inherit version coqPackages; }) old // { inherit version; }; fix = attrs: fix-attrs (pkgUp cfg attrs); in if isFunction generic then fix (generic cfg) else if generic == null || generic == "" then fix {} - else if isDerivation generic then fix generic.drvAttrs + else if isDerivation generic then generic.drvAttrs else if isAttrs generic then fix generic else if generic == "broken" then fix { meta.broken = true; passthru.compatibleCoqVersions = _: false; } else let fixedcfg = fix cfg; in fixedcfg // ( @@ -365,7 +366,7 @@ in mathcomp-real-closed = current-mathcomp-extra "mathcomp-real-closed"; coqeal = current-mathcomp-extra "coqeal"; - mathcomp-extra-fast = map (pkg: current-mathcomp-extra pkg) + mathcomp-extra-fast = map current-mathcomp-extra (attrNames (filterAttrs (pkg: config: !(config?slow && config.slow)) for-this)); - mathcomp-extra-all = map (pkg: current-mathcomp-extra pkg) (attrNames for-this); + mathcomp-extra-all = map current-mathcomp-extra (attrNames for-this); } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix index 690fce9da6..99e3ddf34f 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "guile-cairo"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"; + sha256 = "11fn2x2973dizzw94fkz6rj9crsyzchphq5097lvbkvqpzbyidyp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index 86c7938db0..c023aa65fd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -3,17 +3,17 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.0.94"; + version = "0.0.97"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "103x5ih48rhhdipar66bp0s0j62fv4r3sszh8fwaivs7dvsvcvsd"; + sha256 = "1gd9ih9l02n1j9qkbxb36d3cb5sddwvxiw8kkicgc4xig77lsa7z"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "0fin80x898qzylzq91q6mp8pgwk0sciwwa9l71mdhahqasa90sri"; + sha256 = "08py6bawfrhg90fbcnv2mq4c91g5wa1q2q6zdjy2i1b9q4x1654r"; }; dontUnpack = true; @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Clojure babushka for the grey areas of Bash"; longDescription = '' - The main idea behind babashka is to leverage Clojure in places where you + The main idea behind babashka is to leverage Clojure in places where you would be using bash otherwise. As one user described it: - I’m quite at home in Bash most of the time, but there’s a substantial - grey area of things that are too complicated to be simple in bash, but - too simple to be worth writing a clj/s script for. Babashka really + I’m quite at home in Bash most of the time, but there’s a substantial + grey area of things that are too complicated to be simple in bash, but + too simple to be worth writing a clj/s script for. Babashka really seems to hit the sweet spot for those cases. Goals: @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { - Easy installation: grab the self-contained binary and run. No JVM needed. - Familiarity and portability: - Scripts should be compatible with JVM Clojure as much as possible - - Scripts should be platform-independent as much as possible. Babashka + - Scripts should be platform-independent as much as possible. Babashka offers support for linux, macOS and Windows. - Allow interop with commonly used classes like java.io.File and System - Multi-threading support (pmap, future, core.async) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 828cf3a724..f6f4e36532 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1v2kgbx6w1ii83a1c9ridm1i52rmcjb0g1d23fhqn7hya5bwrhr6"; + sha256 = "1zdiwddnppwg5zrizy2ypd449zj4mivib76h73xhvr1syl7dk7sc"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix index 8ccb0e5464..4b112de1f0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -272,8 +272,8 @@ let }); php74base = callPackage generic (_args // { - version = "7.4.4"; - sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; + version = "7.4.6"; + sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; }); defaultPhpExtensions = { all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh index 3185b1f9fa..1fcc0bbd4b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh @@ -4,12 +4,14 @@ venvShellHook() { if [ -d "${venvDir}" ]; then echo "Skipping venv creation, '${venvDir}' already exists" + source "${venvDir}/bin/activate" else echo "Creating new venv environment in path: '${venvDir}'" @pythonInterpreter@ -m venv "${venvDir}" - fi - source "${venvDir}/bin/activate" + source "${venvDir}/bin/activate" + runHook postVenvCreation + fi runHook postShellHook echo "Finished executing venvShellHook" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index e782eb2fde..e5828fdd37 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -53,6 +53,10 @@ in with passthru; stdenv.mkDerivation rec { hardeningDisable = optional stdenv.isi686 "pic"; + # Remove bootstrap python from closure + dontPatchShebangs = true; + disallowedReferences = [ python ]; + C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs; LIBRARY_PATH = makeLibraryPath buildInputs; LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix index f7ec06ce4f..6c4a6ae8e2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -9,6 +9,7 @@ let envs = let inherit python; pythonEnv = python.withPackages(ps: with ps; [ ]); + pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); in { # Plain Python interpreter plain = rec { @@ -16,6 +17,20 @@ let interpreter = env.interpreter; is_venv = "False"; is_nixenv = "False"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.isPy3k && !python.isPyPy) { + # Use virtualenv from a Nix env. + # Does not function with Python 2 + # ValueError: source and destination is the same /nix/store/38kz3j1a87cq5y59k5w7k9yk4cqgc5b2-python-2.7.18/lib/python2.7/os.py + nixenv-virtualenv = rec { + env = runCommand "${python.name}-virtualenv" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "True"; }; } // lib.optionalAttrs (python.implementation != "graal") { # Python Nix environment (python.buildEnv) @@ -24,6 +39,7 @@ let interpreter = env.interpreter; is_venv = "False"; is_nixenv = "True"; + is_virtualenv = "True"; }; } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { # Venv built using plain Python @@ -36,6 +52,7 @@ let interpreter = "${env}/bin/${python.executable}"; is_venv = "True"; is_nixenv = "False"; + is_virtualenv = "True"; }; } // lib.optionalAttrs (python.pythonAtLeast "3.8") { @@ -49,6 +66,7 @@ let interpreter = "${env}/bin/${pythonEnv.executable}"; is_venv = "True"; is_nixenv = "True"; + is_virtualenv = "True"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_python.py b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_python.py index 011978c625..41a7e687d2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_python.py +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_python.py @@ -16,6 +16,7 @@ ENV = "@env@" INTERPRETER = "@interpreter@" PYTHON_VERSION = "@pythonVersion@" +IS_VIRTUALENV = @is_virtualenv@ IS_VENV = @is_venv@ IS_NIXENV = @is_nixenv@ IS_PYPY = platform.python_implementation() == "PyPy" @@ -37,7 +38,7 @@ class TestCasePython(unittest.TestCase): @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: + if IS_VENV or IS_NIXENV or IS_VIRTUALENV: self.assertNotEqual(sys.prefix, sys.base_prefix) else: self.assertEqual(sys.prefix, sys.base_prefix) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix index e4501d8523..2833a4d567 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.05"; + version = "2020.05.1"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "08d1591k8lhyw3kmxq53lf24wg6d61lg2xc81zzcglask9n9ilc6"; + sha256 = "1m4xpghhgi7iijbzvr7bzkay7k93bwpvdg58jp31csrwdzz4q5z1"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix index cad1aabf37..7100a730a6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/68.nix @@ -7,11 +7,11 @@ let python3Env = buildPackages.python3.withPackages (p: [p.six]); in stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "68.4.2"; + version = "68.7.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "1x1fglg1b85hb0srd6k7n5svl0nlgdm4njc8q13s2750v5ck4ljx"; + sha256 = "0w3mad0r4khcd7hfmm3xix9x6mp5yp8g8kyh18vanfnjqdls0gmd"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 67d54af7bb..dd6e3eb4a7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,26 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1df99iak0psydlg9m8f8qq4zyh4wbi5l4qgsdjr2lm74ci3483xy"; + sha256 = "1zlljqkkcw8h94ff1w47sqn9pn0zal06s06i8nciv5i2d1xaqg5n"; fetchSubmodules = true; }; - cargoSha256 = "170bz48jrc1k2ylfmd3bcry0xpcxx8p3rzzv9mprlfmrfpb0b28r"; + cargoSha256 = "1hb7l7a76lgbji0qm9qd80m35cp346hyi4rphfk6p80v142cw8hh"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - # no test on darwin due to - # https://github.com/bytecodealliance/wasmtime/issues/1556 - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix new file mode 100644 index 0000000000..241caf16d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix @@ -0,0 +1,33 @@ +{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: + +mkDerivation rec { + + # Version 0.2 is meant to be used with the Agda 2.6.1 compiler. + pname = "cubical"; + version = "0.2"; + + src = fetchFromGitHub { + repo = pname; + owner = "agda"; + rev = "v${version}"; + sha256 = "07qlp2f189jvzbn3aqvpqk2zxpkmkxhhkjsn62iq436kxqj3z6c2"; + }; + + LC_ALL = "en_US.UTF-8"; + + # The cubical library has several `Everything.agda` files, which are + # compiled through the make file they provide. + nativeBuildInputs = [ ghc glibcLocales ]; + buildPhase = '' + make + ''; + + meta = with lib; { + description = + "A cubical type theory library for use with the Agda compiler"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ alexarice ryanorendorff ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index b2323d62df..7ea38b6472 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.14.5"; + version = "5.15.12"; src = fetchurl { - sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54"; + sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 9b32d46b3b..ece38b2cb0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.870.2"; + version = "9.880.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0mpp1iq4ws9yhcv0bnn0czzyim7whcan34c7a052sh8w9kp5y6sl"; + sha256 = "17sb9hylrr7wl63whr39ypjg7xps32k9z5zdgchj5dyq6n6kw3wh"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 50de0c88a5..b559ef96f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,24 +1,24 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost , brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl -, python, rapidjson, snappy, thrift, which, zlib, zstd +, python3, rapidjson, snappy, thrift, which, zlib, zstd , enableShared ? true }: let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "46c9e977f58f6c5ef1b81f782f3746b3656e5a8c"; - sha256 = "1z2s6zh58nf484s0yraw7b1aqgx66dn2wzp1bzv9ndq03msklwly"; + rev = "bcd9ebcf9204a346df47204fe21b85c8d0498816"; + sha256 = "0m16pqzbvxiaradq088q5ai6fwnz9srbap996397znwppvva479b"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1xdp1yni9i1cpml326s78qql1g832m800h7zjlqmk89983g94696"; + sha256 = "18lyvbibfdw3w77cy5whbq7c6mshn5fg2bhvgw7v226a7cs1rifb"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -28,19 +28,18 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2"; - sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl"; + "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; + sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; }; patches = [ # patch to fix python-test ./darwin.patch - # Adjust CMake target names to make -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON work. - # Remove this when updating to the next version. + + # fix musl build (fetchpatch { - name = "arrow-use-upstream-cmake-target-names.patch"; - url = "https://github.com/apache/arrow/commit/396861b38d2f4e805db7c2ecd2c96fff0ca2678b.patch"; - sha256 = "0ki7nx858374anvwyi4szz5hgnnzv4fghdd05c38bzry9rfljgb1"; + url = "https://github.com/apache/arrow/commit/de4168786dfd8ab932f48801e0a7a6b8a370c19d.diff"; + sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; stripLen = 1; }) ] ++ lib.optionals (!enableShared) [ @@ -66,8 +65,9 @@ in stdenv.mkDerivation rec { thrift zlib zstd - python.pkgs.python - python.pkgs.numpy + ] ++ lib.optionals enableShared [ + python3.pkgs.python + python3.pkgs.numpy ]; preConfigure = '' @@ -92,8 +92,6 @@ in stdenv.mkDerivation rec { # Parquet options: "-DARROW_PARQUET=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" - "-DTHRIFT_COMPILER=${thrift}/bin/thrift" - "-DTHRIFT_VERSION=${thrift.version}" ] ++ lib.optionals (!enableShared) [ "-DARROW_BUILD_SHARED=OFF" "-DARROW_BOOST_USE_SHARED=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/biblesync/default.nix b/third_party/nixpkgs/pkgs/development/libraries/biblesync/default.nix index 814ecf986e..27c6637d9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/biblesync/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/biblesync/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "biblesync"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "karlkleinpaste"; repo = "biblesync"; rev = version; - sha256 = "1baq2fwf6132i514xrvq05p2gy98mkg1rn5whf9q5k475q81nrlr"; + sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ libuuid ]; meta = with stdenv.lib; { - homepage = "http://www.crosswire.org/wiki/BibleSync"; + homepage = "https://wiki.crosswire.org/BibleSync"; description = "A multicast protocol to Bible software shared conavigation"; longDescription = '' BibleSync is a multicast protocol to support Bible software shared diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index c1a75e7753..605df23810 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "04p3kgk1zadadl6n0prwc77nfxrbdasbwbqpws1y9y6f77lrcxdn"; + sha256 = "1w7sanxhh4sv4ap3ildqzlziazcy7ydx2pbjjrf3k60lcwq0lzn6"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix index b8d00984cd..5140205ebc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; + sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw"; }; # replace faulty macos detection diff --git a/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix new file mode 100644 index 0000000000..f011c04d88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/comedilib/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, flex +, yacc +, xmlto +, docbook_xsl +, docbook_xml_dtd_44 +, swig +, perl +, python3 +}: + +stdenv.mkDerivation rec { + pname = "comedilib"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Linux-Comedi"; + repo = "comedilib"; + rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "159sv4jdgmcaqz76vazkyxxb85ni7pg14p1qv7y94hib3kspc195"; + }; + + nativeBuildInputs = [ + autoreconfHook + flex + yacc + swig + xmlto + docbook_xml_dtd_44 + docbook_xsl + python3 + perl + ]; + + preConfigure = '' + patchShebangs --build doc/mkref doc/mkdr perl/Comedi.pm + ''; + + configureFlags = [ + "--with-udev-hotplug=${placeholder "out"}/lib" + "--sysconfdir=${placeholder "out"}/etc" + ]; + + outputs = [ "out" "dev" "man" "doc" ]; + + meta = with stdenv.lib; { + description = "The Linux Control and Measurement Device Interface Library"; + homepage = "https://github.com/Linux-Comedi/comedilib"; + license = licenses.lgpl21; + maintainers = [ maintainers.doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix index 52d6ce5214..d219a8e0be 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "3.8"; + version = "4.0"; pname = "cpputest"; src = fetchurl { url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8"; + sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix index 6537354797..94d9776b54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1k8pbpwll19l3i3s34l9yhkxj4yqxbrf393nm29jqwlhvi9nz8qm"; + sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 6b238074fc..799375ba44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch +{ stdenv, fetchFromGitLab , meson, ninja, nasm, pkgconfig , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary @@ -9,23 +9,16 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1gr859xzbqrsp892v9zzzgrg8smnnzgc1jmb68qzl54a4g6jrxm0"; + sha256 = "0zmn4ald518vgs3cc0ga227aimr38h16mkliq5j8mg6p9dn7nx1w"; }; - 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 diff --git a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix index ae7eca9271..f3ed36db31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq"; + sha256 = "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix new file mode 100644 index 0000000000..e37856abe2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "duckdb"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "cwida"; + repo = "duckdb"; + rev = "v${version}"; + sha256 = "1pz2q9c3803w8vbqiz9lag4g1kgl4ff9xca0kpcz72ap39pbp5jk"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/cwida/duckdb"; + description = "DuckDB is an embeddable SQL OLAP Database Management System"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 120a309b65..68648e64b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -239,11 +239,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { pname = "ffmpeg-full"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb"; + url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; + sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1"; }; patches = [ ./prefer-libdav1d-over-libaom.patch ]; @@ -416,7 +416,7 @@ stdenv.mkDerivation rec { "--enable-cross-compile" ]; - nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm @@ -444,6 +444,13 @@ stdenv.mkDerivation rec { cp -a tools/qt-faststart $out/bin/ ''; + postFixup = optionalString stdenv.isLinux '' + # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + addOpenGLRunpath $out/lib/libavcodec.so + addOpenGLRunpath $out/lib/libavutil.so + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix index 3b3fc900ed..5d1f93a9e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (rec { - version = "${branch}.15"; + version = "${branch}.16"; branch = "2.8"; - sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m"; + sha256 = "0lfmfd6rhywis9rblkxv33rpwfga9xv261fq4cn3pkx1izih7ybk"; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 31cb0477c2..1a7c619a12 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.2.2"; + version = "4.2.3"; branch = "4.2"; - sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n"; + sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix index 4741a3d156..856553c6de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "fmt"; - version = "6.2.0"; + version = "6.2.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs"; + sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic"; }; patches = [ @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; sha256 = "hjE6Q/ubA4UhvuJXgcsA3wiGoDK031P19njQRL9JF8M="; }) + + # Fix cmake config paths. + (fetchpatch { + url = "https://github.com/fmtlib/fmt/pull/1702.patch"; + sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3"; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix index 25a53f7601..9021e78a5b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; + sha256 = "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr"; }; buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix index 31ce660296..96ec3434b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.33"; + version = "1.1.39"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "1gq972ngpdmpb63mc6myxsd0rf3qph95qx542021xh9f2791qffi"; + sha256 = "1p5ixc1hxh9mmhplndf1j87cw9989bp0fh0nsbx6l3p2wnqz9nyl"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix index 165fe3a252..968ee3a09d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, vtk, darwin }: +{ stdenv, fetchurl, cmake, vtk_7, darwin }: stdenv.mkDerivation rec { version = "3.0.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - buildInputs = [ cmake vtk ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ cmake vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; propagatedBuildInputs = [ ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index 20e2f6905c..684bad14dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "1.3.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "04yrm3kg8m77kh6z0b9yw4h43fm0d54wnyrd8lp5ddn487kawm5g"; + sha256 = "1j6c6vmnip24pxafk29y312vif1xlryymv7aaxgqp9ca3s91nlrf"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 14b19bf5a0..9b72ca3524 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.0"; + version = "0.12.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq"; + sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"; }; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix index f41fa73a6e..308a4db280 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.46"; + version = "0.10.47"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9"; + sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 8549eeffde..ab497eadb6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.28.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.29.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "17p3xwz5izlqg5ijnim4asl40pr8yhg9wrrmws4g0dk37nkn1x6p"; + sha256 = "1n604grkf2amzrmwcz6am0rpbp3yfb062lpgmhv943hj8wk7xw27"; fetchSubmodules = true; }; patches = [ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341) (fetchpatch { - url = "https://github.com/grpc/grpc/commit/198d221e775cf73455eeb863672e7a6274d217f1.patch"; - sha256 = "11k35w6ffvl192rgzzj2hzyzjhizdgk7i56zdkx6v60zxnyfn7yq"; + url = "https://github.com/grpc/grpc/commit/2f4cf1d9265c8e10fb834f0794d0e4f3ec5ae10e.patch"; + sha256 = "0ams3jmgh9yzwmxcg4ifb34znamr7pb4qm0609kvil9xqvkqz963"; }) ]; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix index 5f09f437f0..cbba9c5fce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchbzr, pkgconfig +{ stdenv, fetchFromGitLab, pkgconfig , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection +, genericUpdater, common-updater-scripts }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gsettings-qt"; - version = "0.1.20170824"; + version = "0.2"; - src = fetchbzr { - url = "http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk"; - rev = "85"; - sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi"; + src = fetchFromGitLab { + group = "ubports"; + owner = "core"; + repo = pname; + rev = "v${version}"; + sha256 = "14l8xphw4jd9ckqba13cyxq0i362x8lfsd0zlfawwi2z1q1vqm92"; }; nativeBuildInputs = [ @@ -52,9 +55,15 @@ stdenv.mkDerivation { done ''; + passthru.updateScript = genericUpdater { + inherit pname version; + rev-prefix = "v"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + meta = with stdenv.lib; { - description = "Qt/QML bindings for GSettings"; - homepage = "https://launchpad.net/gsettings-qt"; + description = "Library to access GSettings from Qt"; + homepage = "https://gitlab.com/ubports/core/gsettings-qt"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index d389b69087..6e0d351b8b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "hyperscan"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "intel"; repo = pname; - sha256 = "09dgvmjhdbrfgrsmjljl4wn06a8zlv9sd4d4l6h6bfbz57d35f95"; + sha256 = "0psfkzmyhqfrs750b10d0xv37rcz6nwsw1mnc7zagijckwis2wvj"; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/itk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/itk/4.x.nix index 833723d4d2..cd8e70a997 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itk/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk_7 }: stdenv.mkDerivation rec { name = "itk-4.13.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ]; + buildInputs = [ libX11 libuuid vtk_7 ]; meta = { description = "Insight Segmentation and Registration Toolkit"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix index 6c0298c0f7..84dedfa0b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, pkgconfig, libX11, libuuid, xz, vtk, Cocoa }: +, pkgconfig, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix index 702738fdfc..33a9974211 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0x6yr14znp42b92i7br4wxfjri6i689dsifzz9kbyzvn558a16b4"; + sha256 = "0xkps414ndb87abla7dlv44ndnfg5r5vwgmkm3ngcq9knbv1x6w7"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix index 3191dc4446..4a83175f66 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "3.0.19"; + version = "3.0.20"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "0x613f2hiqi2vbhp20fcl7rhxb07f2714lplzd0vkvv07phagip9"; + sha256 = "0iqqq568q9sxppr08rvmpyjq0n82pm04x9rxhh3mf20x1ds7ngj5"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index 26616078b4..25fa4db38f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "1v0y7998p8a8wpblnpdyk5zzvpj8pbrpzxwxmv0b0axrhaarxrf3"; + sha256 = "1rhichmalqz7p1hiwvn6y0isralpbf0w5nyjp4lg0asawkxy9cww"; }; postPatch = '' - substituteInPlace Makefile --replace /usr $out + substituteInPlace Makefile --replace /usr/local $out ''; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 10f46a67e8..3bd5495199 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av"; + sha256 = "0ylgxw1lxdqvayy5285mlfrkr9cvsgasy2zci6g6mv9rng261xn5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix index e886baa479..e2552ba713 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -1,41 +1,31 @@ -{ thinkpad ? false -, stdenv -, fetchFromGitHub -, fetchurl +{ stdenv +, fetchFromGitLab , pkgconfig , meson , ninja -, libusb1 +, gusb , pixman , glib , nss -, gtk3 +, gobject-introspection , coreutils , gtk-doc , docbook_xsl , docbook_xml_dtd_43 -, openssl ? null }: -assert thinkpad -> openssl != null; - stdenv.mkDerivation rec { - pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; - version = "1.0"; + pname = "libfprint"; + version = "1.90.1"; + outputs = [ "out" "devdoc" ]; - src = { - libfprint-thinkpad = - fetchFromGitHub { - owner = "3v1n0"; - repo = "libfprint"; - rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c"; - sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b"; - }; - libfprint = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz"; - sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd"; - }; - }.${pname}; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = pname; + rev = "v${version}"; + sha256 = "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a"; + }; nativeBuildInputs = [ pkgconfig @@ -44,28 +34,20 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 + gobject-introspection ]; buildInputs = [ - libusb1 # drop in 2.0 for gusb + gusb pixman glib nss - gtk3 - ] - ++ stdenv.lib.optional thinkpad openssl - ; + ]; mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" - "-Dx11-examples=false" ]; - postPatch = '' - substituteInPlace libfprint/meson.build \ - --replace /bin/echo ${coreutils}/bin/echo - ''; - meta = with stdenv.lib; { homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmpack/default.nix index cdc45956e7..736474d29a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmpack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { - owner = "tarruda"; + owner = "libmpack"; repo = "libmpack"; rev = version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix index 5cb971f5db..074e384293 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.6.0"; + version = "1.6.1"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "1fdyywm915mmilfmzp7lz4rnmm05kkw0adrdqpqi4n8icp4d530g"; + sha256 = "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index 79bd53ab03..39a3bf6b2c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -68,10 +68,11 @@ stdenv.mkDerivation rec { "-Denable-gtk-doc=true" ]; - # FIXME: fails two new tests added in 1.7.1: - # libosinfo:symbols / check-symfile - # 3/24 libosinfo:symbols / check-symsorting - doCheck = false; + preCheck = '' + patchShebangs ../osinfo/check-symfile.pl ../osinfo/check-symsorting.pl + ''; + + doCheck = true; meta = with stdenv.lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix new file mode 100644 index 0000000000..f8359cded9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchgit +, cmake +, linux-pam +, enablePython ? false +, python ? null +}: + +assert enablePython -> python != null; + +stdenv.mkDerivation rec { + pname = "libpam-wrapper"; + version = "1.1.3"; + + src = fetchgit { + url = "git://git.samba.org/pam_wrapper.git"; + rev = "pam_wrapper-${version}"; + sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p"; + }; + + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional enablePython [ python ]; + + # We must use linux-pam, using openpam will result in broken fprintd. + buildInputs = [ linux-pam ]; + + meta = with stdenv.lib; { + description = "Wrapper for testing PAM modules"; + homepage = "https://cwrap.org/pam_wrapper.html"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.elyhaka ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix index d90106f89d..9499be80f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "18wwfbbggsjrd4w3dczxa2gv3zvx0fqp68b8h1zzvdbyn91f16mz"; + sha256 = "131cd4asmpm4nskidzgiy8xibbnpibvvbq857a0pcky77min5g4z"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 7b6a85cec0..43fa300f10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uchardet"; - version = "0.0.6"; + version = "0.0.7"; outputs = [ "bin" "out" "man" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"; + sha256 = "1ca51sryhryqz82v4d0graaiqqq5w2f33a9gj83b910xmq499irz"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix new file mode 100644 index 0000000000..25c8594860 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused +, python27, utillinux, which, bash +}: + +let + version = "1.15"; +in stdenv.mkDerivation { + pname = "libxsmm"; + inherit version; + + src = fetchFromGitHub { + owner = "hfp"; + repo = "libxsmm"; + rev = "refs/tags/${version}"; + sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj"; + }; + + buildInputs = [ + coreutils + gfortran7 + gnused + python27 + utillinux + which + ]; + + prePatch = '' + patchShebangs . + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; + license = licenses.bsd3; + homepage = "https://github.com/hfp/libxsmm"; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ chessai ]; + inherit version; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix index e7227ac638..c0220e6e21 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "0rpk1hadfcvjps5k307sddv23q73m2918wclfxfi6mj8l7gwkcn9"; + sha256 = "08g6kqaj079aq7i6c1pwj778lrr3yk188wn1byxdd6zqpwrsv71q"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 03a1e77e7b..bf6c5b1baf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "1zql498587wvb0gaavnzxj2zm535sgm22x0sjgl4ncfk7ragnv9c"; + sha256 = "0hk30adrm0s1g5flfaqfr3lc72y3hlmhqnyrqd7p0y91rsaw86b9"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix index ccbb1e3a66..54b725c995 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "onig"; - version = "6.9.4"; + version = "6.9.5_rev1"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "11imbhj4p5w8lvrmcczccm1zq014h9j85r51z2ibb8jhf5p3lslh"; + sha256 = "1sx683hbb58gbjvla69n5vxdzwqhjqisqbfkf9xi95wr7p9ycjhl"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { homepage = "https://github.com/kkos/oniguruma"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix index 82cfb5c3d0..a62138e8cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr"; + sha256 = "10sbiwjljxi0a1q3xakmf6v02x3yf38ljvjpql70q4rqggqj9zhh"; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index b5adc78c7c..a4274f064e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { # Disable install stripping as it breaks cross-compiling. # We strip binaries anyway in fixupPhase. - makeFlags= [ "STRIP=" ]; + makeFlags= [ + "STRIP=" + "prefix=$(out)" + "moduledir=$(out)/lib/modules" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; configureFlags = [ "--enable-overlays" @@ -35,9 +39,18 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + postBuild = '' + make $makeFlags -C contrib/slapd-modules/passwd/sha2 + make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2 + ''; + doCheck = false; # needs a running LDAP server - installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ]; + installFlags = [ + "sysconfdir=$(out)/etc" + "localstatedir=$(out)/var" + "moduledir=$(out)/lib/modules" + ]; # 1. Fixup broken libtool # 2. Libraries left in the build location confuse `patchelf --shrink-rpath` @@ -51,9 +64,12 @@ stdenv.mkDerivation rec { rm -rf $out/var rm -r libraries/*/.libs + rm -r contrib/slapd-modules/passwd/*/.libs ''; postInstall = '' + make $installFlags install -C contrib/slapd-modules/passwd/sha2 + make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2 chmod +x "$out"/lib/*.{so,dylib} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 627ac68d68..38041e6b5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin +, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric # Enable CUDA support @@ -75,16 +75,16 @@ in stdenv.mkDerivation rec { # default compilers should be indentical to the # compilers at build time - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ $out/share/openmpi/mpicc-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ $out/share/openmpi/ortecc-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \ $out/share/openmpi/mpic++-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:' \ + sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \ $out/share/openmpi/mpifort-wrapper-data.txt ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix index 840da04617..38e50fb367 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openvdb"; - version = "6.2.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1ypkzdkgsbcczfvrqblnxfzm13w0mdkskgqmgvmbfi66vpaazdrf"; + sha256 = "0hhs50f05hkgj1wni53cwbsx2bhn1aam6z65j133356gbid2carl"; }; outputs = [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix index 81da7332d0..506c78aca8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.10.1"; + name = "pcl-1.11.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "1i4zfcikvdl5z1s3lh0n46fgi42s9vbki4hfmy7656hamajfai0v"; + sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix index c6a9835d13..8c4d688b69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnumake imake makedepend ]; sourceRoot = "."; - patches = [ ./patch ]; + patches = [ ./patch.patch ]; postPatch = '' substituteInPlace 2006/src/config/site.def \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/patch b/third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/patch.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/patch rename to third_party/nixpkgs/pkgs/development/libraries/physics/cernlib/patch.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index 3dfbaa96d3..b854fa88cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "0avkgn19plq593p872hirr0yj2vgjvsi88w68ngarbp55hla1c1h"; + sha256 = "00zwvmnp2j79z95n9lgnq67q02bqfgirqla8j9y6jd8k3r052as3"; }; buildInputs = [ python2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix deleted file mode 100644 index 27d8197a43..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }: - -stdenv.mkDerivation rec { - pname = "mcgrid"; - version = "2.0.2"; - - src = fetchurl { - url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz"; - sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; - }; - - buildInputs = [ fastnlo rivet ]; - propagatedNativeBuildInputs = [ pkgconfig ]; - - preConfigure = '' - substituteInPlace mcgrid.pc.in \ - --replace "Cflags:" "Cflags: -std=c++11" - ''; - - CXXFLAGS = "-std=c++11"; - enableParallelBuilding = true; - - meta = { - description = "A software package that provides access to the APPLgrid and fastNLO interpolation tools for Monte Carlo event generator codes, allowing for fast and flexible variations of scales, coupling parameters and PDFs in cutting edge leading- and next-to-leading-order QCD calculations"; - license = stdenv.lib.licenses.gpl3; - homepage = "http://mcgrid.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index 9870fadf6e..bcf986346a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -1,20 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: +{ stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; - version = "2.7.2"; + version = "3.1.1"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1bxcb99a3l5d2gl93zgfzgw6v95kx1ss5045mkz3ciyw8w5nmb9l"; + sha256 = "1cgr9jyfd9r7dwbk8fr3rys5dc74cmbx368441jvqngqymmb563w"; }; patches = [ ./darwin.patch # configure relies on impure sw_vers to -Dunix - (fetchpatch { - url = "https://gitlab.com/hepcedar/rivet/commit/37bd34f52cce66946ebb311a8fe61bfc5f69cc00.diff"; - sha256 = "0wj3ilpfq2gpc33bj3800l9vyvc9lrrlj1x9ss5qki0yiqd8i2aa"; - }) ]; latex = texlive.combine { inherit (texlive) @@ -32,26 +28,27 @@ stdenv.mkDerivation rec { xkeyval xstring ;}; - buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ]; - propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; + + nativeBuildInputs = [ rsync makeWrapper ]; + buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ]; + propagatedBuildInputs = [ fastjet fastjet-contrib ]; preConfigure = '' - substituteInPlace analyses/Makefile.in \ - --replace "!(tmp)" "" - substituteInPlace bin/rivet-buildplugin.in \ + substituteInPlace bin/rivet-build.in \ + --replace 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \ --replace 'which' '"${which}/bin/which"' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ - --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " + --replace 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " ''; preInstall = '' substituteInPlace bin/make-plots \ --replace '"which"' '"${which}/bin/which"' \ - --replace '"latex"' '"${latex}/bin/latex"' \ - --replace '"dvips"' '"${latex}/bin/dvips"' \ + --replace '"latex"' '"'$latex'/bin/latex"' \ + --replace '"dvips"' '"'$latex'/bin/dvips"' \ --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \ --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \ - --replace '"kpsewhich"' '"${latex}/bin/kpsewhich"' \ + --replace '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \ --replace '"convert"' '"${imagemagick.out}/bin/convert"' substituteInPlace bin/rivet \ --replace '"less"' '"${less}/bin/less"' @@ -62,9 +59,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" - "--with-hepmc=${hepmc2}" "--with-yoda=${yoda}" - ]; + ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + "--with-hepmc3=${hepmc}" + ] else [ + "--with-hepmc=${hepmc}" + ]); enableParallelBuilding = true; @@ -74,11 +74,11 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl3; homepage = "https://rivet.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index ad7bc7f52f..9d4d60949c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -1,22 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; - version = "1.7.7"; + version = "1.8.2"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1ki88rscnym0vjxpfgql8m1lrc7vm1jb9w4jhw9lvv3rk84lpdng"; + sha256 = "1nqbv334iwdvbsc5bw8g936cxzc1hyzv9r8kjy4v124vrw8qqmc9"; }; - patches = [ - # fixes "TypeError: expected bytes, str found" in writeYODA() - (fetchpatch { - url = "https://gitlab.com/hepcedar/yoda/commit/d2bbbe92912457f8a29b440cbfa0b39daf28ec34.diff"; - sha256 = "1x60piswpxwak61r2sdclsc8pzi1fshpkjnxlyflsa1iap77vkq8"; - }) - ]; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) @@ -27,6 +19,7 @@ stdenv.mkDerivation rec { postPatch = '' touch pyext/yoda/*.{pyx,pxd} + patchShebangs . ''; postInstall = '' @@ -37,6 +30,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + doInstallCheck = true; + installCheckTarget = "check"; + meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; license = stdenv.lib.licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index d873555c0f..f9cc7b56ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkgconfig @@ -33,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.2"; + version = "0.3.5"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; + sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ="; }; nativeBuildInputs = [ @@ -73,13 +72,6 @@ stdenv.mkDerivation rec { vulkan-loader xorg.libX11 ]; - patches = [ - # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch"; - sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x"; - }) - ]; mesonFlags = [ "-Ddocs=true" diff --git a/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix new file mode 100644 index 0000000000..4a489127ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pkger/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "pkger"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "markbates"; + repo = "pkger"; + rev = "v${version}"; + sha256 = "0fpvrgww5h40l2js7raarx6gpysafvj75x26ljx4qz925x8nb6zn"; + }; + + vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + + meta = with stdenv.lib; { + description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + homepage = "https://github.com/markbates/pkger"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix new file mode 100644 index 0000000000..00d9ec7f96 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.12.0"; + sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a"; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix index 434b3ab84f..a82d048b32 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qgnomeplatform"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "QGnomePlatform"; rev = version; - sha256 = "0fb1mzs6sx76bl7f0z2xhc0jq6y1c55jrw1v3na8577is6g5ji0a"; + sha256 = "1mwqg2zk0sfjq54vz2jjahbgi5sxw8rb71h6mgg459wp99mhlqi0"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix index 323eff6486..abaeba51b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qscintilla/default.nix @@ -5,12 +5,6 @@ }: let - # Fix Xcode 8 compilation problem - xcodePatch = fetchurl { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch"; - sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; - }; - pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; version = "2.11.2"; @@ -32,8 +26,7 @@ in stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++ - (lib.optional (!withQt5) ./fix-qt4-build.patch ); + patches = lib.optional (!withQt5) ./fix-qt4-build.patch; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 7c2a99804c..f17165b5ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.11.2"; + version = "0.15.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; + sha256 = "0cv0lxyi2sr0k7f03rsh1j28avdxd0l0480jsa95ca3d2lq392g3"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix index 13e3f15c84..4ca3be7fe7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quazip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "quazip"; - version = "0.8.1"; + version = "0.9"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; rev = "v${version}"; - sha256 = "1g473gnsbkvxpsv8lbsmhspn7jnq86b05zzgqh11r581v8ndvz5s"; + sha256 = "0psvf3d9akyyx3bckc9325nmbp97xiagf8la4vhca5xn2f430fbn"; }; buildInputs = [ zlib qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index d8f20d74a0..7539d45627 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0axrzjmih1njjpxpwfb6pwjwkjy1b6s5s1sjf165m2cmd6x3vbap"; + sha256 = "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix new file mode 100644 index 0000000000..cfbe19d724 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "bpp-core"; + version = "2.4.1"; + + src = fetchFromGitHub { owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"; + }; + + nativeBuildInputs = [ cmake ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/bpp-core/bpp-core-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES + # of form /nix/store/.../nix/store/.../include, + # probably due to relative vs absolute path issue + + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Main_Page"; + changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog"; + description = "C++ bioinformatics libraries and tools"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.cecill20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix new file mode 100644 index 0000000000..8ff6ad433f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq }: + +stdenv.mkDerivation rec { + pname = "bpp-phyl"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "192zks6wyk903n06c2lbsscdhkjnfwms8p7jblsmk3lvjhdipb20"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + + doCheck = !stdenv.isDarwin; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bpp-phyl/blob/master/ChangeLog"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix new file mode 100644 index 0000000000..af5d1d00d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq }: + +stdenv.mkDerivation rec { + pname = "bpp-popgen"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "0bz0fhrq3dri6a0hvfc3zlvrns8mrzzlnicw5pyfa812gc1qwfvh"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES + # of form /nix/store/.../nix/store/.../include, + # probably due to relative vs absolute path issue + + doCheck = !stdenv.isDarwin; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bpp-popgen/blob/master/ChangeLog"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix new file mode 100644 index 0000000000..79fd0fe677 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core }: + +stdenv.mkDerivation rec { + pname = "bpp-seq"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "1mc09g8jswzsa4wgrfv59jxn15ys3q8s0227p1j838wkphlwn2qk"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES + # of form /nix/store/.../nix/store/.../include, + # probably due to relative vs absolute path issue + + doCheck = !stdenv.isDarwin; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix index f6969dcdb6..4122686542 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.90"; + version = "0.1.91"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "10y16qkr2ibn8synmyzgwcbkszyfys1v0dx75p3mayh02yif4dx2"; + sha256 = "1yg55h240iigjaii0k70mjb4sh3mgg54rp2sz8bx5glnsjwys5s3"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix index bdd8dd9d99..ab4fd2c7bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2019.1.1"; + version = "2020.1.1"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "12sl18limlj61hlwl3bcv5ysfdpsjmd07cxchhf9xa8shk6d87i0"; + sha256 = "1z52r28xg05q6hdlh4szzfjlpgkvbdyn2dpaji9b57y58ccrqsfh"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix new file mode 100644 index 0000000000..9d0b3bf76b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -0,0 +1,46 @@ +{ gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 +, openldap, mysql, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { + pname = "sope"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "inverse-inc"; + repo = pname; + rev = "SOPE-${version}"; + sha256 = "0ny1ihx38gd25w8f3dfybyswvyjfljvb2fhfmkajgg6hhjrkfar2"; + }; + + nativeBuildInputs = [ gnustep.make ]; + buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ] + ++ optional (openldap != null) openldap + ++ optionals (mysql != null) [ libmysqlclient mysql ] + ++ optional (postgresql != null) postgresql); + + postPatch = '' + # Exclude NIX_ variables + sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure + ''; + + preConfigure = '' + export DESTDIR="$out" + ''; + + configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] + ++ optional (openldap != null) "--enable-openldap" + ++ optional (mysql != null) "--enable-mysql" + ++ optional (postgresql != null) "--enable-postgresql"; + + # Yes, this is ugly. + preFixup = '' + cp -rlPa $out/nix/store/*/* $out + rm -rf $out/nix/store + ''; + + meta = { + description = "SOPE is an extensive set of frameworks which form a complete Web application server environment"; + license = licenses.publicDomain; + homepage = "https://github.com/inverse-inc/sope"; + platforms = platforms.linux; + maintainers = with maintainers; [ ajs124 das_j ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 1839bb7bff..add1dcf10c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -35,8 +35,8 @@ let in { spdlog_1 = generic { - version = "1.4.2"; - sha256 = "1qc3rphvik44136ms0gjq2wmkl6qglri4fqxlhr2l5jwm8zhr8fc"; + version = "1.6.0"; + sha256 = "15fn8nd9xj7wrxcg9n4fjffid790qg2m366rx2lq2fc9v9walrxs"; }; spdlog_0 = generic { diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 66d30e26a0..f40c80391a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, readline ? null, ncurses ? null }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, readline ? null, ncurses ? null }: assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "0s1aiwl61nl3b4ym4v050wlbbx0iypknqsj3ar12dw5hljlzx6f8"; + sha256 = "0mx0n5n3s39r25b31sdkrd4psxjqqgcv6rpm9d57w5rlk75g2fiv"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ readline ncurses openssl tcl ]; configureFlags = [ "--enable-threadsafe" "--disable-tcl" ]; @@ -22,9 +24,13 @@ stdenv.mkDerivation rec { doCheck = false; # fails. requires tcl? + postInstall = '' + installManPage sqlcipher.1 + ''; + meta = with stdenv.lib; { - homepage = "http://sqlcipher.net/"; - description = "Full Database Encryption for SQLite"; + homepage = "https://www.zetetic.net/sqlcipher/"; + description = "SQLite extension that provides 256 bit AES encryption of database files"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 5fa35751e2..1030aefc1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth-mvtools"; - version = "22"; + version = "23"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; rev = "v${version}"; - sha256 = "11al56liaahkr3819iynq83k8n42wvijfv2ja5fsjdl6j4zfzpbr"; + sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 043bfb007a..87f35fbf60 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -36,6 +36,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + # If vapoursynth is added to the build inputs of mpv and then + # used in the wrapping of it, we want to know once inside the + # wrapper, what python3 version was used to build vapoursynth so + # the right python3.sitePackages will be used there. + inherit python3; + }; + postInstall = '' wrapProgram $out/bin/vspipe \ --prefix PYTHONPATH : $out/${python3.sitePackages} diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix new file mode 100644 index 0000000000..f3ec383fdd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix @@ -0,0 +1,74 @@ +{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +, fetchpatch +, qtLib ? null +, enablePython ? false, python ? null +# Darwin support +, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "7.1"; + minorVersion = "1"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; + src = fetchurl { + url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; + sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; + }; + + patches = [ + (fetchpatch { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; + sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtiff ] + ++ optional (qtLib != null) qtLib + ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] + ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit + CFNetwork Security ApplicationServices CoreText + IOSurface ImageIO OpenGL GLUT ] + ++ optional enablePython [ + python + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; + + preBuild = '' + export LD_LIBRARY_PATH="$(pwd)/lib"; + ''; + + # Shared libraries don't work, because of rpath troubles with the current + # nixpkgs cmake approach. It wants to call a binary at build time, just + # built and requiring one of the shared objects. + # At least, we use -fPIC for other packages to be able to use this in shared + # objects. + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] + ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ] + ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + ''; + + enableParallelBuilding = true; + + meta = { + description = "Open source libraries for 3D computer graphics, image processing and visualization"; + homepage = "https://www.vtk.org/"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix index 1cc706f4eb..4ef140a099 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix @@ -10,8 +10,8 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "7.1"; - minorVersion = "1"; + majorVersion = "8.2"; + minorVersion = "0"; version = "${majorVersion}.${minorVersion}"; in @@ -19,20 +19,13 @@ stdenv.mkDerivation rec { name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; src = fetchurl { url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; - sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; + sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"; }; - patches = [ - (fetchpatch { - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; - sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libtiff ] - ++ optional (qtLib != null) qtLib + ++ optionals (qtLib != null) (with qtLib; [ qtbase qtx11extras qttools ]) ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText @@ -47,7 +40,7 @@ stdenv.mkDerivation rec { ''; # Shared libraries don't work, because of rpath troubles with the current - # nixpkgs camke approach. It wants to call a binary at build time, just + # nixpkgs cmake approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. # At least, we use -fPIC for other packages to be able to use this in shared # objects. diff --git a/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix index 3873fe05e6..8c7b123201 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xerces-c"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; - sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx"; + sha256 = "0zicsydx6s7carwr7q0csgkg1xncibd6lfp5chg2v2gvn54zr5pv"; }; # Disable SSE2 extensions on platforms for which they are not enabled by default diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix index d9786d26a7..41cdbf0b4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.39.12"; + name = "xmlrpc-c-1.51.06"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "026fh7w7y3q9pvxd09i5d4hq3l6gd81n9k19yq4zwbc398kg6c6q"; + sha256 = "1l4zz22q10081vr06b8sii0l3krr64xyiywz6rcladw8kiyxip06"; }; buildInputs = [ curl libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index cb429e59c9..84a15e8a67 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -294,6 +294,12 @@ with super; }; }); + mpack = super.mpack.override({ + buildInputs = [ pkgs.libmpack ]; + # the rockspec doesn't use the makefile so you may need to export more flags + USE_SYSTEM_LUA = "yes"; + USE_SYSTEM_MPACK = "yes"; + }); rapidjson = super.rapidjson.override({ preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 355608ca02..5ccf07de2f 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.1) + algoliasearch (1.27.2) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.1) + cocoapods (1.9.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.1) + cocoapods-core (= 1.9.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.1) + cocoapods-core (1.9.2) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -45,10 +45,10 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.1) + cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.1.6) escape (0.0.4) @@ -62,18 +62,18 @@ GEM i18n (0.9.5) concurrent-ruby (~> 1.0) json (2.3.0) - minitest (5.14.0) + minitest (5.14.1) molinillo (0.6.6) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) ruby-macho (1.4.0) thread_safe (0.3.6) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.15.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -87,4 +87,4 @@ DEPENDENCIES cocoapods (>= 1.7.0.beta.1)! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock index b8db94ca06..1c77634cbf 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.1) + algoliasearch (1.27.2) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.9.1) + cocoapods (1.9.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.1) + cocoapods-core (= 1.9.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.1) + cocoapods-core (1.9.2) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -45,10 +45,10 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.1) + cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.1.6) escape (0.0.4) @@ -62,18 +62,18 @@ GEM i18n (0.9.5) concurrent-ruby (~> 1.0) json (2.3.0) - minitest (5.14.0) + minitest (5.14.1) molinillo (0.6.6) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) ruby-macho (1.4.0) thread_safe (0.3.6) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.15.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index 1a5912b89e..5215312926 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj"; + sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0"; type = "gem"; }; - version = "1.27.1"; + version = "1.27.2"; }; atomos = { groups = ["default"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; + sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; + sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -130,20 +130,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw"; + sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.0"; }; cocoapods-try = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; colored2 = { groups = ["default"]; @@ -262,10 +262,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; molinillo = { groups = ["default"]; @@ -333,10 +333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -344,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; @@ -355,9 +355,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix index 4d4979d562..9c0ed2d5fa 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ayg8j3819ay2d8618jv32ca16fh8qsgjsiq9j32yd016c170nkj"; + sha256 = "1b3xk42ry6dlsqn379p884zdi4iyra67xh45rwl6vcrwmrnbq7f0"; type = "gem"; }; - version = "1.27.1"; + version = "1.27.2"; }; atomos = { source = { @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; + sha256 = "0zxr5din9m8zf3mynywn4qmk3af9f5anx189i4md19c1iinkbb36"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; + sha256 = "13qhkglivmmiv0j88l4d8anw66zdy89lg1qqk4vpvavsm7s7ls6p"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -124,18 +124,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrwsgaq3nf7v3pwksgqy0mhswrp3ipczrc96vl3ii2pcc9ilwkw"; + sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.0"; }; cocoapods-try = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; colored2 = { source = { @@ -244,10 +246,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; molinillo = { source = { @@ -305,10 +307,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -316,10 +318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; @@ -327,9 +329,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix new file mode 100644 index 0000000000..5ac352e076 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/afl-persistent/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, opaline }: + +stdenv.mkDerivation rec { + pname = "afl-persistent"; + version = "1.3"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "stedolan"; + repo = "ocaml-${pname}"; + rev = "v${version}"; + sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i"; + }; + + buildInputs = [ ocaml findlib ]; + + # don't run tests in buildPhase + # don't overwrite test binary + postPatch = '' + sed -i 's/ && \.\/test$//' build.sh + sed -i '/^ocamlopt.*test.ml -o test$/ s/$/2/' build.sh + patchShebangs build.sh + ''; + + buildPhase = "./build.sh"; + installPhase = '' + ${opaline}/bin/opaline -prefix $out -libdir $out/lib/ocaml/${ocaml.version}/site-lib/ ${pname}.install + ''; + + doCheck = true; + checkPhase = "./_build/test && ./_build/test2"; + + meta = with stdenv.lib; { + homepage = "https://github.com/stedolan/ocaml-afl-persistent"; + description = "persistent-mode afl-fuzz for ocaml"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_extra/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/async_extra/default.nix deleted file mode 100644 index 53be875f4f..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_extra/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4, - bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_extra"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz"; - sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28"; - }; - - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 core_p4 bin_prot_p4 custom_printf - fieldslib_p4 herelib pipebang sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_extra"; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_kernel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/async_kernel/default.nix deleted file mode 100644 index 19b4d6213e..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_kernel/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, buildOcaml, fetchurl, core_kernel_p4, - bin_prot_p4, fieldslib_p4, pa_ounit, pa_test, - sexplib_p4, herelib}: - -buildOcaml rec { - name = "async_kernel"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_kernel/archive/${version}.tar.gz"; - sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0"; - }; - - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel_p4 bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_kernel"; - description = "Jane Street Capital's asynchronous execution library (core) "; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/async_unix/default.nix deleted file mode 100644 index 13dfbcf379..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/async_unix/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, - bin_prot_p4, comparelib, core_p4, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_unix"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_unix/archive/${version}.tar.gz"; - sha256 = "d490b1dc42f0987a131fa9695b55f215ad90cdaffbfac35b7f9f88f3834337ab"; - }; - - hasSharedObjects = true; - buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ async_kernel_p4 core_p4 bin_prot_p4 comparelib - fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_unix"; - description = "Jane Street Capital's asynchronous execution library (unix)"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index 2ed697d42d..3032df7b8f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }: let version = "3.0.0"; in @@ -10,6 +10,12 @@ stdenv.mkDerivation { sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi"; }; + # Fixes tests with OCaml 4.10 + patches = [(fetchpatch { + url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch"; + sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4"; + })]; + buildInputs = [ ocaml findlib ocamlbuild qtest ]; propagatedBuildInputs = [ num ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix index de54c24b77..be62a1c6d2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchFromGitHub +{ stdenv, buildDunePackage, fetchFromGitHub, fetchpatch , ounit, async, base64, camlzip, cfstream , core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }: @@ -17,6 +17,12 @@ buildDunePackage rec { sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj"; }; + # fix compilation without and disable -unsafe-string, needed for Ocaml 4.10: + patches = [ (fetchpatch { + url = "https://github.com/biocaml/biocaml/commit/597fa7b0d203684e45ffe03f56c74335b6173ffc.patch"; + sha256 = "0b8jdg215cv2k4y3ww7vak2ag5v6v9w8b76qjivr5d1qxz47mqxv"; + }) ]; + buildInputs = [ ppx_jane ppx_sexp_conv ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix index 22d000a5fd..bf129c7bc4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDunePackage +{ stdenv, lib, fetchurl, buildDunePackage, ocaml , pkgconfig, cairo }: @@ -14,7 +14,9 @@ buildDunePackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo ]; - doCheck = !stdenv.isDarwin; + doCheck = !(stdenv.isDarwin + # https://github.com/Chris00/ocaml-cairo/issues/19 + || lib.versionAtLeast ocaml.version "4.10"); meta = { homepage = "https://github.com/Chris00/ocaml-cairo"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/core/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/core/default.nix deleted file mode 100644 index a808975d25..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/core/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, buildOcaml, fetchurl, type_conv, - core_kernel_p4, bin_prot_p4, comparelib, custom_printf, enumerate, - fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib_p4, typerep_p4, variantslib_p4}: - -buildOcaml rec { - name = "core"; - version = "112.24.01"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/core/archive/${version}.tar.gz"; - sha256 = "be5d53ebd4fd04ef23ebf9b3b2840c7aeced6bc4cc6cd3f5e89f71c9949000f4"; - }; - - hasSharedObjects = true; - - buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv core_kernel_p4 bin_prot_p4 comparelib - custom_printf enumerate fieldslib_p4 herelib - pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix new file mode 100644 index 0000000000..1d455582b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub, ocaml +, result, alcotest, cohttp-lwt-unix, odoc, curl }: + +buildDunePackage rec { + pname = "curly"; + version = "unstable-2019-11-14"; + + minimumOCamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "rgrinberg"; + repo = pname; + rev = "33a538c89ef8279d4591454a7f699a4183dde5d0"; + sha256 = "10pxbvf5xrsajaxrccxh2lqhgp3yaf61z9w03rvb2mq44nc2dggz"; + }; + + propagatedBuildInputs = [ result ]; + checkInputs = [ alcotest cohttp-lwt-unix ]; + # test dependencies are only available for >= 4.05 + doCheck = lib.versionAtLeast ocaml.version "4.05"; + + postPatch = '' + substituteInPlace src/curly.ml \ + --replace "exe=\"curl\"" "exe=\"${curl}/bin/curl\"" + ''; +} + diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 14059070c9..6161bd1fe8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (dune_2) src version; + minimumOCamlVersion = "4.07"; + dontAddPrefix = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix index 13d691f71c..d86dc01dcb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix @@ -3,11 +3,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "eqaf"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz"; - sha256 = "068r231ia87mpqpaqzqb9sjfj6yaqrwvcls2p173aa4qg38xvsq9"; + sha256 = "1q09pwhs121vpficl2af1yzs4y7dd9bc1lcxbqyfc4x4m6p6drhh"; }; propagatedBuildInputs = [ cstruct bigarray-compat ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix index 3a4f7d46b6..330ab26e8e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "functoria"; - version = "3.0.3"; + version = "3.1.0"; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "08wv2890gz7ci1fa2b3z4cvqf98nqb09f89y08kcmnsirlbbzlfh"; + sha256 = "15jdqdj1vfi0x9gjydrrnbwzwbzw34w1iir032jrji820xlblky2"; }; propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix new file mode 100644 index 0000000000..806ae82b6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, functoria, cmdliner, fmt, alcotest }: + +buildDunePackage { + pname = "functoria-runtime"; + + inherit (functoria) version src; + + propagatedBuildInputs = [ cmdliner fmt ]; + checkInputs = [ alcotest functoria]; + doCheck = true; + + meta = with lib; { + inherit (functoria.meta) homepage license; + description = "Runtime support library for functoria-generated code"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix index d9e4c8cdf8..06bd01fefa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchzip, buildDunePackage, configurator, cstruct }: +{ stdenv, fetchurl, buildDunePackage, configurator, cstruct, bigarray-compat, ounit }: buildDunePackage rec { pname = "io-page"; - version = "2.0.1"; + version = "2.3.0"; - src = fetchzip { - url = "https://github.com/mirage/${pname}/archive/${version}.tar.gz"; - sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i"; + minimumOCamlVersion = "4.02.3"; + + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "1hx27pwf419hrhwaw9cphbnl8akz8yy73hqj49l15g2k7shah1cn"; }; - buildInputs = [ configurator ]; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct bigarray-compat ]; + checkInputs = [ ounit ]; + doCheck = true; meta = { homepage = "https://github.com/mirage/io-page"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix new file mode 100644 index 0000000000..b3f7f878b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, io-page, cstruct, ounit }: + +buildDunePackage { + pname = "io-page-unix"; + + inherit (io-page) version src minimumOCamlVersion; + + propagatedBuildInputs = [ cstruct io-page ]; + checkInputs = [ ounit ]; + doCheck = true; + + meta = with lib; { + inherit (io-page.meta) homepage license; + description = "Support for efficient handling of I/O memory pages on Unix"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix deleted file mode 100644 index 3de02437dd..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, async_unix, - bin_prot, core, ppx_custom_printf, fieldslib, herelib, - pipebang, sexplib, async_rpc_kernel}: - -buildOcamlJane { - name = "async_extra"; - hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf - fieldslib herelib pipebang sexplib async_rpc_kernel ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_extra"; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix deleted file mode 100644 index 6e8a5cae63..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, buildOcamlJane, core_kernel, - bin_prot, fieldslib, - sexplib, herelib}: - -buildOcamlJane { - name = "async_kernel"; - hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60"; - propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_kernel"; - description = "Jane Street Capital's asynchronous execution library (core) "; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix deleted file mode 100644 index 5678d95a13..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, - bin_prot, comparelib, core, fieldslib, herelib, - pipebang, sexplib}: - -buildOcamlJane { - name = "async_unix"; - hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7"; - propagatedBuildInputs = [ async_kernel core bin_prot comparelib - fieldslib herelib pipebang sexplib ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_unix"; - description = "Jane Street Capital's asynchronous execution library (unix)"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix deleted file mode 100644 index ac62bc51b0..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/core.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, buildOcamlJane, - core_kernel, - bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: - -buildOcamlJane { - name = "core"; - hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd"; - propagatedBuildInputs = - [ core_kernel bin_prot fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix deleted file mode 100644 index e6d74b52f0..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/textutils.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, buildOcamlJane, - bin_prot, core, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: - -buildOcamlJane { - name = "textutils"; - hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb"; - propagatedBuildInputs = - [ bin_prot core fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/textutils"; - description = "Text output utilities"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index 0677202fab..e7b68b9071 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -7,13 +7,13 @@ then throw "labltk is not available for OCaml ${ocaml.version}" else let param = -if OCamlVersionAtLeast "4.08" then rec { - version = "8.06.7"; - src = fetchzip { - url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; - sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; - }; -} else + let mkNewParam = { version, sha256 }: { + inherit version; + src = fetchzip { + url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; + inherit sha256; + }; + }; in let mkOldParam = { version, key, sha256 }: { src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz"; @@ -21,7 +21,7 @@ if OCamlVersionAtLeast "4.08" then rec { }; inherit version; }; in - { + rec { "4.04" = mkOldParam { version = "8.06.2"; key = "1628"; @@ -42,6 +42,16 @@ if OCamlVersionAtLeast "4.08" then rec { key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; }; + _8_06_7 = mkNewParam { + version = "8.06.7"; + sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; + }; + "4.08" = _8_06_7; + "4.09" = _8_06_7; + "4.10" = mkNewParam { + version = "8.06.8"; + sha256 = "0lfjc7lscq81ibqb3fcybdzs2r1i2xl7rsgi7linq46a0pcpkinw"; + }; }.${builtins.substring 0 4 ocaml.version}; in diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix index 4a9706b4ba..c26b3dbe73 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchzip, ppx_deriving, ppxfind, buildDunePackage }: +{ lib, ocaml, fetchzip, ppx_deriving, ppxfind, buildDunePackage }: + +if lib.versionAtLeast ocaml.version "4.10" +then throw "lens is not available for OCaml ${ocaml.version}" +else buildDunePackage rec { pname = "lens"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 2ca41800ba..f78ed2ef77 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,28 +1,23 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, ocplib-endian -, cpuid, dune-configurator, cpuAcceleration ? false }: +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, pkg-config }: buildDunePackage rec { - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "08xq49cxn66yi0gfajzi8czcxfx24rd191rvf7s10wfkz304sa72"; + sha256 = "0k7kllv3bh192yj6p9dk2z81r56w7x2kyr46pxygb5gnhqqxcncf"; }; useDune2 = true; - preBuild = '' - MIRAGE_CRYPTO_ACCELERATE=${lib.boolToString cpuAcceleration} - ''; - doCheck = true; checkInputs = [ ounit ]; - nativeBuildInputs = [ cpuid dune-configurator ]; - propagatedBuildInputs = [ cstruct ocplib-endian ]; + nativeBuildInputs = [ dune-configurator pkg-config ]; + propagatedBuildInputs = [ cstruct ]; meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index b70a4d37d0..3a12580f89 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,14 +1,19 @@ -{ buildDunePackage, mirage-crypto, ounit, randomconv, cstruct }: +{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator +, cstruct, duration, logs, mtime, ocaml_lwt, mirage-runtime, mirage-time +, mirage-clock, mirage-time-unix, mirage-clock-unix, mirage-unix }: buildDunePackage { pname = "mirage-crypto-rng"; - inherit (mirage-crypto) version src nativeBuildInputs useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; doCheck = true; checkInputs = [ ounit randomconv ]; - propagatedBuildInputs = [ cstruct mirage-crypto ]; + nativeBuildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt + mirage-runtime mirage-time mirage-clock mirage-time-unix + mirage-clock-unix mirage-unix ]; meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix new file mode 100644 index 0000000000..696181f7f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchurl, ocaml_lwt, duration, mirage-runtime, io-page-unix }: + +buildDunePackage rec { + pname = "mirage-unix"; + version = "4.0.0"; + + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj"; + }; + + propagatedBuildInputs = [ ocaml_lwt duration mirage-runtime io-page-unix ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage-unix"; + description = "Unix core platform libraries for MirageOS"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix new file mode 100644 index 0000000000..c7d7cf35e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime +, fmt, logs, ocaml_lwt, alcotest }: + +buildDunePackage rec { + pname = "mirage-runtime"; + version = "3.7.7"; + + minimumOCamlVersion = "4.06"; + + src = fetchurl { + url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; + sha256 = "1ds5zfwb0g340kbdlsjayyw4n25nj7skdl1mwyvpzmkv4qcsmdiv"; + }; + + propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; + checkInputs = [ alcotest ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage"; + description = "The base MirageOS runtime library, part of every MirageOS unikernel"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index f633d17252..bcd0a51989 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.5.0"; + version = "1.7.3"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "0ms7nx7x16nkbm9rln3sycbzg6ad8swz8jw6bjndrill8bg3fipv"; + sha256 = "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx"; }; propagatedBuildInputs = [ ppx_derivers result ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix index a1e524a864..4c2e4ee6a3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix @@ -5,10 +5,10 @@ then throw "ocurl is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocurl-0.9.0"; + name = "ocurl-0.9.1"; src = fetchurl { url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; - sha256 = "0v5qzfazaynjv1xy3ds2z5iz0np5mz8g831l91l1mrqz6fr1ah0f"; + sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; buildInputs = [ pkgconfig ocaml findlib ncurses ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix index 9d2bf74a3a..3e1eb09faa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix @@ -2,24 +2,25 @@ buildDunePackage rec { pname = "owl-base"; - version = "0.8.0"; + version = "0.9.0"; useDune2 = true; src = fetchFromGitHub { - owner = "owlbarn"; - repo = "owl"; - rev = version; - sha256 = "1j3xmr4izfznmv8lbn8vkx9c77py2xr6fqyn6ypjlf5k9b8g4mmw"; + owner = "owlbarn"; + repo = "owl"; + rev = version; + sha256 = "0xxchsymmdbwszs6barqq8x4vqz5hbap64yxq82c2la9sdxgk0vv"; }; propagatedBuildInputs = [ stdlib-shims ]; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = "4.10"; meta = with stdenv.lib; { description = "Numerical computing library for Ocaml"; homepage = "https://ocaml.xyz"; + changelog = "https://github.com/owlbarn/owl/releases"; platforms = platforms.x86_64; maintainers = [ maintainers.bcdarwin ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix index 75d1e57765..1008dfe62a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxfind/default.nix @@ -2,13 +2,14 @@ buildDunePackage (rec { pname = "ppxfind"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; - sha256 = "1r4jp0516378js62ss50a9s8ql2pm8lfdd3mnk214hp7s0kb17fl"; + sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq"; }; minimumOCamlVersion = "4.03"; + useDune2 = true; buildInputs = [ ocaml-migrate-parsetree ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix index bbaf9e27cf..8821e56212 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, version ? "0.8.1" +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, legacy ? false , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio }: -let sha256 = - { "0.8.1" = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; - "0.12.0" = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; - }."${version}" -; in +let param = + if legacy then { + version = "0.8.1"; + sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + } else { + version = "0.12.0"; + sha256 = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; + }; in + +if lib.versionAtLeast ocaml.version "4.10" && legacy +then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}" +else buildDunePackage rec { pname = "ppxlib"; - inherit version; + inherit (param) version; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - inherit sha256; + inherit (param) sha256; }; propagatedBuildInputs = [ @@ -26,8 +33,8 @@ buildDunePackage rec { meta = { description = "Comprehensive ppx tool set"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix index ee9b90d460..5d81545658 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }: +if stdenv.lib.versionAtLeast ocaml.version "4.10" +then throw "sodium is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-sodium"; version = "0.6.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/textutils/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/textutils/default.nix deleted file mode 100644 index 6f0ca82a45..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/textutils/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "textutils"; - version = "112.17.00"; - - minimalSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/textutils/archive/${version}.tar.gz"; - sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052"; - }; - - buildInputs = [ pa_test ]; - propagatedBuildInputs = [ core_p4 pa_ounit sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/textutils"; - description = ""; - license = stdenv.lib.licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix new file mode 100644 index 0000000000..457259bb1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, buildDunePackage +, fetchFromGitHub +, cmdliner +, ctypes +, npy +, ocaml-compiler-libs +, ppx_custom_printf +, ppx_expect +, ppx_sexp_conv +, sexplib +, stdio +, pytorch +}: + +buildDunePackage rec { + pname = "torch"; + version = "0.8"; + + owner = "LaurentMazare"; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + inherit owner; + repo = "ocaml-${pname}"; + rev = version; + sha256 = "19w31paj24pns2ahk9j9rgpkb5hpcd41kfaarxrlddww5dl6pxvi"; + }; + + propagatedBuildInputs = [ + cmdliner + ctypes + npy + ocaml-compiler-libs + pytorch + pytorch.dev + ppx_custom_printf + ppx_expect + ppx_sexp_conv + sexplib + stdio + ]; + + preBuild = ''export LIBTORCH=${pytorch.dev}/''; + + doCheck = true; + checkPhase = "dune runtest"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Ocaml bindings to Pytorch"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix index 872cda33b5..e71d072428 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.9"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0a4v5cwnwsjxril7514ssvdqxsad227v5w7hcfqjkqzvaf7agb3f"; + sha256 = "1wg7dlz6mhjp7mkqm5f8a2ak87p1zn46b6i754ys8f29nnqq01yz"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix index b9c710e688..07ae08ada7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.7"; + version = "2.9.9"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s"; + sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml"; }; prePatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "http://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; - maintainers = with maintainers; [ joamaki costrouc ]; + maintainers = with maintainers; [ joamaki costrouc hexa ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix index cbbf64524f..bf82d10659 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.14.1"; + version = "0.14.3"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "0z56r5s8z8pfp0p8zrf1chgzan4q25zg0awgc7bgkvkwgxbhzx4m"; + sha256 = "0ph97j94i40jj7nc5ya8pfq0ccx023zbqpcs5hrxmib53g64k5xy"; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index bd933205f6..79406eaa0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -3,7 +3,6 @@ , fetchPypi , numpy , pandas -, pyarrow , pytestrunner , pytest , h5py @@ -19,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pandas pyarrow pytest h5py ]; + checkInputs = [ pandas pytest h5py ]; propagatedBuildInputs = [ numpy ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 91936af014..19be6d28e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n"; + sha256 = "228ea058361763a5a31273df7d813b9134d0ecff4567c533eb7e1afaf772fbc7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix index 54b4842747..b2737826ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + sha256 = "049dfb0bcc7961d0d988fee493d1ec4f4480e109e4661e360bad054cc297d43c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 66c4e52e23..61bc17df01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e83d21462f9d5b02e90f5590c4247ab73e0ff85fc4ac1fba32be119a15b10c98"; + sha256 = "692544dd2fa6276a7a4b4e094e2a5e0915d29b7829e266c6ade2b17a5fdcc2a9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index c780d07c7c..1057322a8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; + sha256 = "c823a0ed879230a3ec9f15c32c9788610af1db56e6aeae6b2725476ddbe0d138"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 57ec64f3d5..1e13919f34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f6fbb87d9bf29ce325543c9a3a125fbe45f4797f3a7f260c6c21ca60dc3f0885"; + sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 82aa1d6fa0..24f7165281 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.1.0"; + version = "10.2.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e5ac0ee14b71ab57035c45bef15d3698b0b6026ecafb8320a7c704eb3f6fba3a"; + sha256 = "d50c74cdc1c9be6861ddef9adffd3b05afc5a5092baf0209eea30f4439cba2d9"; }; postInstall = if isPy3k then "" else '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index e786731dcd..e3ac096154 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "10.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; + sha256 = "d1edead1ad36e957c9f9b605f547ad1ff7152f8f785fa03d3c7891bb428a68ef"; }; propagatedBuildInputs = [ azure-mgmt-common ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 677b8bbeb1..d10045b41d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -1,20 +1,28 @@ { lib, python, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-core , msrest , msrestazure +, requests }: buildPythonPackage rec { - version = "0.2.4"; + version = "0.3.2"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zqapc4dx6qd9bcim5fjykk3n1j84p85nwqyb876nb7qmqx9spig"; + sha256 = "c403a47e40e4a80d9c42c854993f5c07f12c2a75bd9a85ba8225985493a9b792"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-core + msrest + msrestazure + requests + ]; # fix namespace pythonNamespaces = [ "azure.multiapi" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix index 19420b0526..ad89f23c3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "7.0.0.0"; + version = "7.1.0.45"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "27712658fed7f5db6965d1035bbc0f3b16964fc88d6f3ad3e86cf4fae2b01bb9"; + sha256 = "8dd0eb419ca62f2436c31982f6d236868f15f65bb062c4e5a98e50b16298dcda"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 06329c8ab9..2036d4dba4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -1,17 +1,18 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.2.1"; pname = "bitarray"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1kxrlxfj9nrx512sfwifwl9z4v6ky3qschl0zmk3s3dvc3s7bmif"; + sha256 = "0m29k3lq37v53pczyr2d5mr3xdh2kv31g2yfnfx8m1ivxvy9z9i7"; }; meta = with lib; { description = "Efficient arrays of booleans"; homepage = "https://github.com/ilanschnell/bitarray"; + changelog = "https://github.com/ilanschnell/bitarray/blob/master/CHANGE_LOG"; license = licenses.psfl; maintainers = [ maintainers.bhipple ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix new file mode 100644 index 0000000000..559fd33e8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "bleak"; + version = "0.6.2"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmq2z3dhq6dd20i5w71gshjrfvyw0pkpnld8iib9ai2rz6a8aj0"; + }; + + postPatch = '' + # bleak checks BlueZ's version with a call to `bluetoothctl -v` twice + substituteInPlace bleak/__init__.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + substituteInPlace bleak/backends/bluezdbus/client.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + ''; + + propagatedBuildInputs = [ txdbus ]; + checkInputs = [ pytest pytestcov ]; + + checkPhase = "AGENT_OS=linux py.test"; + + meta = with stdenv.lib; { + description = "Bluetooth Low Energy platform Agnostic Klient for Python"; + homepage = "https://github.com/hbldh/bleak"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix index f4d09ca5e5..8e8c89e7f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1m8z0ig40xmgcnmf508nflyy1w4qmff4kqxarrpg7rvsfj4pjsmh"; + sha256 = "1fqh1bdkk3g222vbrmw3ab4r4mmd1k4x2jayshnqpbspszcqzcdq"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix index 95ba6d537c..7884ff65f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "branca"; - version = "0.3.1"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "3e762c9bdf40725f3d05ea1fda8fae9b470bfada6474e43a1242c8204a7bb15e"; + sha256 = "1f7drarwiw8fh17hpq8b3p4mfqgjbh3k045dvpx5z12d3a0zg7ca"; }; checkInputs = [ pytest selenium ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix index 6f3632f743..886224d169 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , pythonOlder + , pythonAtLeast , fetchFromGitHub , pyparsing , opencascade @@ -16,9 +17,12 @@ , libGLU , libX11 , six + , pytest + , makeFontsConf + , freefont_ttf }: -let +let pythonocc-core-cadquery = stdenv.mkDerivation { pname = "pythonocc-core-cadquery"; version = "0.18.2"; @@ -31,7 +35,7 @@ let sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ cmake swig ninja @@ -63,27 +67,34 @@ let in buildPythonPackage rec { pname = "cadquery"; - version = "2.0RC0"; - + version = "2.0"; + src = fetchFromGitHub { owner = "CadQuery"; repo = pname; rev = version; - sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3"; + sha256 = "1n63b6cjjrdwdfmwq0zx1xabjnhndk9mgfkm4w7z9ardcfpvg84l"; }; - + buildInputs = [ opencascade ]; - + propagatedBuildInputs = [ pyparsing pythonocc-core-cadquery ]; - - # Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7). - disabled = !(isPy3k && (pythonOlder "3.8")); - + + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ + pytest + ]; + + disabled = pythonOlder "3.6" || pythonAtLeast "3.8"; + meta = with lib; { description = "Parametric scripting language for creating and traversing CAD models"; homepage = "https://github.com/CadQuery/cadquery"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix index 60946d23a1..7638695ff2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "17w9myl8mg4isv4lb1nv64zim53ishi32f6m5m0s00q9a6v5qfb0"; + sha256 = "1w2iakkzxfhyrqrspn40am8x7bzdp5qqdqbm1asbj7fa3mivi17x"; }; checkInputs = [ pytest coveralls pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix index 02454b74ef..802235d674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.6.5"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "4463d5f2927338384169315f34c2a8ac0840075b59489f8d1d773b91caba6c39"; + sha256 = "0w8ihj9gram2d4wkbki8f6gr8hsd950b3wzfi1qqqm17lqfk8k7h"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix index dc531c77fb..70c6347376 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonApplication, fetchPypi, pytest, chardet }: buildPythonApplication rec { pname = "codespell"; - version = "1.16.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1s9dl07ib77gq0iq26mrdpl1c46nkfm7nlhqwxpx5vvs6a1pqfxz"; + sha256 = "08ydpw8pim7rhg1x2n711hxf2y6553nx0c0aqhfi3p4wdgcfr8i5"; }; checkInputs = [ pytest chardet ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix index 5a8608c503..c60d477801 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "convertdate"; - version = "2.2.0"; + version = "2.2.1"; # Tests are not available in the PyPI tarball so use GitHub instead. src = fetchFromGitHub { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "04j8k7a9qndmawy3m345py74y18hw7lb6gc0qp0mr8d68x99xjq0"; + sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; }; propagatedBuildInputs = [ pymeeus pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix index 50f20164f6..a7256a54e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/csscompressor/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { description = "A python port of YUI CSS Compressor"; homepage = "https://pypi.python.org/pypi/csscompressor"; license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.ahmedtd]; + maintainers = []; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix index d08d090388..807ed5f9a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.35.0"; + version = "0.36.0"; src = fetchPypi { inherit pname version; - sha256 = "0qpy6mg9gfjxvjms0aaglzayhmdds4agv0lh05g2mkfw620nm8zl"; + sha256 = "1kkbsrzxc2a6k319lh98qkinn99dzcqz8h4fm25q17dlgmc9gq9z"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix index 06e611c8cb..b5d9c3dfad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -18,6 +18,7 @@ , aiohttp , beautifulsoup4 , asgiref +, setuptools }: buildPythonPackage rec { @@ -43,6 +44,7 @@ buildPythonPackage rec { pint pluggy uvicorn + setuptools ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix index 3411247599..d6e5acdeaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.9"; + version = "1.2.10"; src = fetchPypi { inherit pname version; - sha256 = "1k7c5kkh8jxxqdm0cbcvmhn3mwj0rcjwapwbzmm5r04n78lpvwqc"; + sha256 = "0x3zkmykcyjn8k57g8lcf89fxw8q7hvvcj6xkwb0f2zrnmpscnsj"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index 971b811a22..47419ec559 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.2.5"; + version = "1.3.3"; disabled = pythonOlder "3.5.3"; # only distributes wheels on pypi now @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "17l6mlfi9ikqndpmi4pwlvb53g132cycyfm9nzdyiqr96k8ly4ig"; + sha256 = "0ld92vh7kjk3f02nbqyib68844yi4p2kmkyir6v9wi00y1l287l3"; }; propagatedBuildInputs = [ aiohttp websockets ]; patchPhase = '' substituteInPlace "requirements.txt" \ - --replace "aiohttp>=3.3.0,<3.6.0" "aiohttp~=3.3" \ - --replace "websockets>=6.0,<7.0" "websockets>=6" + --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \ + --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets>=6" '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix new file mode 100644 index 0000000000..c839dea3d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, duckdb +, numpy +, pandas +, pybind11 +, setuptools_scm +, pytestrunner +, pytest +}: + +buildPythonPackage rec { + pname = "duckdb"; + inherit (duckdb) version src; + + postConfigure = '' + cd tools/pythonpkg + export SETUPTOOLS_SCM_PRETEND_VERSION=${version} + ''; + + nativeBuildInputs = [ + pybind11 + setuptools_scm + pytestrunner + ]; + + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + numpy + pandas + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "DuckDB is an embeddable SQL OLAP Database Management System"; + homepage = "https://pypi.python.org/pypi/duckdb"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix index 878b882810..3dda2c9145 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.10"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "06zaxydyqvb5mk5kxs6y3pjbq5nm6lmi3h5g3y41xpic48q5wsv3"; + sha256 = "115rzzr0hx4af4m6krf7dxn8851n4l8jfxahjzjc2r0zq2m8v57v"; }; # No tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix index deef21985c..712766fa58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.1.0"; + version = "7.2.0"; src = fetchPypi { inherit pname version; - sha256 = "3f860e0304d703f63b458fea3782f09a823ab07da7ee84ae4bff1aa63e22aedb"; + sha256 = "19q91srlcvfrk5rnk18c0mzvki9l893g7rqgymfg0p8abb9c05a0"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 8c6d0bb543..821a890346 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.6.0"; + version = "7.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1j499w9hbpyx0v83xnn1vrm45amx5lbnhlik65v5z1n0gb9v4a6j"; + sha256 = "1fm6lalyiy4ayj0mp400dvy629j2av5cqww72w4cg8bqifb83pim"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index 09d4cc6024..2ab878b081 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.4.5"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1z7403ykfdb2zy6g4qcbjm87ibpi0k59dgmz1px7z7wy5p2vknxw"; + sha256 = "1hqvi7ibhdz812dsjbyyz3rysc6242hi1k9187wwnjmilbbngi3c"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fluidasserts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fluidasserts/default.nix deleted file mode 100644 index 13e6f14d9d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/fluidasserts/default.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, isPy37 -, lib - -# pythonPackages -, aiohttp -, androguard -, azure-identity -, azure-keyvault -, azure-mgmt-compute -, azure-mgmt-keyvault -, azure-mgmt-network -, azure-mgmt-resource -, azure-mgmt-security -, azure-mgmt-storage -, azure-mgmt-sql -, azure-mgmt-web -, azure-storage -, bandit -, bcrypt -, beautifulsoup4 -, boto3 -, cfn-flip -, cython -, dnspython -, colorama -, configobj -, defusedxml -, GitPython -, google_api_python_client -, kubernetes -, ldap3 -, mixpanel -, mysql-connector -, names -, ntplib -, oyaml -, paramiko -, pillow -, psycopg2 -, pycrypto -, pygments -, pyhcl -, pyjks -, pynacl -, pyodbc -, pyopenssl -, pypdf2 -, pysmb -, pytesseract -, python_magic -, pytz -, pywinrm -, requirements-detector -, selenium -, tlslite-ng -, viewstate - -# pythonPackages to test the derivation -, pytest -, flask -, flask-httpauth -, docker -}: - -buildPythonPackage rec { - pname = "fluidasserts"; - version = "20.2.30165"; - disabled = !isPy37; - - src = fetchPypi { - inherit pname version; - sha256 = "0wcplzfx89d3c6hvdgag860sl3infqmymy6ly6y6ah77pkc98x15"; - }; - - patchPhase = '' - # Release packages from their hard pinned versions - sed -i -E "s/(.*)==.*/\1/g" requirements.txt - - # Functionality that will be not present for the momment - # but that we'll work to add in the future - # Just a minimal portion of fluidasserts use this - substituteInPlace ./requirements.txt \ - --replace "mitmproxy" "" \ - - ''; - - propagatedBuildInputs = [ - # pythonPackages - aiohttp - androguard - azure-identity - azure-keyvault - azure-mgmt-compute - azure-mgmt-keyvault - azure-mgmt-network - azure-mgmt-resource - azure-mgmt-security - azure-mgmt-storage - azure-mgmt-sql - azure-mgmt-web - azure-storage - bandit - bcrypt - beautifulsoup4 - boto3 - cfn-flip - cython - dnspython - colorama - configobj - defusedxml - GitPython - google_api_python_client - kubernetes - ldap3 - mixpanel - mysql-connector - names - ntplib - oyaml - paramiko - pillow - psycopg2 - pycrypto - pygments - pyhcl - pyjks - pynacl - pyodbc - pyopenssl - pypdf2 - pysmb - pytesseract - python_magic - pytz - pywinrm - requirements-detector - selenium - tlslite-ng - viewstate - ]; - - configurePhase = '' - mkdir -p build/config - touch build/config/README.rst - ''; - - checkInputs = [ - docker - flask - flask-httpauth - pytest - ]; - - checkPhase = '' - # This tests require BWAPP Docker Container - sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_open.py - sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_close.py - - # This tests require network connectivity - sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_open.py - sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_close.py - - # Remove impurities - substituteInPlace ./test/conftest.py \ - --replace "import wait" "" \ - --replace "if not os.path.exists(name):" "if os.path.exists(name):" \ - --replace "from test.mock import graphql_server" "" \ - --replace "(graphql_server.start, 'MockGraphQLServer', ['proto_graphql'])," "" \ - - pytest --asserts-module 'iot' \ - test/test_iot_phone.py - - pytest --asserts-module 'ot' \ - test/test_ot_powerlogic.py - - pytest --asserts-module 'proto_http' \ - test/test_proto_{http_close,http_open}.py - - pytest --asserts-module 'proto_rest' \ - test/test_proto_rest.py - - # This file launches mock docker containers and servers - # let's remove it to create a custom test environment - rm test/conftest.py - - pytest \ - test/test_cloud_aws_terraform_{cloudfront,dynamodb,ebs,ec2,elb}.py \ - test/test_cloud_aws_terraform_{fsx,iam,kms,rds,s3}.py \ - test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \ - test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \ - test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \ - test/test_helper_{asynchronous,crypto}.py \ - test/test_lang_{javascript,java}.py \ - test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \ - test/test_utils_generic.py - ''; - - meta = with lib; { - description = "Assertion Library for Security Assumptions"; - homepage = "https://gitlab.com/fluidattacks/asserts"; - license = licenses.mpl20; - maintainers = with maintainers; [ - kamadorueda - ]; - broken = true; # dependency tree is too fragile for nixpkgs - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix index dc59fb6db3..bbf8395190 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.7"; + version = "0.8.8"; src = fetchPypi { inherit pname version; - sha256 = "0c5iqdn17ip6lkf26xb1cwjvcly0448gvqmkbkvhnqy4birc8cf5"; + sha256 = "06y626kgaz1wn1qajlngihpvd4qz8m6lx6sknmjqhhrznyji58wi"; }; propagatedBuildInputs = [ tkinter supercollider ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index ae2df2ce60..e4fbb37c96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0lnmj9jky9pz227scmjxgvd8243higl24ndc0cc668mm36cnwapc"; + sha256 = "0kqxm9imqjbhjj5imvf2kl57di454xmnnsr3i0cs66ibq90nx5m8"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopy/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopy/2.nix index 484c049da3..2863d30f46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopy/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopy/2.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.21.0"; + version = "1.22.0"; disabled = !isPy27; # only Python 2.7 doCheck = false; # Needs network access @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1p1sgy2p59j0297bp7c82b45bx4d3i1p4kvbgf89c9i0llyb80nw"; + sha256 = "0jypkaqlbyr8icqypwm23lzsvq7flakp3a3nqr8ib5fmd0fzsq7q"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index ac7bcb5cd5..12668e979d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.2"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "09g7v6yrf8p0kgmjnzy9d0fx9p1zngk2pmprf0bx19j1zc9jqj5z"; + sha256 = "06csvbpdv3kl806nqvh5hpag86wpafp1q9r07m7kc1fw3xhi5qmv"; }; # No tests included in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-pasta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-pasta/default.nix index 2b6394ae6b..608ab9ccd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-pasta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-pasta/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "google-pasta"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb"; + sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; }; propagatedBuildInputs = [ @@ -20,6 +20,8 @@ buildPythonPackage rec { meta = { description = "An AST-based Python refactoring library"; homepage = "https://github.com/google/pasta"; + # Usually the tag message contains a one-line summary of the changes. + changelog = "https://github.com/google/pasta/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ timokau ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index f3eb93cd06..4b28e07a6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.28.1"; + version = "1.29.0"; src = fetchPypi { inherit pname version; - sha256 = "adf089aaf6e21358b12e39d9fa7c28611340d8399a918c0b72ff122ce9b7e0af"; + sha256 = "0f681c1ebd5472b804baa391b16dc59d92b065903999566f4776bfbd010bcec9"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix new file mode 100644 index 0000000000..b80a910371 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, h5py +, pytestCheckHook +, netcdf4 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "h5netcdf"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0df12f4692817cf6d8e2fca95f689e61aa68f2f39aea90fd1790fe5ac8d2cbb"; + }; + + propagatedBuildInputs = [ + h5py + ]; + + checkInputs = [ + pytestCheckHook + netcdf4 + ]; + + disabled = pythonOlder "3.6"; + + dontUseSetuptoolsCheck = true; + + meta = { + description = "netCDF4 via h5py"; + homepage = https://github.com/shoyer/h5netcdf; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix index 5977ec3aee..c4caf0e46a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "helpdev"; - version = "0.6.10"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "9e61d24458b7506809670222ca656b139e67d46c530cd227a899780152d7b44e"; + sha256 = "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 6ec62f25a5..ba70a25a68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "9.3.1"; + version = "10.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0d3gd8k0p6n2flcf7kny1zjvrbbrwbbq4lq82ah6gvnbvllxm4hj"; + sha256 = "03kn1c62y6rb851wjhsaxkrwq223hkc4ij59i85999byyb2hyqad"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix new file mode 100644 index 0000000000..f443c58723 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyyaml +, jinja2 +}: + +buildPythonPackage rec { + pname = "HiYaPyCo"; + version = "0.4.16"; + + src = fetchFromGitHub { + owner = "zerwes"; + repo = pname; + rev = "release-${version}"; + sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj"; + }; + + propagatedBuildInputs = [ pyyaml jinja2 ]; + + checkPhase = '' + set -e + find test -name 'test_*.py' -exec python {} \; + ''; + + meta = with lib; { + description = "A simple python lib allowing hierarchical overlay of config files in YAML syntax, offering different merge methods and variable interpolation based on jinja2."; + homepage = "https://github.com/zerwes/hiyapyco"; + license = licenses.gpl3; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index e75894611a..635ad7a283 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.5.5"; + version = "2020.5.19"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "0n3wp2ihjaxlq002rv141766cx4wgk0amg1cb6v30zp0m4054w7d"; + sha256 = "09a5vajzw3f2kpdq9ydzx1f840xmdmzb6br3ns79mnqnsw6nfs6z"; }; # tests require network connection diff --git a/third_party/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix index ee8a83a098..ccbc157837 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/htmlmin/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { description = "A configurable HTML Minifier with safety features"; homepage = "https://pypi.python.org/pypi/htmlmin"; license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.ahmedtd]; + maintainers = []; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index e66509fbae..19ad7317ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.15"; + version = "1.4.16"; src = fetchPypi { inherit pname version; - sha256 = "1w6vy3nk28xhnamnmh7ddawprmb1ri2yw5s9lphmpq2hpfbqvh93"; + sha256 = "19zk3qmcf0afbcbfnj7cmmgr47pxhjqwa1bfdc3fp60yy10kvbgr"; }; # Tests not included in PyPI tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix index 7de40cdfe5..41dcc6b2c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.12"; + version = "0.14"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "12i8r5z0y6ya850fwl2r4hig5hyli8skvjmgylapxa4zbr13fqmc"; + sha256 = "0y0aqw29g525frdnmv9paljzacpp4s21sadfbca5b137iciwr8d0"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix index 6b238163cb..11ae315761 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1p7iaa6ykvhalpv09svxs50hnp25j5nv1zzp42n5r7a7rw70wlf8"; + sha256 = "1ky5ynb8p580y2x3vpib6yrvdjgjb0wpqmdfnq5pqi3qzjyzsqra"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index 7ab5d23078..1abb5b54d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.10.10"; + version = "1.10.12"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1rkgk1d1gijic6l6rsvz5mpfhdj8l7qc60aqafj27s4yi5bbqrc7"; + sha256 = "04gggx47acckyd96cginrw7ldw7fqgkiggk9fxdij2hwi03mk4n4"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix index 45f427017f..9f4b57ba89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.7.2"; + version = "0.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11jja4wlzcr2pwvp3blj1jg6570zr0mpcm3nzhkbkdrbgq6wa2fb"; + sha256 = "02q3d9b933hf8lyvg7w7lgmhij8bjs748vjmsfxhabai04a796d4"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix new file mode 100644 index 0000000000..743604d539 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest +, pytest_xdist +, six }: + +buildPythonPackage rec { + pname = "lazy_import"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gca9xj60qr3aprj9qdc66crr4r7hl8wzv6gc9y40nclazwawj91"; + }; + + checkInputs = [ + pytest + pytest_xdist + ]; + + propagatedBuildInputs = [ + six + ]; + + checkPhase = '' + cd lazy_import + pytest --boxed + ''; + + meta = with stdenv.lib; { + description = "lazy_import provides a set of functions that load modules, and related attributes, in a lazy fashion."; + homepage = https://github.com/mnmelo/lazy_import; + license = licenses.gpl3; + maintainers = [ maintainers.marenz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix new file mode 100644 index 0000000000..c58a18dffe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytest +, bokeh +, ipython +, matplotlib +, numpy +, nbconvert +, nbformat +}: + +buildPythonPackage rec { + pname = "livelossplot"; + version = "0.5.0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "stared"; + repo = pname; + rev = "v${version}"; + sha256 = "164v65qglgyg38q9ajnas99rp14mvrk5hn8x76b8iy81vszmx1c0"; + }; + + propagatedBuildInputs = [ bokeh ipython matplotlib numpy ]; + + checkInputs = [ pytest nbconvert nbformat ]; + checkPhase = '' + pytest tests tests/external_test_examples.py + ''; + + meta = with stdenv.lib; { + description = "Live training loss plot in Jupyter for Keras, PyTorch, and others"; + homepage = "https://github.com/stared/livelossplot"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix index a324c8d7d0..dbe9597ea0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "minidb"; - version = "2.0.3"; + version = "2.0.4"; disabled = !isPy3k; src = fetchFromGitHub { owner = "thp"; repo = "minidb"; rev = version; - sha256 = "0c6y3x957pc5sxkl34lymhkwpn4nlsfw07fcv4y9p2zdb7kjd1gc"; + sha256 = "0i607rkfx0rkyllcx4vf3w2z0wxzs1gqigfw87q90pjrbbh2q4sb"; }; # module imports are incompatible with python2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix index a74150f971..e79f16b1c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.4.5"; + version = "0.4.6"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "1y80c2k4s42lzvm5dz8wi186i7rsn1vs1wn30hp6v6vs62fb91fi"; + sha256 = "1fh0fdv0k2yz7l6a62hf2svpgz34dzn84sh8fnv2x7wrkwd6r8qn"; }; buildInputs = [ mpv ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix index 46d47fd167..8f26324689 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.3.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "070e999db3902a0c62a94d76de8fb98da21eaee22d9e90eb42f1636c87e1b805"; + sha256 = "06as8vh17m0nkp3fpkp42m990a5zjfl2iaa17da99ksh7886mjpc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix index f3f1c2b86c..14a67fe54a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "nodeenv"; @@ -9,6 +9,10 @@ buildPythonPackage rec { sha256 = "ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a"; }; + propagatedBuildInputs = [ + setuptools + ]; + # Tests not included in PyPI tarball doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index 5eef92a287..f65f5079b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.7"; + version = "0.6.8.1"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "09mrm7iz2wdrd7y2csbcidg6bkskjignx2pnifh4i8zlh0vm61bg"; + sha256 = "1rn6i2mcljhb9nmh8qj3slcmqzs9jx8s7j8r2b7685n7751h5ipj"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix index 85753ffa07..6bf0e451f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.1"; pname = "opt_einsum"; src = fetchPypi { inherit version pname; - sha256 = "edfada4b1d0b3b782ace8bc14e80618ff629abf53143e1e6bbf9bd00b11ece77"; + sha256 = "165r7rsl5j94kna4q3vsaq71z23lgxd9b20dgb6abrlas6c6mdw3"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix index daaf845cdf..319f83f727 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix @@ -8,19 +8,20 @@ , w3lib , lxml , cssselect +, isPy27 }: buildPythonPackage rec { pname = "parsel"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "08v76s6s4li7asnyz8a7gbp9vz522rv5apranyv76mb0lhmjd92d"; + sha256 = "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh"; }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ]; + propagatedBuildInputs = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix index a9c86513fe..9d45f35d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "paste"; - version = "3.2.2"; + version = "3.4.0"; src = fetchPypi { pname = "Paste"; inherit version; - sha256 = "15p95br9x7zjy0cckdy6xmhfg61cg49rhi75jd00svrnz234s7qb"; + sha256 = "16sichvhyci1gaarkjs35mai8vphh7b244qm14hj1isw38nx4c03"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix index def036d271..5fc61f6442 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.10.0"; + version = "1.13.1"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "0bpprn5wcz414pqpvwjpd5cc0838shkw2cfvrwfiilhr09bhxbhb"; + sha256 = "1l3jic687vnji952f4dp66jwiprpxskja9v4ffw3bpr6gxgq4syz"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix index ace2b618ef..979b116b71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200402"; + version = "20200517"; disabled = !isPy3k; @@ -11,18 +11,9 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26"; + sha256 = "00272pxkh6djm37yvlvgd06w7ycf35srwk6n3p58ppw5hgmpkhc2"; }; - patches = [ - # Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408 - (fetchpatch { - url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch"; - sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21"; - excludes = [ "CHANGELOG.md" ]; - }) - ]; - propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ]; checkInputs = [ nose ]; @@ -37,4 +28,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy marsam ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 1165157fec..1668cd94ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy3k , pythonOlder +, setuptools , aenum , pytest , pytestcov @@ -10,16 +11,16 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.10"; + version = "1.11"; src = fetchPypi { inherit pname version; - sha256 = "a26ba77127b363446955e8a5317b3194defb1c1bb9d2ed5e7d4830fd4f066d97"; + sha256 = "8463d60b9065daf26e3c0fa6e7515d2a4594847ab417be018858832a475105f1"; }; disabled = !isPy3k; - propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + propagatedBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ]; checkInputs = [ pytest pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 42621493d2..47a60acaa0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.2"; + version = "8.12.4"; src = fetchPypi { inherit pname version; - sha256 = "000vhxjlgvs0w3vywlgx1kq8wj0wk07ybnsdn1qwbamd06msvbb1"; + sha256 = "021dc6kdzqh9kkrsbs08x3ibmfm4xr9hqvdnsji6l0knw1zrkia6"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index f28ea5b24a..86aef0d6ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.11.2"; + version = "1.13.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "03y6xkkqz6rsk23304gg0mn4vgdb0mh1wi9xzrk5vz2ma2wyp8i6"; + sha256 = "0fpsjrppka0mrmkbzysi1s072d18ilsnch4lhd21k2qmvxp2hpmk"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index a387bc0611..c41aaf6b4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "3.4.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1y6mynsvkm9n2n927x8az9ch4blrjja7im9x7iyfrxahqgz0km77"; + sha256 = "1lzp3367hmcpqwbkp4ckdv6hv37knwnwya88jicwl1smznpmjdfv"; }; propagatedBuildInputs = [ requests tqdm websocket_client ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 2d14488c4e..eff9e5d862 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.6.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0br996lqbyq1prq9hhrzkgpicz5fgvxamzjrrpms20a2y1alkwv1"; + sha256 = "1s0hg91dvsklgdk3bi483f8in7vr51lx49smvr2ngvrws7nwsj3s"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ponywhoosh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ponywhoosh/default.nix new file mode 100644 index 0000000000..589be17b01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ponywhoosh/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pony, whoosh }: + +buildPythonPackage rec { + pname = "ponywhoosh"; + version = "1.7.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mggj9d265hra4z67qyla686qvl0cf79655cszi136gh9hqlibv9"; + }; + + propagatedBuildInputs = [ + pony + whoosh + ]; + + meta = with lib; { + homepage = "https://pythonhosted.org/ponywhoosh/"; + description = "Make your database over PonyORM searchable"; + license = licenses.mit; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index 27673b1511..6d0a7d301e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonApplication, pythonOlder +{ lib, fetchPypi, buildPythonPackage, pythonOlder , aspy-yaml , cached-property , cfgv @@ -13,7 +13,7 @@ , virtualenv }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pre-commit"; version = "1.21.0"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix index 056a029967..31e56e6c0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.13"; + version = "0.8.15"; src = fetchPypi { inherit pname version; - sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea"; + sha256 = "0643fwj8vl96bsl30jx091zicmwyi0gglza66xqhqizqyqjq0ag6"; }; buildInputs = [ openssl ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bindings for scrypt key derivation function library"; homepage = "https://pypi.python.org/pypi/scrypt"; - maintainers = with maintainers; [ asymmetric ]; + maintainers = []; license = licenses.bsd2; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix index 29cdfbc659..75b0964e25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyacoustid"; - version = "1.1.7"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "07394a8ae84625a0a6fef2d891d19687ff59cd955caaf48097da2826043356fd"; + sha256 = "0c3dsnfyldnsmyzczp5s5aqvbzcn360s0h4l3gm3k53lg57f762z"; }; propagatedBuildInputs = [ requests audioread ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index e24ca0fa78..82f8f5da3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -1,28 +1,19 @@ -{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: let - _arrow-cpp = arrow-cpp.override { inherit python; }; + _arrow-cpp = arrow-cpp.override { python3 = python; }; in buildPythonPackage rec { pname = "pyarrow"; + disabled = !isPy3k; inherit (_arrow-cpp) version src; - patches = [ - # Remove when updating pkgs.arrow-cpp to 0.17 - (fetchpatch { - name = "ARROW-8106-fix-conversion-test"; - url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch"; - sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd"; - stripLen = 1; - }) - ]; - sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; - propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; + propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 19aa73bec5..b8a607f4d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -1,19 +1,49 @@ -{ stdenv, buildPythonPackage, fetchPypi, srptools, aiohttp, zeroconf -, ed25519, cryptography, curve25519-donna, pytest, pytestrunner -, netifaces, asynctest, virtualenv, toml, filelock, tox }: +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp +, aiozeroconf +, asynctest +, cryptography +, deepdiff +, netifaces +, protobuf +, pytest +, pytest-aiohttp +, pytest-asyncio +, pytestrunner +, srptools +}: buildPythonPackage rec { pname = "pyatv"; - version = "0.3.13"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "8fc1a903a9d666e4109127410d35a83458559a86bc0de3fe1ffb3f15d2d653b3"; + sha256 = "0f9wj1ggllwpjd9nh6nsrck7m4gbz29q6vqbrhbkc2kz6waqkgwc"; }; - propagatedBuildInputs = [ srptools aiohttp zeroconf ed25519 cryptography curve25519-donna tox ]; + nativeBuildInputs = [ pytestrunner]; - checkInputs = [ pytest pytestrunner netifaces asynctest virtualenv toml filelock ]; + propagatedBuildInputs = [ + aiozeroconf + srptools + aiohttp + protobuf + cryptography + netifaces + ]; + + checkInputs = [ + deepdiff + pytest + pytest-aiohttp + pytest-asyncio + ]; + + # just run vanilla pytest to avoid inclusion of coverage reports and xdist + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { description = "A python client library for the Apple TV"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index cc69bbc9ee..c291e6e47f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "4.2.3"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1nqy9zvzxzncfmmbsj4ccb36gymh4pp1n1l9fdhv8fi0ai9b7dyp"; + sha256 = "052q25k3v5fwa02hf5zdpjpfb94ml9g67cqwjjvf6vdana8w3gwh"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix index a03662aa96..b9a75734b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix @@ -13,7 +13,6 @@ , python , mkDerivation , stdenv -, isPy3k }: let compyte = import ./compyte.nix { @@ -29,11 +28,12 @@ buildPythonPackage rec { sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; - preConfigure = '' + preConfigure = with stdenv.lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} + --boost-python-libname=boost_python${major python.version}${minor python.version} \ + --cuda-root=${cudatoolkit} ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix index 669d798312..8499db31e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydub"; - version = "0.23.1"; + version = "0.24.0"; # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; repo = pname; rev = "v${version}"; - sha256 = "1v0bghy4j2nnkgf1r8rbz4s7war872asyy08pc0x1iy1qs275i7s"; + sha256 = "0cnhkk44cn3wa4fmd1rwzdx2zgrn87qg25pbcp9wsisdlpn4bj6d"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix index 91626bd5e5..1d2686ec29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.0.1"; + version = "3.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0nfmckqm45fbfz795qw5hgvygdxgxchdiwp3kmm1k05z99j6mlhv"; + sha256 = "14is5p40f516plzccwg6yf51zkja38abw46kybzwgyy94phr8i9b"; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix index d73ee24f58..4cb6138d5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.49.0"; + version = "0.51.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "063kwvgw7g4nn09pyqwqy72vnhzw0aajg23bi32vr0k49g8fx27s"; + sha256 = "14mkwk44bgm6s4kqagz7nm6p6gsygmksl2628jaqh7ppblxca9as"; }; propagatedBuildInputs = [ pyusb pyserial ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix new file mode 100644 index 0000000000..962803402e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub +, mock, pytest, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "pygls"; + version = "0.8.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "openlawlibrary"; + repo = pname; + rev = "v${version}"; + sha256 = "1853rfdks5n8nw6ig96j7his5kqd75hrvzvd0win4niycaqsag6m"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest==4.5.0" "pytest" + ''; + + checkInputs = [ mock pytest pytest-asyncio ]; + checkPhase = "pytest"; + + meta = with stdenv.lib; { + homepage = "https://github.com/openlawlibrary/pygls"; + description = "Pythonic generic implementation of the Language Server Protocol"; + license = licenses.asl20; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix new file mode 100644 index 0000000000..87b8e0b3ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygments-better-html/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pygments +, isPy3k +}: + +buildPythonPackage rec { + pname = "pygments_better_html"; + version = "0.1.4"; + disabled = ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "028szd3k295yhz943bj19i4kx6f0pfh1fd2q14id0g84dl4i49dm"; + }; + + propagatedBuildInputs = [ pygments ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "pygments_better_html" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/Kwpolska/pygments_better_html"; + description = "Improved line numbering for Pygments’ HTML formatter."; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix index 07de522f79..605c13c0c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmb/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.1.28"; + version = "1.2.1"; src = fetchPypi { inherit pname version; format = "setuptools"; extension = "zip"; - sha256 = "0x44yq440c1j3xnl7qigz2fpfzhx68n9mbj7ps7rd0kj0plcmr2q"; + sha256 = "1gkh28m74rf0ic51cxahiyw4sfz3sp3dz0iggsksi917ryyinwmb"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix index 347daa6cec..61e1de20ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix @@ -1,26 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, python-toolbox , pytest , isPy27 }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.1"; pname = "pysnooper"; src = fetchPypi { inherit version; pname = "PySnooper"; - sha256 = "14vcxrzfmfhsmdck1cb56a6lbfga15qfhlkap9mh47fgspcq8xkx"; + sha256 = "1xngly13x3ylwwcdml2ns8skpxip2myzavp3b9ff2dpqaalf0hdl"; }; # test dependency python-toolbox fails with py27 doCheck = !isPy27; checkInputs = [ - python-toolbox pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix new file mode 100644 index 0000000000..6ce7844192 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, setuptools_scm, pytest, cmake +}: + +buildPythonPackage rec { + pname = "pytest-datadir"; + version = "1.3.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "gabrielcnr"; + repo = pname; + rev = version; + sha256 = "0kwgp6sqnqnmww5r0dkmyfpi0lmw0iwxz3fnwn2fs8w6bvixzznf"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + checkInputs = [ pytest ]; + checkPhase = "pytest"; + + meta = with stdenv.lib; { + homepage = "https://github.com/gabrielcnr/pytest-datadir"; + description = "pytest plugin for manipulating test data directories and files"; + license = licenses.mit; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix index 57085b04cf..bdf09fdf2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix @@ -4,10 +4,11 @@ , fetchFromGitHub , isPy27 , nose +, pytest }: buildPythonPackage rec { - version = "0.9.4"; + version = "1.0.10"; pname = "python_toolbox"; disabled = isPy27; @@ -15,12 +16,12 @@ buildPythonPackage rec { owner = "cool-RR"; repo = pname; rev = version; - sha256 = "1qy2sfqfrkgxixmd22v5lkrdykdfiymsd2s3xa7ndlvg084cgj6r"; + sha256 = "1hpls1hwisdjx1g15cq052bdn9fvh43r120llws8bvgvj9ivnaha"; }; checkInputs = [ docutils - nose + pytest ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix index 67fbd4e24e..936a1eb2e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-utils"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3"; + sha256 = "12c0glzkm81ljgf6pwh0d4rmdm1r7vvgg3ifzp8yp9cfyngw07zj"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix new file mode 100644 index 0000000000..daf6accb89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, numpy +, scikitlearn +, pytorch +, torchvision +, tqdm +}: + +buildPythonPackage rec { + pname = "pytorch-metric-learning"; + version = "0.9.81"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "KevinMusgrave"; + repo = pname; + rev = "cb23328aba64f7f4658374cc2920ef5d56cda5c8"; # no version tag + sha256 = "0c2dyi4qi7clln43481xq66f6r4fadrz84jphjc5phz97bp33ds8"; + }; + + propagatedBuildInputs = [ + numpy + pytorch + scikitlearn + torchvision + tqdm + ]; + + meta = { + description = "Metric learning library for PyTorch"; + homepage = "https://github.com/KevinMusgrave/pytorch-metric-learning"; + changelog = "https://github.com/KevinMusgrave/pytorch-metric-learning/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index 0a932729ff..4cadba28a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.3"; + version = "4.7.4"; src = fetchPypi { inherit pname version; - sha256 = "8f5ae5571f0e921db9f2d12613ed667c350ee22c7db598d9bbbe143e8533f932"; + sha256 = "1zgm57011kpbh6388p8cqwkcgqwlmb7rc9cy3zn9rrnna48byj7x"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 0916695ed4..f5e418d925 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.1.3"; + version = "1.1.4"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "0i081bkmv7qw24ivmdh92ma6x0hnjlf8jgj6rp2c3rb8hjzmi452"; + sha256 = "1a1ik66b7n6h9gxlr5yb16hhf5h9117av2ggykpfaw699xxhnz30"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix index 2cd7590b83..3cd6b2fe3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { ''; postPatch = '' + sed -i '38,45d' setup.py substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix new file mode 100644 index 0000000000..8e3fcc12f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest +, pytestcov +, flaky +, numpy +, pandas +, pytorch +, scikitlearn +, scipy +, tabulate +, tqdm +}: + +buildPythonPackage rec { + pname = "skorch"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l576dws9drjakfsn0pfpbr48b21vpxv3vd3dz8lkbn8q71zs22r"; + }; + + propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; + checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; + + # on CPU, these expect artifacts from previous GPU run + disabledTests = [ + "test_load_cuda_params_to_cpu" + "test_pickle_load" + ]; + + meta = with lib; { + description = "Scikit-learn compatible neural net library using Pytorch"; + homepage = "https://skorch.readthedocs.io"; + changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index b531554911..2fd7d92e3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.4.2"; + version = "1.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0rqpmscxjznxyz3dyxpc56gib319k01vl837r8g8w57dinz4y863"; + sha256 = "0c5g4r5c6zm5fgvk6dd0dbx9gl3ws2swajc5knlacnpfykwzp5b4"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 0c99096226..6a54cc1ec7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -53,6 +53,10 @@ buildPythonPackage rec { # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow # ''; + postPatch = '' + substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8" + ''; + meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 02155483b2..2044e37993 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.14.1.post0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0kmllcch5p20ylxirqiqzls567jr2808rbld9i8f1kf0205al8qq"; + sha256 = "0c1nbpd5wy361xga8lw36xwc9yyz7rylsjr0z7aw7bn3s35bnkbx"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index db23e2ab7d..67242a9916 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.3"; + version = "0.36.5"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "0fj9qiz5hq8gf9pnir077sl58chry7jz63fnj1vgx5rmq1dsys7j"; + sha256 = "0d3lrhqdw3lhkj79wpfxi6cmlxnw99prpq8m70c5q8kinv26h038"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix index 4e1ced22be..b6aee633e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0wxqrm9fpn4phz6rqm7kfd1wwkwzx376gs27nnalwx12q0lwlgbw"; + sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix index d6ec10579f..0f73f8e816 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "054apq55yg7058pmbnyc8jhrcpi9clmi0sm7znhwg0d676brywz0"; + sha256 = "02shnm8r8c0bv494m8sjnrrlqy0pz5q5xrzpq069bx9sc8fszbqq"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 109a5f6c76..d675a1fd35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.47.0"; + version = "2.48.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 = "14skddrf2nl25bvcyys0bgibjqkcivvfdywzldqjzyqvbwr4mkal"; + sha256 = "1w9ns4jjj0p50im9vbjn084zph1g2sfa6l01ydl98qsyj76f4psi"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix index 08c3f6e52c..7799583f8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix @@ -1,24 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub -, pyparsing +, isPy3k +, pythonOlder , pytest }: buildPythonPackage rec { pname = "svgwrite"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "mozman"; repo = "svgwrite"; rev = "v${version}"; - sha256 = "14wz0y118a5wwfzin6cirr9254p4y825lnrnackihdbpw22gcw11"; + sha256 = "15xjz5b4dw1sg3a5k4wmzky4h5v1n937id8vl6hha1a2xj42z2s5"; }; - propagatedBuildInputs = [ - pyparsing - ]; + # svgwrite requires Python 3.6 or newer + disabled = pythonOlder "3.6"; checkInputs = [ pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix index a4933f1b20..b1427a8133 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "1.1.0"; + version = "2.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "19wvx40lgm1d1zqscznwjklchczcmv07cqfigalmpj7i7ym0j6ad"; + sha256 = "1rvvdchdva7j9b29ay0sg8y33pjhpmzynl38wz2rl89pph8gmhlc"; }; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix index 7c628a0789..4dc5c57070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix @@ -430,7 +430,10 @@ in buildPythonPackage { EOF ''; - passthru.libtensorflow = bazel-build.out; + passthru = { + deps = bazel-build.deps; + libtensorflow = bazel-build.out; + }; inherit (bazel-build) meta; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix index 3b4f45f317..4dd378d141 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix @@ -421,7 +421,10 @@ in buildPythonPackage { ''; # Regression test for #77626 removed because not more `tensorflow.contrib`. - passthru.libtensorflow = bazel-build.out; + passthru = { + deps = bazel-build.deps; + libtensorflow = bazel-build.out; + }; inherit (bazel-build) meta; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index 6f1eaa8049..e47e17094a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.0"; + version = "7.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1f2qpjb8nfdklqp3vf6m36bklydlnr8y8v207p8d2gmapzhrngjj"; + sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index a65ea1e98b..be135f6512 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.6.36"; + version = "3.6.38"; src = fetchPypi { inherit pname version; - sha256 = "1m8dqqyzazrjk4d32cqn4d8gvbfcwgs2qbmgvpi2f2mi5vnp6d85"; + sha256 = "0rdffk6a1jlfanb4i0prvy68qya8waa390yyw2kix4ja8fk7y6sx"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txdbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txdbus/default.nix new file mode 100644 index 0000000000..0fbe4900f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/txdbus/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six, twisted }: + +buildPythonPackage rec { + pname = "txdbus"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z41n1ikpdvk0nm8dbyh6g9bg781q4j6hg2b09b5k4wdqm17zxbg"; + }; + + propagatedBuildInputs = [ six twisted ]; + pythonImportsCheck = [ "txdbus" ]; + + meta = with stdenv.lib; { + description = "Native Python implementation of DBus for Twisted"; + homepage = "https://github.com/cocagne/txdbus"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix index 25ea689e9a..d1e18111db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.5.5"; + version = "0.6.0"; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "matiasb"; repo = "python-unidiff"; rev = "v${version}"; - sha256 = "1nvi7s1nn5p7j6aql1nkn2kiadnfby98yla5m3jq8xwsx0aplwdm"; + sha256 = "0farwkw0nbb5h4369pq3i6pp4047hav0h88ba55rzz5k7mr25rgi"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix index 913c8903e9..e319422ce7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "update_checker"; - version = "0.16"; + version = "0.17"; src = fetchPypi { inherit pname version; - sha256 = "1f38l40d32dm0avcidf3dmikma8z0la84yngj88v4xygzi399qvh"; + sha256 = "0qhfn5fjjab50gbnj2053wdfppzkydqgapfz35ymrm1vysvqvvrd"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index 61c9b9df87..1a5494634b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,11 +1,36 @@ -{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, fetchpatch +, rustPlatform +, pkg-config +, openssl +, CoreServices +, Security +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { version = "unstable-2018-08-05"; pname = "vdirsyncer"; name = "${pname}-${version}"; + disabled = isPy27; src = fetchFromGitHub { owner = "spk"; @@ -20,11 +45,11 @@ python3Packages.buildPythonApplication rec { inherit src; sourceRoot = "source/rust"; cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click click-log click-threading requests_toolbelt requests @@ -34,9 +59,16 @@ python3Packages.buildPythonApplication rec { shippai ]; - nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + ]; - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix similarity index 55% rename from third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix rename to third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix index ada70678e3..cb90bfbc59 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -1,17 +1,38 @@ -{ lib, python3Packages, fetchpatch }: +{ stdenv +, pythonAtLeast +, buildPythonPackage +, fetchPypi +, isPy27 +, fetchpatch +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: # Packaging documentation at: # https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { version = "0.16.7"; pname = "vdirsyncer"; + disabled = isPy27; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click click-log click-threading requests_toolbelt requests @@ -19,9 +40,16 @@ python3Packages.buildPythonApplication rec { atomicwrites ]; - nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + ]; - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; patches = [ # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 @@ -42,11 +70,19 @@ python3Packages.buildPythonApplication rec { checkPhase = '' make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test ''; + # Tests started to fail lately, for any python version even as low as 3.5 but + # if you enable the check, you'll see even severer errors with a higher then + # 3.5 python version. Hence it's marked as broken for higher then 3.5 and the + # checks are disabled unconditionally. As a general end user advice, use the + # normal "unstable" `vdirsyncer` derivation, not this one. + doCheck = false; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; license = licenses.mit; + # vdirsyncer (unstable) works with mainline python versions + broken = (pythonAtLeast "3.6"); maintainers = with maintainers; [ loewenheim ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index 70be4a05f6..df4c191bd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -1,25 +1,48 @@ { buildPythonPackage , fetchPypi , lib -, recursivePthLoader +, stdenv +, pythonOlder +, isPy27 +, appdirs +, contextlib2 +, distlib +, filelock +, importlib-metadata +, importlib-resources +, pathlib2 +, setuptools_scm +, six }: buildPythonPackage rec { pname = "virtualenv"; - version = "16.7.9"; + version = "20.0.21"; src = fetchPypi { inherit pname version; - sha256 = "0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3"; + sha256 = "1kxnxxwa25ghlkpyrxa8pi49v87b7ps2gyla7d1h6kbz9sfn45m1"; + }; - # Doubt this is needed - FRidh 2017-07-07 - pythonPath = [ recursivePthLoader ]; + nativeBuildInputs = [ + setuptools_scm + ]; - patches = [ ./virtualenv-change-prefix.patch ]; - - # Tarball doesn't contain tests - doCheck = false; + propagatedBuildInputs = [ + appdirs + distlib + filelock + six + ] ++ lib.optionals isPy27 [ + contextlib2 + ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ + pathlib2 + ] ++ lib.optionals (pythonOlder "3.7") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; meta = { description = "A tool to create isolated Python environments"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch deleted file mode 100644 index f3e8ea854f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch +++ /dev/null @@ -1,62 +0,0 @@ -Without this patch `virtualenv --python=python2.7 .` fails with an -error because it notices that the python readline.so is not in the -same path as python2.7. I assume this is to avoid copying the wrong -file on systems where it is possible to find incompatible libraries by -accident. Adding "/nix/store" to the prefix fixes this problem. - -A sitecustomize.py is created in the virtualenv which makes libraries -from the python specified by the --python argument available to the -virtualenv. For example, this makes readline and sqlite3 available -when a wrapped python is specified. If no --python argument is passed, -it will only add the path to the python used when building -`virtualenv`, which is the unwrapped python, so sqlite3 won't be -available. - - -diff --git a/virtualenv.py b/virtualenv.py -index bcf3225..3530997 100755 ---- a/virtualenv.py -+++ b/virtualenv.py -@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False): - - - def change_prefix(filename, dst_prefix): -- prefixes = [sys.prefix] -- -- if IS_DARWIN: -- prefixes.extend( -- ( -- os.path.join("/Library/Python", VERSION, "site-packages"), -- os.path.join(sys.prefix, "Extras", "lib", "python"), -- os.path.join("~", "Library", "Python", VERSION, "site-packages"), -- # Python 2.6 no-frameworks -- os.path.join("~", ".local", "lib", "python", VERSION, "site-packages"), -- # System Python 2.7 on OSX Mountain Lion -- os.path.join("~", "Library", "Python", VERSION, "lib", "python", "site-packages"), -- ) -- ) -+ prefixes = ["/nix/store", sys.prefix] - - if hasattr(sys, "real_prefix"): - prefixes.append(sys.real_prefix) -@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix): - if src_prefix != os.sep: # sys.prefix == "/" - assert relative_path[0] == os.sep - relative_path = relative_path[1:] -+ if src_prefix == "/nix/store": -+ relative_path = "/".join(relative_path.split("/")[1:]) - return join(dst_prefix, relative_path) - assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes) - -@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy - site_filename_dst = change_prefix(site_filename, home_dir) - site_dir = os.path.dirname(site_filename_dst) - writefile(site_filename_dst, SITE_PY) -+ wrapper_path = join(prefix, "lib", PY_VERSION, "site-packages") -+ writefile( -+ join(site_dir, 'sitecustomize.py',), -+ "import sys; sys.path.append('%s')" % wrapper_path -+ ) - writefile(join(site_dir, "orig-prefix.txt"), prefix) - site_packages_filename = join(site_dir, "no-global-site-packages.txt") - if not site_packages: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix index c0d2d744f0..a37f786c01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "w3lib"; - version = "1.21.0"; + version = "1.22.0"; src = fetchPypi { inherit pname version; - sha256 = "05a3fxi4f43n0dc87lizsy2h84dxvqjy0q6rhkyabdbhypz5864b"; + sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"; }; buildInputs = [ six pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 0985da2080..d293ae449c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.26.0"; + version = "0.26.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "029wxa50dwf4hsi7w0d8wmywh125aaaa7l4g024z1cyi511iy5h1"; + sha256 = "09rvliph7phvgzwmmdv1kwcp3andpiiqfpkrwq1vkxvwqa3mgwji"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/third_party/nixpkgs/pkgs/development/tools/agda-pkg/default.nix b/third_party/nixpkgs/pkgs/development/tools/agda-pkg/default.nix new file mode 100644 index 0000000000..0d93694b50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/agda-pkg/default.nix @@ -0,0 +1,44 @@ +{ lib, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "agda-pkg"; + version = "0.1.50"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wpw90kw3danw91m3jzfdn7zmclimmiz74f77mpij9b1w6wvhm11"; + }; + + # Checks need internet access, so we just check the program executes + # At the moment the help page needs to write to $HOME, this can + # be removed if https://github.com/agda/agda-pkg/issues/40 is fixed + checkPhase = '' + HOME=$NIX_BUILD_TOP $out/bin/apkg --help > /dev/null + ''; + + propagatedBuildInputs = [ + click + GitPython + pony + whoosh + natsort + click-log + requests + humanize + distlib + jinja2 + pyyaml + ponywhoosh + ]; + + meta = with lib; { + homepage = "https://agda.github.io/agda-pkg/"; + description = "Package manager for Agda"; + license = licenses.mit; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 1d880f04dd..b743ba4a2d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.12.4"; + version = "0.13.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "0y58800n61s8wmpcpgw5vpywznwwbp0d30fz2z0kjx4mpwmva4g4"; + sha256 = "0sjd0xvphrc2kxzvwk4l0dnshn062ghn9f29h7k2ifsf2myl7066"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "12hkzq2xn4g5k94kjirjnnz4dddqg7akxnp3qyfkz092vvp25k9z"; + cargoSha256 = "1w9pymg989kl29s4dhr32ck0nq61pg9h1qf4aad1sv83llbqahq0"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index c6b97f21bd..f930bb6e57 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.1.1"; + version = "2.1.3"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0yaxv89p5pdj1qymc5bnz0mphrypil9dnijvp3ml9hk1vxw6lfvb"; + sha256 = "1b0hqc8zs6v47w9sjk40sbj1fw5x5bxg7kw9s84y6s60yr897376"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 6642a833cf..bdd275a218 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre }: +{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }: stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.90"; + version = "2.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "10qqyvx44llbchwqjyipra0nzqqkb9majpp582ac55imc5b8sxa3"; + sha256 = "0gssnb50cndr77xva4nar4a82ii0vfqy96dlm27gb7pd6xmd6xsz"; }; - buildInputs = [ pcre ]; + buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; - makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ]; + makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ] + ++ stdenv.lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index c9c5dd873d..8cd0246c62 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.124.0"; + version = "0.125.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1isy67fx0lrszvkf3bw3pp8mzvcyab4qnssmv4kvvz32vls8gh25"; + sha256 = "0c6ai2fcssys8xd445xxc0zdn3jz6kcy85mac1p89mnlqd1r1xk4"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix index d854065d60..8a265d8984 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.25"; + version = "4.5.27"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1xv4q41kz7a4cqkkdfgwaw2kgi81z62r9l7hmm8qmsnnlbk4xd5j"; + sha256 = "1c0lyj20kvb6ljf7zk6hzs70bl5fwnmyiv6w3hhr079bgn4fq4m0"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index bcd4f7daec..189365008a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.15.5"; + version = "0.16.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi"; + sha256 = "1sh34zrk90sfi3x48d583izzw2bijnpsv6yqslzjpvsgkg8d96vz"; }; - vendorSha256 = "0kjz9v7r7g4cg11w77ijfmvwnbbkrvrfwwsfsmyxrlhznmb3v0wi"; + vendorSha256 = "0xgv4jsrh8rfas7577xqv609pac05rvyshfm8vjx0kv38rnx3hfv"; subPackages = [ "." ]; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/builder.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/builder.sh index 2760bb95fc..dcc38b9ec7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -6,6 +6,7 @@ mkdir -p $out/maven cp -r $name/* $out/maven makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk" +makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug --set-default JAVA_HOME "$jdk" # Add the maven-axis and JIRA plugin by default when using maven 1.x if [ -e $out/maven/bin/maven ] diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix index 7550068274..499ef7a19b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200402"; + version = "20200506"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "0a49pfmbqb3g1h2r2vwbcb4hdyygq1g9n5y7qab37slfml2g45fg"; + sha256 = "1qiq6lvlg2hqiq03slv4vzv3bn4cr3w95r3i6m5fa4hgn2dkrhqa"; }; nativeBuildInputs = [ getopt ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 756e0cf710..05c7a55b9d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation rec { "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ++ lib.optional (useQt4 || withQt5) "--qt-gui" + # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 + ++ lib.optionals stdenv.hostPlatform.is32bit [ + "CFLAGS=-D_FILE_OFFSET_BITS=64" + "CXXFLAGS=-D_FILE_OFFSET_BITS=64" + ] ++ [ "--" # We should set the proper `CMAKE_SYSTEM_NAME`. diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 0e7a4f3d97..dffdbdb9ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.6.2"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "1s2ndry0mpjs8hy8rrxnyarkzqjz7zzh5h541v3fkzgc9rsd6ifb"; + sha256 = "1fa7cjrp16618hj6xzrxiy44ghxvzgkvygzdzyi8jj2y5jnwxf10"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix new file mode 100644 index 0000000000..bdc48bd6b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix @@ -0,0 +1,52 @@ +{ buildah-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, buildah +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, slirp4netns # User-mode networking for unprivileged namespaces +, fuse-overlayfs # CoW for images, much faster than default vfs +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +}: + +let + buildah = buildah-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + slirp4netns + fuse-overlayfs + utillinux + iptables + ] ++ extraPackages); + +in runCommand buildah.name { + name = "${buildah.pname}-wrapper-${buildah.version}"; + inherit (buildah) pname version; + + meta = builtins.removeAttrs buildah.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${buildah.man} $man + + mkdir -p $out/bin + ln -s ${buildah-unwrapped}/share $out/share + makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ + --prefix PATH : ${binPath} +'' diff --git a/third_party/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix b/third_party/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix index 26dd3a895a..08b248dd0f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1"; + sha256 = "0d6k2qr76p93na39j4zbcpc9kaswd806wrqhcwisqxdrcxrjbwhk"; }; - cargoSha256 = "10cw3qgc39id8rzziamvgm5s3yf8vgqrnx9v15dw9miapz88amcy"; + cargoSha256 = "1qz4a1b58j3bv3akqvc3bcgvqq4bi8cbm3gzws6a52dz7ycrgq46"; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/tools/cloudflare-wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloudflare-wrangler/default.nix index 5a05b7ca7c..623afc3e74 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "1lllam0zgr26fbg04hnw1sy35grwrs4br8cx4r9vqjf113cyr80x"; + sha256 = "09rq6lnv9993ah49jxqaqqhv5xxj51gxlqdi99wkj217cxp9gqqn"; }; - cargoSha256 = "0yvnqp15iqv142vcgsmcad07r5nnp417c0iqa9qgyzn39ssgpn0r"; + cargoSha256 = "0vlb1g4pki84n2zf6w3bisa7jpv0ws8nb3lgr0bkjrirf60a9xsk"; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix new file mode 100644 index 0000000000..943655b881 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub +, poetry, pygls, pyparsing +, cmake, pytest, pytest-datadir +}: + +buildPythonApplication rec { + pname = "cmake-language-server"; + version = "0.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "regen100"; + repo = pname; + rev = "v${version}"; + sha256 = "09rijjksx07inbwxjinrsqihkxb011l2glysasmwpkhy0rmmhbcm"; + }; + + nativeBuildInputs = [ poetry ]; + propagatedBuildInputs = [ pygls pyparsing ]; + + checkInputs = [ cmake pytest pytest-datadir ]; + dontUseCmakeConfigure = true; + checkPhase = "pytest"; + + meta = with stdenv.lib; { + homepage = "https://github.com/regen100/cmake-language-server"; + description = "CMake LSP Implementation"; + license = licenses.mit; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 4aadb98108..3cd716e11d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.10.2"; + version = "13.0.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1lw0f3svzsvcw1rkc8z60nrl2jqjj8ciqlw5icazf6ikqbqmf660"; + sha256 = "0ii63xal5cx4mcy87wpdyvprpkk11i2hdl9cifaf3i1l3kgm3arv"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1hawdihnwk9p06fa3ym5q6b4sv6pp9095nimdy5myi6y88yj1rv2"; + sha256 = "04h17117j5ib7h87jzsrs47i5igswnh6nbn2i2d0ansxdk4a8g31"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1r82xj4krdd51540bhr2wjhp6sdr5c2favnnw8nl26vnmwiqpd3k"; + sha256 = "07ywv99df4krnsb4fb2hwxy84214isps331xdpqyf0j3fhgjqmz9"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index 18f543b343..b54a831e95 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-4"; + version = "2.0.0-RC6-18"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0i8jvs5l7f2xzkdlxk784mx5h86hq7xh5ffzb4zalczw9bzmmds1"; + sha256 = "0vym99fyn0g8l5y2zvhf73ww17wywrh503wg5aw4nilj8w1ncvn2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix index 0b9bc192c3..d106ca3ef4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "cue"; - version = "0.1.1"; + version = "0.1.2"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "1qbnm3qb8jz9bljw2gb5bb9g41s5lbq4xvcaj3zgi4fc3708hlji"; + sha256 = "0pmw7gnh4z5sbri8464rpwp3hbrz23zwig82nk9wdjkg1qahyy13"; }; vendorSha256 = "12w2rxp0s3i1ck0qvp2dkg9kk6pyymycdfnfxggcyg4fjshh8afg"; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ solson ]; license = stdenv.lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index f246a0a806..a92c96684a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.8.9"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "13qpva81y98gp84zbcx6b4wsfgpsbv18aj5ihkw6l9ndbxfcrxdl"; + sha256 = "0qasiggaxix3gmmvax00k83q4pd1c1b5wx8ayyplaszkgr9advb8"; }; buildInputs = [ jre makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index f9c5555553..9bbeb3c24a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "doctl"; - version = "1.40.0"; + version = "1.43.0"; - goPackagePath = "github.com/digitalocean/doctl"; + vendorSha256 = null; subPackages = [ "cmd/doctl" ]; - buildFlagsArray = '' + buildFlagsArray = let t = "github.com/digitalocean/doctl"; in '' -ldflags= - -X ${goPackagePath}.Major=${lib.versions.major version} - -X ${goPackagePath}.Minor=${lib.versions.minor version} - -X ${goPackagePath}.Patch=${lib.versions.patch version} - -X ${goPackagePath}.Label=release + -X ${t}.Major=${lib.versions.major version} + -X ${t}.Minor=${lib.versions.minor version} + -X ${t}.Patch=${lib.versions.patch version} + -X ${t}.Label=release ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index 9897405d06..3d0c9afd33 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -20,27 +20,27 @@ in aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; }; - electron_6 = mkElectron "6.1.7" { - x86_64-linux = "7fe94fc1edebe2f5645056a4300fc642c04155e55da8dd4ee058a0c0ef835ae8"; - x86_64-darwin = "1c790a4cbda05f1c136d18fa6a09bdb09a1941f521207466756a3e95e343c485"; - i686-linux = "1afd8ea79acb2b4782fb459e084549ed4cd4ead779764829b1d862148359eae5"; - armv7l-linux = "14f2ea0459f0dda8c566b0fa4a2fe755f4220bbae313ea0c453861ac2f803196"; - aarch64-linux = "80e05c1a0b51c335483666e959c1631a089246986b7fc3a4f9ee1288a57a602a"; + electron_6 = mkElectron "6.1.12" { + x86_64-linux = "dc628216588a896e72991d46071d06ef11aed2cdeca18d11d472c29cfbf12349"; + x86_64-darwin = "6c7244319fdfb90899a48ffd0f426e36dba7c3fc5e29b28a4d29fdca7fb924d3"; + i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; + armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; + aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; }; - electron_7 = mkElectron "7.1.10" { - x86_64-linux = "296f034ac9a00afa4dc99ed145410c015af3f59cd7e9becc7709d70a4f8a9ebf"; - x86_64-darwin = "10eb453c2b19948777a6f404fbdbdd48464a4cd63db16bd3ce66b60dda016724"; - i686-linux = "681b6440d4f0f7ffa29a34610ef41103d72937d6e524d81fd2d0fa8d9eb67936"; - armv7l-linux = "2c09e9a77f1da152d766dc2e43719e2852b70f917229466a2ac457416d1374f7"; - aarch64-linux = "1dad780b872bbc069eb1cac9ff4ec8f0b8d200153ab7f51397e27219094db1f0"; + electron_7 = mkElectron "7.3.0" { + x86_64-linux = "5841d2dae8633ddec654574507689a61983acd774e6cdc8774a64b26eb41b5d4"; + x86_64-darwin = "dfe6aeda73b71aa016fb87f5fdbf87f7d8e574f1cf318fc2a5543399b4e975ae"; + i686-linux = "fdcedc8fda7c3580dadfa50d2ffcf9ebde4d7a01b0a36fb799703510e3a7811f"; + armv7l-linux = "b2989bab1be05230364c058fbadf9967b23873d24e24ac3f7c8d013c11ed73e4"; + aarch64-linux = "15a70ae79aabbf6bb9ee8a107fd08ddc1021c534679899f88e1fcc8d4de980fe"; }; - electron_8 = mkElectron "8.0.0" { - x86_64-linux = "b457a2ece83bb8a2efea42e75403740cbba051a64e325288760046b8999dd1c9"; - x86_64-darwin = "3f96dfa1d4e0313d11b9e5c66e2df161cfdb30685ee9dadcc779bcad2fb3876e"; - i686-linux = "0633ac2b6b6d00302e0e5df224d0e808e4ea9ecc14643e8534027e49b20436fb"; - armv7l-linux = "8d1f3daa86c77e7aceb8c8e4491c094e789951c7d475fc536b85fe7d279794bf"; - aarch64-linux = "484c04204478e8594d66f8bd332529c0c5eecfd71ee1705cc0478fa59c6818ee"; + electron_8 = mkElectron "8.3.0" { + x86_64-linux = "e69d8e36d2f842c7e741794f71952dc8bc5fbaa46ff22bb82ffd71fcf16e2302"; + x86_64-darwin = "582c9f9b53e8752885aa14d829f9318283f1d56eeb12982a03051d795a23e535"; + i686-linux = "2cf7fc55a74427d96ebe67fb601ece2f27802deb95a5bae3d7b427afe71d272c"; + armv7l-linux = "14b67e8a41ce8882442816a2db0eee69fac141e359911704002beb7063aa0eff"; + aarch64-linux = "1d89a75fff3b690efe1295fe6f91225c4fa64f3c22c6acddec895d54e1040b4d"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index 018625da45..d5d257ae64 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -8,7 +8,7 @@ let description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; license = licenses.mit; - maintainers = with maintainers; [ travisbhartwell manveru ]; + maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix index b83070296a..c038e4fdfa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix @@ -4,14 +4,14 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1.6"; + version = "1.1.7"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "0bz3pb34bkdg3l6dvpzynnfhblv18x88a5bh2dm8v31g5f9agh7r"; + sha256 = "1xs4qmja7mm9m67368k2s9p7pmkdx9xz4g3xrsks0s8hwwyliz1s"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index 32519594e4..85b68cff20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -15,7 +15,7 @@ , xmlto , acl -, bazaar +, breezy , binutils , bzip2 , coreutils @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch (substituteAll { src = ./fix-paths.patch; - bzr = "${bazaar}/bin/bzr"; + bzr = "${breezy}/bin/bzr"; cp = "${coreutils}/bin/cp"; patch = "${patch}/bin/patch"; tar = "${gnutar}/bin/tar"; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index 2d63946791..6018d63067 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.1"; + version = "6.4.2"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "00vm2p4xn8jnldjxcj0djpjjx2hppq0ii8367abhbswq7xfhy2d2"; + sha256 = "1m5i7mw3ml2iaqy09h8nmykn602rwkjfgh2mrmc1gss9q3klj1r8"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index 1532f64c24..1c5811f7b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.0.16"; + version = "2.1.1"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "03v06r6gbn8bhya1ig9wdc92hh2ip7072syxkam3sjv150ld80cn"; + sha256 = "1mdja838jxhcasi251fsc3yig3s5vmfqab1wpm34xinr8blii90f"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix b/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix new file mode 100644 index 0000000000..94d140552a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +, libX11, libGL }: + +stdenv.mkDerivation { + name = "glpaper"; + version = "unstable-2020-03-30"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/glpaper"; + rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; + sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + wayland + libX11 # required by libglvnd + libGL + ]; + + meta = with stdenv.lib; { + description = + "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; + homepage = "https://hg.sr.ht/~scoopta/glpaper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix b/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix index dd3ea4b262..e90844167d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gomodifytags/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gomodifytags"; - version = "1.4.0"; + version = "1.6.0"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "fatih"; repo = "gomodifytags"; rev = "v${version}"; - sha256 = "1436wjqs6n2jxlyzx38nm4ih6fr11bybivg3wy5nvzfs6cs59q63"; + sha256 = "1wmzl5sk5mc46njzn86007sqyyv6han058ppiw536qyhk88rzazq"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix index a78a74a3d0..23e0f56845 100644 --- a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.39.2"; + version = "7.41.1"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "13bbqxklpwmh84a1dc6inphqg1nm2l0b7vqs3x9lrjm4bg7c8kjr"; + sha256 = "12ilk0rkpwx8n9b7dird2jfmwnkqndlwjf5wgdcbl014mkl1411b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix b/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix index b56afc0a43..5fd9d314c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hobbes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { name = "hobbes"; - version = "unstable-2020-03-10"; + version = "unstable-2020-05-19"; src = fetchFromGitHub { owner = "morgan-stanley"; repo = "hobbes"; - rev = "ae956df9da3f3b24630bc1757dfaa2a8952db07a"; - sha256 = "1a0lb87vb0qcp5wy6swk4jcc88l7vhy6iflsk7zplw547mbjhjsy"; + rev = "3d80a46b44a362a97a6b963a2bf788fd1f67ade1"; + sha256 = "03m915g3283z2nfdr03dj5k76wn917knfqxb0xj3qinbl4cka2p1"; }; nativeBuildInputs = [ @@ -33,8 +33,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/Morgan-Stanley/hobbes"; license = licenses.asl20; - maintainers = [ maintainers.thmzlt ]; + maintainers = with maintainers; [ kthielen thmzlt ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix index 09684ea998..ce1501fa4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.149"; + version = "0.150"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "1jksjr1345wj42nfad7k6skvpg5qsm4xgjdwzb90zhn27ddkns6v"; + sha256 = "09lq21phnhr374wb8gj355jsqj8c4m5m818r3pbr8f8zpaamjxfj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix new file mode 100644 index 0000000000..c1f7f13298 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchurl +, jre +, makeWrapper +, unzip +}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dex2jar"; + version = "2.0"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.zip"; + sha256 = "1g3mrbyl8sdw1nhp17z23qbfzqpa0w2yxrywgphvd04jdr6yn1vr"; + }; + + nativeBuildInputs = [ makeWrapper unzip ]; + + postPatch = '' + rm *.bat + chmod +x *.sh + ''; + + installPhase = '' + f=$out/lib/dex2jar/ + + mkdir -p $f $out/bin + + mv * $f + for i in $f/*.sh; do + n=$(basename ''${i%.sh}) + makeWrapper $i $out/bin/$n --prefix PATH : ${lib.makeBinPath [ jre ] } + done + ''; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/projects/dex2jar/; + description = "Tools to work with android .dex and java .class files"; + maintainers = with maintainers; [ makefu ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 8ba536e3b5..5fa2b12e9c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1"; + sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv"; }; - cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; + cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix index 9b1b492627..136b44bd84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.24.0"; + version = "0.26.2"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,14 +10,15 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "1riyyi4lxdaqilzzkxzzw3hzcrjjcylq2jh3p3656f99wiisvj28"; + sha256 = "0s5haycpfnfyvxxhhm7205gzylsbjndx9f134f245p4xm5bxhxbf"; }; subPackages = [ "./" ]; meta = with stdenv.lib; { - homepage = "https://k6.io/"; description = "A modern load testing tool, using Go and JavaScript"; + homepage = "https://k6.io/"; + changelog = "https://github.com/loadimpact/k6/releases/tag/v${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ offline ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix index de45ff50c0..1895cd0786 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -1,31 +1,30 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.8.4"; + version = "0.9.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "1f82xlhhxbjadjw609kr1kdm4n69c9mqjia4b3k505wjh7cc55n0"; + sha256 = "0q1dxry10iaf7zx6vyr0da4ihqx7l8dlyhlqm8qqfz913h2wam8c"; }; - cargoSha256 = "0mish7wqwq5ynl98n6swdn5i6mg62aih5rfykbl3wx39b468n481"; + cargoSha256 = "13zs2xz3s4732zxsimg7b22d9707ln4gpscznxi13cjkf5as9gbz"; - installPhase = '' - mkdir -p $out/share/bash-completion/completions - cp -v ${src}/completion/kubie.bash $out/share/bash-completion/completions/kubie + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + postInstall = '' + installShellCompletion completion/kubie.bash ''; meta = with stdenv.lib; { - description = - "Shell independent context and namespace switcher for kubectl"; + 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/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index 4b99cfb10e..d08c9057c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.18"; + version = "0.20.3"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "1zc6y386w111ygyng5s74zg49iajzs77dbrcdy33igj0hbnkwq2x"; + sha256 = "1p05lfm74g28ci5575vr22q5db50h19fcvc3lzddp0vyiw570isl"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index cf9ce2bd26..5f4af62687 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -31,6 +31,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin + # This variant is not targeted at any particular client, clients are + # expected to declare their supported features in initialization options. + makeWrapper ${jre}/bin/java $out/bin/metals \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main" + + # Further variants targeted at clients with featuresets pre-set. makeWrapper ${jre}/bin/java $out/bin/metals-emacs \ --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main" diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index 36df02ff71..e781bb80ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.4"; + version = "1.3.5"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0mddr6jw7bl8k4iqfq3sfpxq8fffm2spi9xwdr4cskkw4qdgrrpz"; + sha256 = "16n1dk9jgy78mrkvr78m4x772kn09y5aa4d06wl4sdgn6apcq2mc"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 6e8f5676bb..7144c2bd0a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.7179"; + version = "0.1.7868"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0md6y2rnzhkpxc2pm3c46jrhwicrswy9qlr6a4mmvpjq1imj1hjq"; + sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index a29af8b60e..487c979c70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200413T141742"; + version = "20200514T134144"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "0bgyl791l8qaja9p22p77llis39kgdm8x1djz1dm8iy6qn22hm1y"; + sha256 = "1c56k9zxi71gjlrmjk2risx04dzr460vql42pfjwm1cv543kij9r"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index c1181c41fb..131c38df2f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -1,17 +1,25 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "editorconfig-checker"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "${version}"; - sha256 = "1gn7q6wg7byhr1l5ly60rbb700xrww9slbq7gbxbw5c1fl0pp3yk"; + sha256 = "1y90yz8da0iqig3m0kbjcicwblkirbbx0s3agpmz2pdca6y2ijwi"; }; - vendorSha256 = "1w5hsdmi95v7qj3fc4jkjapw8cnh41f09wbbzcfmfmvygrii7z16"; + vendorSha256 = "1lyrqrm3pyfv470dmymbkb3vpvp0i2zsndp7qw34fbhp2gnay5kh"; + + nativeBuildInputs = [ installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + + postInstall = '' + installManPage docs/editorconfig-checker.1 + ''; meta = with lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; @@ -19,4 +27,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ uri-canva ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index 75a9689267..4e9daab9bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -1,6 +1,6 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt +, gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt + gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt perlDeps perl nix postgresql # for running the tests nlohmann_json @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar + gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix index 91acaac75a..0a04e5786f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { # fix "unescaped left brace" errors when using intltool in some cases patches = [(fetchpatch { name = "perl5.26-regex-fixes.patch"; - url = "https://sources.debian.org/data/main/i/intltool/0.51.0-5" - + "/debian/patches/perl5.26-regex-fixes.patch"; + url = [ + "https://sources.debian.org/data/main/i/intltool/0.51.0-5/debian/patches/perl5.26-regex-fixes.patch" + "https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch" + ]; sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45"; })]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix new file mode 100644 index 0000000000..11833816ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, nix, makeWrapper }: + +buildGoModule rec { + pname = "nix-build-uncached"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-build-uncached"; + rev = "v${version}"; + sha256 = "0jkpg3ab56lg2kdms9w9ka9ba89py3ajksjsi1rd3iqi74zz2mmh"; + }; + + goPackagePath = "github.com/Mic92/nix-build-uncached"; + vendorSha256 = null; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/nix-build-uncached \ + --prefix PATH ":" ${lib.makeBinPath [ nix ]} + ''; + + meta = with lib; { + description = "A CI friendly wrapper around nix-build"; + license = licenses.mit; + homepage = "https://github.com/Mic92/nix-build-uncached"; + maintainers = [ maintainers.mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix index 02b7ff5fcd..e372999437 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.6.3"; + version = "1.7.0"; src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "04525vv0y849vvc2pi60g5wd9fjp1wbhra2lniifi82y1ldv7w31"; + sha256 = "0sb1a2lgiqaninv5s3zq09ilrkpsamcl68dyhqyz7yi9vsgb0vhy"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 0076884e2e..8185b14cd7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -1,24 +1,31 @@ { stdenv , rustPlatform , fetchFromGitHub +, installShellFiles , Security }: rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "0cmciadiknw6w573v71spzf5ydaz2xxm2snv3n1hks732nahlr56"; + sha256 = "0iydkbmx9z7xpwaif0han5jvy9xh1afmfyldl7fcyy4r906dsmhx"; }; - cargoSha256 = "0dhbbni8ia0dkwjacx5jlr5rj7173nsbivm9gjsx9j8ais0f0hff"; + cargoSha256 = "0iibjh2ll181j69vld1awvjgyv3xwmq0abh10651la4k4jpppx46"; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' + installManPage texlab.1 + ''; + meta = with stdenv.lib; { description = "An implementation of the Language Server Protocol for LaTeX"; homepage = "https://texlab.netlify.com/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix new file mode 100644 index 0000000000..18c5393a6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix @@ -0,0 +1,27 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "tockloader"; + version = "1.4.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0l8mvlqzyq2bfb6g5zhgv2ndgyyrmpww2l7f2snbli73g6x5j2g2"; + }; + + propagatedBuildInputs = with python3Packages; [ + argcomplete + colorama + crcmod + pytoml + pyserial + ]; + + meta = with lib; { + homepage = "https://github.com/tock/tockloader"; + license = licenses.mit; + description = "Tool for programming Tock onto hardware boards."; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index ca625a28c9..ca07a1d726 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.1.1"; + version = "11.2.0"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1sribqcyalgl66im92pmla0hnp07zvg3pbxxakm7jk5l6p13wiw3"; + sha256 = "1nyv73bawmshzzp8hkbcac5bgq0yf8f51ps5hycdw0c5qhrsjwns"; }; - cargoSha256 = "0jcy3p896ykc6s3m21pnh4jv4lhpvhzlrrl1y67ink2lqkamdhvv"; + cargoSha256 = "18a0rg3hgisjd6zh4dk6rflaipmrxxszpigqg8fa816rg0f4bdc7"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index d13212085e..587896fce6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "uncrustify"; - version = "0.70.1"; + version = "0.71.0"; src = fetchFromGitHub { owner = product; repo = product; rev = name; - sha256 = "0zr3vxhd947zdvwccw3cj0vsriaawcpfjq3x94v9887hsi8fk87b"; + sha256 = "1wyhkhn000yad94fnjj61h7lyvan6hig8wh7jxlnyp5wxdwki0pj"; }; nativeBuildInputs = [ cmake python ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index a81b7133e9..973f777d8c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.35.0"; - + version = "1.35.1"; + src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "191jiyw6kx1rw241bg9nv5splfpz6ny90g9yf28cd0xwpx978p83"; + sha256 = "0gx87qc9r3lhqn6q95y74z67sjcxnazkkdi9zswmaqyvjn8x7vf4"; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OmniSharp based on roslyn workspaces"; + homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ tesq0 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index a7fb382c75..eecad922d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -69,28 +69,28 @@ let baseOverlay = self: super: let getDep = depName: self.${depName}; - lockPkgs = builtins.listToAttrs - ( - builtins.map - ( - pkgMeta: rec { - name = moduleName pkgMeta.name; - value = self.mkPoetryDep - ( - pkgMeta // { - inherit pwd preferWheels; - source = pkgMeta.source or null; - files = lockFiles.${name}; - pythonPackages = self; - sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; - } - ); - } - ) compatible - ); + lockPkgs = builtins.listToAttrs ( + builtins.map + ( + pkgMeta: rec { + name = moduleName pkgMeta.name; + value = self.mkPoetryDep ( + pkgMeta // { + inherit pwd preferWheels; + source = pkgMeta.source or null; + files = lockFiles.${name}; + pythonPackages = self; + sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name} or { }; + } + ); + } + ) + compatible + ); in lockPkgs; - overlays = builtins.map getFunctorFn + overlays = builtins.map + getFunctorFn ( [ ( @@ -127,6 +127,8 @@ let }; /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. + In editablePackageSources you can pass a mapping from package name to source directory to have + those packages available in the resulting environment, whose source changes are immediately available. Example: poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; } @@ -139,18 +141,31 @@ let , pwd ? projectDir , python ? pkgs.python3 , preferWheels ? false + # Example: { my-app = ./src; } + , editablePackageSources ? { } }: let - py = mkPoetryPackages - ( - { - inherit pyproject poetrylock overrides python pwd preferWheels; - } - ); - in - py.python.withPackages (_: py.poetryPackages); + py = mkPoetryPackages ( + { + inherit pyproject poetrylock overrides python pwd preferWheels; + } + ); - /* Creates a Python application from pyproject.toml and poetry.lock */ + editablePackage = import ./editable.nix { + inherit pkgs lib poetryLib editablePackageSources; + inherit (py) pyProject python; + }; + + in + py.python.withPackages (_: py.poetryPackages ++ lib.optional (editablePackageSources != { }) editablePackage); + + /* Creates a Python application from pyproject.toml and poetry.lock + + The result also contains a .dependencyEnv attribute which is a python + environment of all dependencies and this apps modules. This is useful if + you rely on dependencies to invoke your modules for deployment: e.g. this + allows `gunicorn my-module:app`. + */ mkPoetryApplication = { projectDir ? null , src ? poetryLib.cleanPythonSources { src = projectDir; } @@ -194,17 +209,17 @@ let pkg = py.pkgs."${dep}"; constraints = deps.${dep}.python or ""; isCompat = compat constraints; - in if isCompat then pkg else null - ) depAttrs; + in + if isCompat then pkg else null + ) + depAttrs; getInputs = attr: attrs.${attr} or [ ]; mkInput = attr: extraInputs: getInputs attr ++ extraInputs; buildSystemPkgs = poetryLib.getBuildSystemPkgs { inherit pyProject; pythonPackages = py.pkgs; }; - in - py.pkgs.buildPythonApplication - ( + app = py.pkgs.buildPythonPackage ( passedAttrs // { pname = moduleName pyProject.tool.poetry.name; version = pyProject.tool.poetry.version; @@ -212,6 +227,10 @@ let inherit src; format = "pyproject"; + # Like buildPythonApplication, but without the toPythonModule part + # Meaning this ends up looking like an application but it also + # provides python modules + namePrefix = ""; buildInputs = mkInput "buildInputs" buildSystemPkgs; propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); @@ -220,16 +239,30 @@ let passthru = { python = py; + dependencyEnv = ( + lib.makeOverridable ({ app, ... }@attrs: + let + args = builtins.removeAttrs attrs [ "app" ] // { + extraLibs = [ app ]; + }; + in + py.buildEnv.override args) + ) { inherit app; }; }; - meta = meta // { - inherit (pyProject.tool.poetry) description homepage; + meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) { + inherit (pyProject.tool.poetry) description; + } // lib.optionalAttrs (lib.hasAttr "homepage" pyProject.tool.poetry) { + inherit (pyProject.tool.poetry) homepage; + } // { inherit (py.meta) platforms; license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - }; + } // meta; } ); + in + app; /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ cli = import ./cli.nix { inherit pkgs lib version; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix new file mode 100644 index 0000000000..8b0d933e44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix @@ -0,0 +1,54 @@ +{ pkgs +, lib +, poetryLib +, pyProject +, python +, editablePackageSources +}: +let + name = poetryLib.moduleName pyProject.tool.poetry.name; + + # Just enough standard PKG-INFO fields for an editable installation + pkgInfoFields = { + Metadata-Version = "2.1"; + Name = name; + # While the pyproject.toml could contain arbitrary version strings, for + # simplicity we just use the same one for PKG-INFO, even though that + # should follow follow PEP 440: https://www.python.org/dev/peps/pep-0345/#version + # This is how poetry transforms it: https://github.com/python-poetry/poetry/blob/6cd3645d889f47c10425961661b8193b23f0ed79/poetry/version/version.py + Version = pyProject.tool.poetry.version; + Summary = pyProject.tool.poetry.description; + }; + + pkgInfoFile = builtins.toFile "${name}-PKG-INFO" + (lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}: ${value}") pkgInfoFields)); + + entryPointsFile = builtins.toFile "${name}-entry_points.txt" + (lib.generators.toINI { } pyProject.tool.poetry.plugins); + + # A python package that contains simple .egg-info and .pth files for an editable installation + editablePackage = python.pkgs.toPythonModule (pkgs.runCommandNoCC "${name}-editable" + { } '' + mkdir -p "$out/${python.sitePackages}" + cd "$out/${python.sitePackages}" + + # See https://docs.python.org/3.8/library/site.html for info on such .pth files + # These add another site package path for each line + touch poetry2nix-editable.pth + ${lib.concatMapStringsSep "\n" (src: '' + echo "${toString src}" >> poetry2nix-editable.pth + '') + (lib.attrValues editablePackageSources)} + + # Create a very simple egg so pkg_resources can find this package + # See https://setuptools.readthedocs.io/en/latest/formats.html for more info on the egg format + mkdir "${name}.egg-info" + cd "${name}.egg-info" + ln -s ${pkgInfoFile} PKG-INFO + ${lib.optionalString (pyProject.tool.poetry ? plugins) '' + ln -s ${entryPointsFile} entry_points.txt + ''} + '' + ); +in +editablePackage diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index ae5867b833..001a3d09c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -14,36 +14,39 @@ in removePathDependenciesHook = callPackage ( {}: - makeSetupHook { - name = "remove-path-dependencies.sh"; - deps = [ ]; - substitutions = { - inherit pythonInterpreter; - yj = "${yj}/bin/yj"; - pyprojectPatchScript = "${./pyproject-without-path.py}"; - }; - } ./remove-path-dependencies.sh + makeSetupHook + { + name = "remove-path-dependencies.sh"; + deps = [ ]; + substitutions = { + inherit pythonInterpreter; + yj = "${yj}/bin/yj"; + pyprojectPatchScript = "${./pyproject-without-path.py}"; + }; + } ./remove-path-dependencies.sh ) { }; pipBuildHook = callPackage ( { pip, wheel }: - makeSetupHook { - name = "pip-build-hook.sh"; - deps = [ pip wheel ]; - substitutions = { - inherit pythonInterpreter pythonSitePackages; - }; - } ./pip-build-hook.sh + makeSetupHook + { + name = "pip-build-hook.sh"; + deps = [ pip wheel ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + }; + } ./pip-build-hook.sh ) { }; poetry2nixFixupHook = callPackage ( {}: - makeSetupHook { - name = "fixup-hook.sh"; - deps = [ ]; - } ./fixup-hook.sh + makeSetupHook + { + name = "fixup-hook.sh"; + deps = [ ]; + } ./fixup-hook.sh ) { }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index ed47837ee4..39233929ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -20,7 +20,7 @@ let minor = l: lib.elemAt l 1; joinVersion = v: lib.concatStringsSep "." v; in - joinVersion ( if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer); + joinVersion (if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer); # Compare a semver expression with a version isCompatible = version: @@ -45,28 +45,27 @@ let state = operators."${operator}" acc.state (satisfiesSemver version v); }; initial = { operator = "&&"; state = true; }; - in if expr == "" then true else (builtins.foldl' combine initial tokens).state; + in + if expr == "" then true else (builtins.foldl' combine initial tokens).state; fromTOML = builtins.fromTOML or ( - toml: builtins.fromJSON - ( - builtins.readFile - ( - pkgs.runCommand "from-toml" - { - inherit toml; - allowSubstitutes = false; - preferLocalBuild = true; - } - '' - ${pkgs.remarshal}/bin/remarshal \ - -if toml \ - -i <(echo "$toml") \ - -of json \ - -o $out - '' - ) + toml: builtins.fromJSON ( + builtins.readFile ( + pkgs.runCommand "from-toml" + { + inherit toml; + allowSubstitutes = false; + preferLocalBuild = true; + } + '' + ${pkgs.remarshal}/bin/remarshal \ + -if toml \ + -i <(echo "$toml") \ + -of json \ + -o $out + '' ) + ) ); readTOML = path: fromTOML (builtins.readFile path); @@ -88,11 +87,10 @@ let # file: filename including extension # hash: SRI hash # kind: Language implementation and version tag - predictURLFromPypi = lib.makeOverridable - ( - { pname, file, hash, kind }: - "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}" - ); + predictURLFromPypi = lib.makeOverridable ( + { pname, file, hash, kind }: + "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}" + ); # Fetch the wheels from the PyPI index. @@ -102,36 +100,35 @@ let # file: filename including extension # hash: SRI hash # kind: Language implementation and version tag - fetchWheelFromPypi = lib.makeOverridable - ( - { pname, file, hash, kind, curlOpts ? "" }: - let - version = builtins.elemAt (builtins.split "-" file) 2; - in - (pkgs.stdenvNoCC.mkDerivation { - name = file; - nativeBuildInputs = [ - pkgs.curl - pkgs.jq - ]; - isWheel = true; - system = "builtin"; + fetchWheelFromPypi = lib.makeOverridable ( + { pname, file, hash, kind, curlOpts ? "" }: + let + version = builtins.elemAt (builtins.split "-" file) 2; + in + (pkgs.stdenvNoCC.mkDerivation { + name = file; + nativeBuildInputs = [ + pkgs.curl + pkgs.jq + ]; + isWheel = true; + system = "builtin"; - preferLocalBuild = true; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "NIX_CURL_FLAGS" - ]; + preferLocalBuild = true; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "NIX_CURL_FLAGS" + ]; - predictedURL = predictURLFromPypi { inherit pname file hash kind; }; - inherit pname file version curlOpts; + predictedURL = predictURLFromPypi { inherit pname file hash kind; }; + inherit pname file version curlOpts; - builder = ./fetch-wheel.sh; + builder = ./fetch-wheel.sh; - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = hash; - }) - ); + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = hash; + }) + ); # Fetch the artifacts from the PyPI index. Since we get all # info we need from the lock file we don't use nixpkgs' fetchPyPi @@ -143,16 +140,15 @@ let # file: filename including extension # hash: SRI hash # kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention - fetchFromPypi = lib.makeOverridable - ( - { pname, file, hash, kind }: - if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; } - else - pkgs.fetchurl { - url = predictURLFromPypi { inherit pname file hash kind; }; - inherit hash; - } - ); + fetchFromPypi = lib.makeOverridable ( + { pname, file, hash, kind }: + if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; } + else + pkgs.fetchurl { + url = predictURLFromPypi { inherit pname file hash kind; }; + inherit hash; + } + ); getBuildSystemPkgs = { pythonPackages , pyProject diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 2467dad31e..20175f6bad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -58,7 +58,7 @@ pythonPackages.callPackage binaryDist = selectWheel fileCandidates; sourceDist = builtins.filter isSdist fileCandidates; eggs = builtins.filter isEgg fileCandidates; - entries = ( if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; + entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; lockFileEntry = builtins.head entries; _isEgg = isEgg lockFileEntry; in @@ -111,7 +111,8 @@ pythonPackages.callPackage propagatedBuildInputs = let compat = isCompatible (poetryLib.getPythonVersion python); - deps = lib.filterAttrs (n: v: v) + deps = lib.filterAttrs + (n: v: v) ( lib.mapAttrs ( @@ -120,7 +121,8 @@ pythonPackages.callPackage constraints = v.python or ""; in compat constraints - ) dependencies + ) + dependencies ); depAttrs = lib.attrNames deps; in diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index d18e6b8293..ccb8d9342f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -6,520 +6,536 @@ self: super: { - astroid = super.astroid.overridePythonAttrs - ( - old: rec { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + astroid = super.astroid.overridePythonAttrs ( + old: rec { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - av = super.av.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; - } - ); + av = super.av.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + } + ); - bcrypt = super.bcrypt.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ); + bcrypt = super.bcrypt.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ); cffi = # cffi is bundled with pypy if self.python.implementation == "pypy" then null else ( - super.cffi.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ) - ); - - cftime = super.cftime.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - } - ); - - configparser = super.configparser.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ - self.toml - ]; - - postPatch = '' - substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")' - ''; - } - ); - - cryptography = super.cryptography.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); - - django = ( - super.django.overridePythonAttrs - ( + super.cffi.overridePythonAttrs ( old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) - ++ [ pkgs.gettext ]; + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; } ) + ); + + cftime = super.cftime.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + } ); - django-bakery = super.django-bakery.overridePythonAttrs - ( + configparser = super.configparser.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.toml + ]; + + postPatch = '' + substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")' + ''; + } + ); + + cryptography = super.cryptography.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + } + ); + + django = ( + super.django.overridePythonAttrs ( old: { - configurePhase = '' - if ! test -e LICENSE; then - touch LICENSE - fi - '' + (old.configurePhase or ""); + propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) + ++ [ pkgs.gettext ]; } - ); + ) + ); - dlib = super.dlib.overridePythonAttrs - ( - old: { - # Parallel building enabled - inherit (pkgs.python.pkgs.dlib) patches; + django-bakery = super.django-bakery.overridePythonAttrs ( + old: { + configurePhase = '' + if ! test -e LICENSE; then + touch LICENSE + fi + '' + (old.configurePhase or ""); + } + ); - enableParallelBuilding = true; - dontUseCmakeConfigure = true; + dlib = super.dlib.overridePythonAttrs ( + old: { + # Parallel building enabled + inherit (pkgs.python.pkgs.dlib) patches; - nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; - buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; - } - ); + enableParallelBuilding = true; + dontUseCmakeConfigure = true; + + nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; + buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; + } + ); # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - faker = super.faker.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + faker = super.faker.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - fancycompleter = super.fancycompleter.overridePythonAttrs - ( - old: { - postPatch = '' - substituteInPlace setup.py \ - --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ - --replace 'versioning="devcommit"' 'version="${old.version}"' - ''; - } - ); + fancycompleter = super.fancycompleter.overridePythonAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ + --replace 'versioning="devcommit"' 'version="${old.version}"' + ''; + } + ); - fastparquet = super.fastparquet.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - } - ); + fastparquet = super.fastparquet.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); - grandalf = super.grandalf.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + grandalf = super.grandalf.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - h5py = super.h5py.overridePythonAttrs - ( - old: - if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; - configure_flags = "--hdf5=${pkgs.hdf5}"; - postConfigure = '' - ${self.python.executable} setup.py configure ${configure_flags} - ''; - } else old - ); + h5py = super.h5py.overridePythonAttrs ( + old: + if old.format != "wheel" then rec { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + configure_flags = "--hdf5=${pkgs.hdf5}"; + postConfigure = '' + ${self.python.executable} setup.py configure ${configure_flags} + ''; + } else old + ); - horovod = super.horovod.overridePythonAttrs - ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; - } - ); + horovod = super.horovod.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + } + ); + + imagecodecs = super.imagecodecs.overridePythonAttrs ( + old: { + patchPhase = '' + substituteInPlace setup.py \ + --replace "/usr/include/openjpeg-2.3" \ + "${pkgs.openjpeg.dev}/include/openjpeg-2.3" + substituteInPlace setup.py \ + --replace "/usr/include/jxrlib" \ + "$out/include/libjxr" + substituteInPlace imagecodecs/_zopfli.c \ + --replace '"zopfli/zopfli.h"' \ + '' + substituteInPlace imagecodecs/_zopfli.c \ + --replace '"zopfli/zlib_container.h"' \ + '' + substituteInPlace imagecodecs/_zopfli.c \ + --replace '"zopfli/gzip_container.h"' \ + '' + ''; + + preBuild = '' + mkdir -p $out/include/libjxr + ln -s ${pkgs.jxrlib}/include/libjxr/**/* $out/include/libjxr + + ''; + + buildInputs = old.buildInputs ++ [ + # Commented out packages are declared required, but not actually + # needed to build. They are not yet packaged for nixpkgs. + # bitshuffle + pkgs.brotli + # brunsli + pkgs.bzip2 + pkgs.c-blosc + # charls + pkgs.giflib + pkgs.jxrlib + pkgs.lcms + pkgs.libaec + pkgs.libaec + pkgs.libjpeg_turbo + # liblzf + # liblzma + pkgs.libpng + pkgs.libtiff + pkgs.libwebp + pkgs.lz4 + pkgs.openjpeg + pkgs.snappy + # zfp + pkgs.zopfli + pkgs.zstd + pkgs.zlib + ]; + } + ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overridePythonAttrs - ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; - } - ); + importlib-metadata = super.importlib-metadata.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; + } + ); - isort = super.isort.overridePythonAttrs - ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; - } - ); + isort = super.isort.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + } + ); - jupyter = super.jupyter.overridePythonAttrs - ( - old: rec { - # jupyter is a meta-package. Everything relevant comes from the - # dependencies. It does however have a jupyter.py file that conflicts - # with jupyter-core so this meta solves this conflict. - meta.priority = 100; - } - ); + jupyter = super.jupyter.overridePythonAttrs ( + old: rec { + # jupyter is a meta-package. Everything relevant comes from the + # dependencies. It does however have a jupyter.py file that conflicts + # with jupyter-core so this meta solves this conflict. + meta.priority = 100; + } + ); - kiwisolver = super.kiwisolver.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ - # cppy is at the time of writing not in nixpkgs - (self.cppy or null) - ]; - } - ); + kiwisolver = super.kiwisolver.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + # cppy is at the time of writing not in nixpkgs + (self.cppy or null) + ]; + } + ); - lap = super.lap.overridePythonAttrs - ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.numpy - ]; - } - ); + lap = super.lap.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.numpy + ]; + } + ); - llvmlite = super.llvmlite.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + llvmlite = super.llvmlite.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - postPatch = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + postPatch = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config - ''; + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config + ''; - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - passthru = old.passthru // { llvm = pkgs.llvm; }; - } - ); + passthru = old.passthru // { llvm = pkgs.llvm; }; + } + ); - lockfile = super.lockfile.overridePythonAttrs - ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; - } - ); + lockfile = super.lockfile.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; + } + ); - lxml = super.lxml.overridePythonAttrs - ( - old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; - buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; - } - ); + lxml = super.lxml.overridePythonAttrs ( + old: { + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + } + ); - markupsafe = super.markupsafe.overridePythonAttrs - ( - old: { - src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; - } - ); + markupsafe = super.markupsafe.overridePythonAttrs ( + old: { + src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; + } + ); - matplotlib = super.matplotlib.overridePythonAttrs - ( - old: - let - enableGhostscript = old.passthru.enableGhostscript or false; - enableGtk3 = old.passthru.enableTk or false; - enableQt = old.passthru.enableQt or false; - enableTk = old.passthru.enableTk or false; + matplotlib = super.matplotlib.overridePythonAttrs ( + old: + let + enableGhostscript = old.passthru.enableGhostscript or false; + enableGtk3 = old.passthru.enableTk or false; + enableQt = old.passthru.enableQt or false; + enableTk = old.passthru.enableTk or false; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - in - { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + in + { + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - XDG_RUNTIME_DIR = "/tmp"; + XDG_RUNTIME_DIR = "/tmp"; - buildInputs = old.buildInputs - ++ lib.optional enableGhostscript pkgs.ghostscript - ++ lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = old.buildInputs + ++ lib.optional enableGhostscript pkgs.ghostscript + ++ lib.optional stdenv.isDarwin [ Cocoa ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.libpng - pkgs.freetype - ] - ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] - ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] - ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] - ; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.libpng + pkgs.freetype + ] + ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] + ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] + ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] + ; - inherit (super.matplotlib) patches; - } - ); + inherit (super.matplotlib) patches; + } + ); # Calls Cargo at build time for source builds and is really tricky to package maturin = super.maturin.override { preferWheel = true; }; - mccabe = super.mccabe.overridePythonAttrs - ( + mccabe = super.mccabe.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); + + netcdf4 = super.netcdf4.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.zlib + pkgs.netcdf + pkgs.hdf5 + pkgs.curl + pkgs.libjpeg + ]; + + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev pkgs.hdf5; + NETCDF4_DIR = pkgs.netcdf; + CURL_DIR = pkgs.curl.dev; + JPEG_DIR = pkgs.libjpeg.dev; + } + ); + + numpy = super.numpy.overridePythonAttrs ( + old: + let + blas = old.passthru.args.blas or pkgs.openblasCompat; + blasImplementation = lib.nameFromURL blas.name "-"; + cfg = pkgs.writeTextFile { + name = "site.cfg"; + text = ( + lib.generators.toINI + { } { + ${blasImplementation} = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + } + ); + }; + in + { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + buildInputs = old.buildInputs ++ [ blas self.cython ]; + enableParallelBuilding = true; + preBuild = '' + ln -s ${cfg} site.cfg + ''; + passthru = old.passthru // { + blas = blas; + inherit blasImplementation cfg; + }; + } + ); + + openexr = super.openexr.overridePythonAttrs ( + old: rec { + buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; + } + ); + + peewee = super.peewee.overridePythonAttrs ( + old: + let + withPostgres = old.passthru.withPostgres or false; + withMysql = old.passthru.withMysql or false; + in + { + buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs + ++ lib.optional withPostgres self.psycopg2 + ++ lib.optional withMysql self.mysql-connector; + } + ); + + pillow = super.pillow.overridePythonAttrs ( + old: { + nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + } + ); + + psycopg2 = super.psycopg2.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); + + psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); + + pyarrow = + if lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs ( + old: + let + parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); + _arrow-cpp = pkgs.arrow-cpp.override { inherit (self) python; }; + ARROW_HOME = _arrow-cpp; + arrowCppVersion = parseMinor pkgs.arrow-cpp; + pyArrowVersion = parseMinor super.pyarrow; + errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; + in + if arrowCppVersion != pyArrowVersion then throw errorMessage else { + + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + pkgs.pkgconfig + pkgs.cmake + ]; + + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; + + PARQUET_HOME = _arrow-cpp; + inherit ARROW_HOME; + + buildInputs = old.buildInputs ++ [ + pkgs.arrow-cpp + ]; + + PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" + + # This doesn't use setup hook to call cmake so we need to workaround #54606 + # ourselves + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ]; + + dontUseCmakeConfigure = true; + } + ) else super.pyarrow.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; } ); - netcdf4 = super.netcdf4.overridePythonAttrs - ( + pycairo = ( + drv: ( + drv.overridePythonAttrs ( + _: { + format = "other"; + } + ) + ).overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ - self.cython + + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.meson + pkgs.ninja + pkgs.pkgconfig ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg + pkgs.cairo + pkgs.xlibsWrapper ]; - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev pkgs.hdf5; - NETCDF4_DIR = pkgs.netcdf; - CURL_DIR = pkgs.curl.dev; - JPEG_DIR = pkgs.libjpeg.dev; + mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; } - ); + ) + ) + super.pycairo; - numpy = super.numpy.overridePythonAttrs - ( - old: - let - blas = old.passthru.args.blas or pkgs.openblasCompat; - blasImplementation = lib.nameFromURL blas.name "-"; - cfg = pkgs.writeTextFile { - name = "site.cfg"; - text = ( - lib.generators.toINI { } { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; - }; - } - ); - }; - in - { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - passthru = old.passthru // { - blas = blas; - inherit blasImplementation cfg; - }; - } - ); + pycocotools = super.pycocotools.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + self.numpy + ]; + } + ); - openexr = super.openexr.overridePythonAttrs - ( - old: rec { - buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; - } - ); + pygobject = super.pygobject.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + } + ); - peewee = super.peewee.overridePythonAttrs - ( - old: - let - withPostgres = old.passthru.withPostgres or false; - withMysql = old.passthru.withMysql or false; - in - { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs - ++ lib.optional withPostgres self.psycopg2 - ++ lib.optional withMysql self.mysql-connector; - } - ); + pylint = super.pylint.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - pillow = super.pillow.overridePythonAttrs - ( - old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; - buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; - } - ); - - psycopg2 = super.psycopg2.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); - - psycopg2-binary = super.psycopg2-binary.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); - - pyarrow = - if lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs - ( - old: - let - parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); - _arrow-cpp = pkgs.arrow-cpp.override { inherit (self) python; }; - ARROW_HOME = _arrow-cpp; - arrowCppVersion = parseMinor pkgs.arrow-cpp; - pyArrowVersion = parseMinor super.pyarrow; - errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; - in - if arrowCppVersion != pyArrowVersion then throw errorMessage else { - - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - pkgs.pkgconfig - pkgs.cmake - ]; - - preBuild = '' - export PYARROW_PARALLEL=$NIX_BUILD_CORES - ''; - - PARQUET_HOME = _arrow-cpp; - inherit ARROW_HOME; - - buildInputs = old.buildInputs ++ [ - pkgs.arrow-cpp - ]; - - PYARROW_BUILD_TYPE = "release"; - PYARROW_WITH_PARQUET = true; - PYARROW_CMAKE_OPTIONS = [ - "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - - # This doesn't use setup hook to call cmake so we need to workaround #54606 - # ourselves - "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" - ]; - - dontUseCmakeConfigure = true; - } - ) else super.pyarrow.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - ]; - } - ); - - pycairo = - ( - drv: ( - drv.overridePythonAttrs - ( - _: { - format = "other"; - } - ) - ).overridePythonAttrs - ( - old: { - - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.meson - pkgs.ninja - pkgs.pkgconfig - ]; - - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.cairo - pkgs.xlibsWrapper - ]; - - mesonFlags = [ "-Dpython=${ if self.isPy3k then "python3" else "python"}" ]; - } - ) - ) super.pycairo; - - pycocotools = super.pycocotools.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - self.numpy - ]; - } - ); - - pygobject = super.pygobject.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; - } - ); - - pylint = super.pylint.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); - - pyopenssl = super.pyopenssl.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); + pyopenssl = super.pyopenssl.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + } + ); pyqt5 = let @@ -529,318 +545,302 @@ self: super: withWebKit = drv.passthru.args.withWebKit or false; withWebSockets = drv.passthru.args.withWebSockets or false; in - super.pyqt5.overridePythonAttrs - ( - old: { - format = "other"; - - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - pkgs.qt5.qmake - pkgs.xorg.lndir - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - pkgs.qt5.qtwebchannel - # self.pyqt5-sip - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; - - buildInputs = old.buildInputs ++ [ - pkgs.dbus - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; - - # Fix dbus mainloop - patches = pkgs.python3.pkgs.pyqt5.patches or [ ]; - - configurePhase = '' - runHook preConfigure - - export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} - - mkdir -p $out/${self.python.sitePackages}/dbus/mainloop - ${self.python.executable} configure.py -w \ - --confirm-license \ - --no-qml-plugin \ - --bindir=$out/bin \ - --destdir=$out/${self.python.sitePackages} \ - --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ - --sipdir=$out/share/sip/PyQt5 \ - --designer-plugindir=$out/plugins/designer - - runHook postConfigure - ''; - - postInstall = '' - ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - - # Let's make it a namespace package - cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) - EOF - ''; - - installCheckPhase = - let - modules = [ - "PyQt5" - "PyQt5.QtCore" - "PyQt5.QtQml" - "PyQt5.QtWidgets" - "PyQt5.QtGui" - ] - ++ lib.optional withWebSockets "PyQt5.QtWebSockets" - ++ lib.optional withWebKit "PyQt5.QtWebKit" - ++ lib.optional withMultimedia "PyQt5.QtMultimedia" - ++ lib.optional withConnectivity "PyQt5.QtConnectivity" - ; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in - '' - echo "Checking whether modules can be imported..." - ${self.python.interpreter} -c "${imports}" - ''; - - doCheck = true; - - enableParallelBuilding = true; - } - ); - - pytest-datadir = super.pytest-datadir.overridePythonAttrs - ( + super.pyqt5.overridePythonAttrs ( old: { - postInstall = '' - rm -f $out/LICENSE + format = "other"; + + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + pkgs.qt5.qmake + pkgs.xorg.lndir + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + pkgs.qt5.qtwebchannel + # self.pyqt5-sip + self.sip + ] + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets + ; + + buildInputs = old.buildInputs ++ [ + pkgs.dbus + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + self.sip + ] + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets + ; + + # Fix dbus mainloop + patches = pkgs.python3.pkgs.pyqt5.patches or [ ]; + + configurePhase = '' + runHook preConfigure + + export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} + + mkdir -p $out/${self.python.sitePackages}/dbus/mainloop + ${self.python.executable} configure.py -w \ + --confirm-license \ + --no-qml-plugin \ + --bindir=$out/bin \ + --destdir=$out/${self.python.sitePackages} \ + --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ + --sipdir=$out/share/sip/PyQt5 \ + --designer-plugindir=$out/plugins/designer + + runHook postConfigure ''; + + postInstall = '' + ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + + # Let's make it a namespace package + cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; + + installCheckPhase = + let + modules = [ + "PyQt5" + "PyQt5.QtCore" + "PyQt5.QtQml" + "PyQt5.QtWidgets" + "PyQt5.QtGui" + ] + ++ lib.optional withWebSockets "PyQt5.QtWebSockets" + ++ lib.optional withWebKit "PyQt5.QtWebKit" + ++ lib.optional withMultimedia "PyQt5.QtMultimedia" + ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in + '' + echo "Checking whether modules can be imported..." + ${self.python.interpreter} -c "${imports}" + ''; + + doCheck = true; + + enableParallelBuilding = true; } ); - pytest = super.pytest.overridePythonAttrs - ( - old: { - doCheck = false; - } - ); + pytest-datadir = super.pytest-datadir.overridePythonAttrs ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; + } + ); + + pytest = super.pytest.overridePythonAttrs ( + old: { + doCheck = false; + } + ); pytest-runner = super.pytest-runner or super.pytestrunner; - python-jose = super.python-jose.overridePythonAttrs - ( - old: { - postPath = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" - substituteInPlace setup.py --replace "'pytest-runner'" "" - ''; - } - ); + python-jose = super.python-jose.overridePythonAttrs ( + old: { + postPath = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace "'pytest-runner'" "" + ''; + } + ); - python-prctl = super.python-prctl.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.libcap - ]; - } - ); + python-prctl = super.python-prctl.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.libcap + ]; + } + ); - pyzmq = super.pyzmq.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; - } - ); + pyzmq = super.pyzmq.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; + } + ); - rockset = super.rockset.overridePythonAttrs - ( - old: rec { - postPatch = '' - cp ./setup_rockset.py ./setup.py - ''; - } - ); + rockset = super.rockset.overridePythonAttrs ( + old: rec { + postPatch = '' + cp ./setup_rockset.py ./setup.py + ''; + } + ); - scaleapi = super.scaleapi.overridePythonAttrs - ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true - ''; - } - ); + scaleapi = super.scaleapi.overridePythonAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true + ''; + } + ); - pandas = super.pandas.overridePythonAttrs - ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; - } - ); + pandas = super.pandas.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + } + ); + + panel = super.panel.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.nodejs ]; + } + ); # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs # Make it not fail with infinite recursion - pybind11 = super.pybind11.overridePythonAttrs - ( - old: { - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DPYBIND11_TEST=off" - ]; - doCheck = false; # Circular test dependency - } - ); + pybind11 = super.pybind11.overridePythonAttrs ( + old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DPYBIND11_TEST=off" + ]; + doCheck = false; # Circular test dependency + } + ); - scipy = super.scipy.overridePythonAttrs - ( - old: - if old.format != "wheel" then { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - enableParallelBuilding = true; - buildInputs = old.buildInputs ++ [ self.numpy.blas ]; - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - preBuild = '' - ln -s ${self.numpy.cfg} site.cfg - ''; - } else old - ); + scipy = super.scipy.overridePythonAttrs ( + old: + if old.format != "wheel" then { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + enableParallelBuilding = true; + buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + preConfigure = '' + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + preBuild = '' + ln -s ${self.numpy.cfg} site.cfg + ''; + } else old + ); - scikit-learn = super.scikit-learn.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.gfortran - pkgs.glibcLocales - ] ++ lib.optionals stdenv.cc.isClang [ - pkgs.llvmPackages.openmp - ]; + scikit-learn = super.scikit-learn.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.gfortran + pkgs.glibcLocales + ] ++ lib.optionals stdenv.cc.isClang [ + pkgs.llvmPackages.openmp + ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; - enableParallelBuilding = true; - } - ); + enableParallelBuilding = true; + } + ); - shapely = super.shapely.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; - inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; - } - ); + shapely = super.shapely.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; + } + ); shellingham = if lib.versionAtLeast super.shellingham.version "1.3.2" then ( - super.shellingham.overridePythonAttrs - ( - old: { - format = "pyproject"; - } - ) + super.shellingham.overridePythonAttrs ( + old: { + format = "pyproject"; + } + ) ) else super.shellingham; - tables = super.tables.overridePythonAttrs - ( - old: { - HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; - } - ); + tables = super.tables.overridePythonAttrs ( + old: { + HDF5_DIR = "${pkgs.hdf5}"; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + } + ); - tensorpack = super.tensorpack.overridePythonAttrs - ( - old: { - postPatch = '' - substituteInPlace setup.cfg --replace "# will call find_packages()" "" - ''; - } - ); + tensorpack = super.tensorpack.overridePythonAttrs ( + old: { + postPatch = '' + substituteInPlace setup.cfg --replace "# will call find_packages()" "" + ''; + } + ); - urwidtrees = super.urwidtrees.overridePythonAttrs - ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.urwid - ]; - } - ); + urwidtrees = super.urwidtrees.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.urwid + ]; + } + ); - vose-alias-method = super.vose-alias-method.overridePythonAttrs - ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); + vose-alias-method = super.vose-alias-method.overridePythonAttrs ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; + } + ); - uvloop = super.uvloop.overridePythonAttrs - ( - old: { - buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.ApplicationServices - pkgs.darwin.apple_sdk.frameworks.CoreServices - ]; - } - ); + uvloop = super.uvloop.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ + pkgs.darwin.apple_sdk.frameworks.ApplicationServices + pkgs.darwin.apple_sdk.frameworks.CoreServices + ]; + } + ); # Stop infinite recursion by using bootstrapped pkg from nixpkgs wheel = ( pkgs.python3.pkgs.override { python = self.python; } - ).wheel.overridePythonAttrs - ( - old: - if old.format == "other" then old else { - inherit (super.wheel) pname name version src; - } - ); + ).wheel.overridePythonAttrs ( + old: + if old.format == "other" then old else { + inherit (super.wheel) pname name version src; + } + ); zipp = ( if lib.versionAtLeast super.zipp.version "2.0.0" then ( - super.zipp.overridePythonAttrs - ( - old: { - prePatch = '' - substituteInPlace setup.py --replace \ - 'setuptools.setup()' \ - 'setuptools.setup(version="${super.zipp.version}")' - ''; - } - ) + super.zipp.overridePythonAttrs ( + old: { + prePatch = '' + substituteInPlace setup.py --replace \ + 'setuptools.setup()' \ + 'setuptools.setup(version="${super.zipp.version}")' + ''; + } + ) ) else super.zipp - ).overridePythonAttrs - ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.toml - ]; - } - ); + ).overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.toml + ]; + } + ); } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index 773e0a60e0..fad0b782c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -37,14 +37,17 @@ let # Make a tree out of expression groups (parens) findSubExpressions = expr: let - acc = builtins.foldl' findSubExpressionsFun { - exprs = [ ]; - expr = expr; - pos = 0; - openP = 0; - exprPos = 0; - startPos = 0; - } (lib.stringToCharacters expr); + acc = builtins.foldl' + findSubExpressionsFun + { + exprs = [ ]; + expr = expr; + pos = 0; + openP = 0; + exprPos = 0; + startPos = 0; + } + (lib.stringToCharacters expr); tailExpr = (substr acc.exprPos acc.pos expr); tailExprs = if tailExpr != "" then [ tailExpr ] else [ ]; in @@ -53,7 +56,7 @@ let let splitCond = ( s: builtins.map - (x: stripStr ( if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) + (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) (builtins.split " (and|or) " (s + " ")) ); mapfn = expr: ( @@ -71,8 +74,9 @@ let in builtins.foldl' ( - acc: v: acc ++ ( if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]) - ) [ ] exprs; + acc: v: acc ++ (if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]) + ) [ ] + exprs; # Transform individual expressions to structured expressions # This function also performs variable substitution, replacing environment markers with their explicit values @@ -159,10 +163,9 @@ let let parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString - ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in op.">=" v c && op."<" v upperConstraint; @@ -207,10 +210,13 @@ let ) else throw "Unsupported type" ) else if builtins.typeOf v == "list" then ( let - ret = builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } v; + ret = builtins.foldl' + reduceExpressionsFun + { + value = true; + cond = "and"; + } + v; in acc // { value = cond."${acc.cond}" acc.value ret.value; @@ -219,10 +225,13 @@ let ); in ( - builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } exprs + builtins.foldl' + reduceExpressionsFun + { + value = true; + cond = "and"; + } + exprs ).value; in e: builtins.foldl' (acc: v: v acc) e [ diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index e86b1d3ac6..bf001392e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -39,10 +39,9 @@ let # Prune constraint parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString - ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in operators.">=" v c && operators."<" v upperConstraint; @@ -69,7 +68,7 @@ let op = elemAt mPre 0; v = elemAt mPre 1; } - # Infix operators are range matches + # Infix operators are range matches else if mIn != null then { op = elemAt mIn 1; v = { @@ -82,6 +81,7 @@ let satisfiesSemver = version: constraint: let inherit (parseConstraint constraint) op v; - in if constraint == "*" then true else operators."${op}" version v; + in + if constraint == "*" then true else operators."${op}" version v; in { inherit satisfiesSemver; } diff --git a/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix b/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix index 63a805175d..a5cf91b70d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "prototool"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "uber"; repo = pname; rev = "v${version}"; - sha256 = "1ssgvhcnqffhhdx8hnk4lmklip2f6g9i7ifblywfjylb08y7iqgd"; + sha256 = "02ih9pqnziwl2k4z6c59w1p4bxmb3xki5y33pdfkxqn2467s792g"; }; nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "19wza3vkkda44cng8m6f9y7qpzrgk2adyjmcafk17v4773rxlncf"; + vendorSha256 = "0gyj0yrri2j4yxmyn4d4vdhaxf2p08srpjcxg9zpaxwv5rrvipav"; postInstall = '' wrapProgram "$out/bin/prototool" \ @@ -30,4 +30,4 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/tools/redis-dump/default.nix b/third_party/nixpkgs/pkgs/development/tools/redis-dump/default.nix index 2c93ef47d6..2d4acd724d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/redis-dump/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/redis-dump/default.nix @@ -3,7 +3,7 @@ bundlerApp { pname = "redis-dump"; gemdir = ./.; - exes = [ "redis-dump" ]; + exes = [ "redis-dump" "redis-load" ]; passthru.updateScript = bundlerUpdateScript "redis-dump"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix b/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix index 5087b811ac..4e3e12a8ee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rshell/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.27"; + version = "0.0.28"; src = fetchPypi { inherit pname version; - sha256 = "15pm60jfmr5nms43nrh5jlpz4lxxfhaahznfcys6nc4g80r2fwr2"; + sha256 = "1crnlv0khplpibl9mj3flrgp877pnr1xz6hnnsi6hk3kfbc6p3nj"; }; propagatedBuildInputs = [ pyserial pyudev ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/run/default.nix b/third_party/nixpkgs/pkgs/development/tools/run/default.nix index 391cbff171..518cc3e255 100644 --- a/third_party/nixpkgs/pkgs/development/tools/run/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/run/default.nix @@ -1,13 +1,13 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "TekWizely"; repo = "run"; rev = "v${version}"; - sha256 = "0q9f8lzrzybdablqph5wihqhfbfzb3bbnnxvhy7g5ccg1kzy7mgp"; + sha256 = "17n11lqhywq4z62w2rakdq80v7mxf83rgln19vj4v4nxpwd2hjjw"; }; vendorSha256 = "1g5rmiiwqpm8gky9yr5f2a7zsjjmm9i12r7yxj9cz7y3rmw9sw8c"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock index 05868a4e1c..4390a1cf79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,7 +104,7 @@ checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "cargo-make" -version = "0.30.7" +version = "0.30.8" dependencies = [ "ci_info", "clap", @@ -840,9 +840,9 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" dependencies = [ "semver-parser", ] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 98f21b23d4..2950ed1b83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.7"; + version = "0.30.8"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0i8jf3161qqazp8cy3kzn2cw7zrcv1ijf2w3s8d8l0y2i2b25cv1"; + sha256 = "0sx1kvrk2df5v9f35cd6201b3m8d6ynppmikqm00g55db9r4vfl2"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "08mn1ckvyffys9wqnvva7w1qzvarqvmnkpliv118vnnr072jnc6y"; + cargoSha256 = "1b0x12hcjy061dvbpy5cwgp6pwlzq2k1dapr9glw8dwprns57ar7"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix index 89970c7dc9..0905c27d4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.5.1"; + version = "2.5.2"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "113dn10y0q8d2agr0g4cnx5fzdxjcz67i9089j86nn5i76wilm5s"; + outputHash = "14sfpzhd7r8srl9qyrdfqwmgrircqsgrr5hwvg8h1vaiwakq7m00"; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index 29ed96b778..8aad323000 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,12 +6,12 @@ let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "1mqsangjindfqgvjxgmpgfrcd8a2lqmwl587l0ip0p5wwz8yq5wi"; + sha256 = "149p43zaz45malmff1274r2bwjcyjwsdickivk3pd0mvnjbfid2r"; }; x86_64-darwin = { system = "mac64"; - sha256 = "18ydf2bk5aiin3yffb9z8215idz65nkhgxq0mmlvwb8gwsdvnwi1"; + sha256 = "1xpyqxpsz3r653ls67s6alv4g2vr4lxf29gyxc162ikywyrx80nr"; }; }; @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "81.0.4044.69"; + version = "83.0.4103.39"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index dce42380c5..7c673dea21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.8.0"; + version = "1.9.1"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "bd280192092e28067f0f52584c8bcb4f4dc480e4"; + rev = "7bac6a150c9618465f5ad38cc0a5dbc4677c39ba"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0s1j1lij56idl981nq7dnvkil1ki283nfhcfqyl5g00payihlm73"; + sha256 = "0l0x89xv5brinafrvbz6hgs5kvmpl4ajcrsjdjh3myf7i0mvh3gm"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index 5532c3088e..45b6867197 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -10,46 +10,36 @@ , installShellFiles , makeWrapper , fuse-overlayfs +, nixosTests }: -let - version = "0.2.0"; +buildGoModule rec { + pname = "skopeo"; + version = "1.0.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "09zqzrw6f1s6kaknnj3hra3xz4nq6y86vmw5vk8p4f6g7cwakg1x"; + sha256 = "1zg0agf8x7fa8zdzfzgncm64j363lmxrqjhdzsx6mlig87k17p05"; }; - defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; - - vendorPath = "github.com/containers/skopeo/vendor/github.com/containers/image/v5"; - -in -buildGoModule { - pname = "skopeo"; - inherit version; - inherit src; - outputs = [ "out" "man" ]; vendorSha256 = null; - excludedPackages = [ "integration" ]; - nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; - buildFlagsArray = '' - -ldflags= - -X ${vendorPath}/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X ${vendorPath}/internal/tmpdir.unixTempDirForBigFiles=/tmp + buildPhase = '' + patchShebangs . + make binary-local ''; - postBuild = '' + installPhase = '' + make install-binary PREFIX=$out make install-docs MANINSTALLDIR="$man/share/man" installShellCompletion --bash completions/bash/skopeo ''; @@ -59,6 +49,8 @@ buildGoModule { --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} ''; + passthru.tests.docker-tools = nixosTests.docker-tools; + meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; diff --git a/third_party/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix b/third_party/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix index 7dcde72fc4..d44622e7e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/solarus-quest-editor/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "solarus-quest-editor"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitLab { owner = "solarus-games"; repo = pname; rev = "v${version}"; - sha256 = "0dq94iw9ldl4p83dqcwjs5ilpkvz5jgdk8rbls8pf8b7afpg36rz"; + sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"; }; buildInputs = [ cmake luajit SDL2 diff --git a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index 865c655e67..b59ef341df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.2.6"; + version = "2.3.0"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "1rb21a8nr4mcdsfv3c3xh45kcpdwllhjfb26w9xsdgfh1j4mhb81"; + sha256 = "1zjbgs1qx75jgxc46x9380iqh8pfgacih38ad3qxd0106a8lcp5h"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix b/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix index cdf3ed5b71..3587454b84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "toxiproxy"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "Shopify"; repo = "toxiproxy"; rev = "v${version}"; - sha256 = "1a7yry846iwi9cs9xam2vjbw73fjy45agjrwk214k0n1ziaawz2f"; + sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig"; }; goPackagePath = "github.com/Shopify/toxiproxy"; diff --git a/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix b/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix index bab3ebd575..c4a1cf7398 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -1,5 +1,5 @@ { stdenv, python3Packages -, git, bazaar, subversion }: +, git, breezy, subversion }: with python3Packages; @@ -14,7 +14,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml setuptools ]; - makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])]; + makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])]; doCheck = false; # requires network diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix new file mode 100644 index 0000000000..acd26b638c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "vultr-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "vultr"; + repo = pname; + rev = "v${version}"; + sha256 = "1z3vbcpchrf3bak08p72c96c2l39hdp196fqc5wvsqar3mzrrz7s"; + }; + + vendorSha256 = null; + + meta = with stdenv.lib; { + description = "Official command line tool for Vultr services"; + homepage = "https://github.com/vultr/vultr-cli"; + license = licenses.asl20; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix index a755cecc60..11c9875bf9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.14"; + version = "1.0.16"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "0zis0190zs37x1wq044qd2vyvzcrkm8kp0734byz1lpdlgl5257b"; + sha256 = "1zzc46d6m7l5lil423417crdda2cqb396p2idcla2ps161hwq3qp"; fetchSubmodules = true; }; # https://github.com/WebAssembly/wabt/pull/1408 patches = [ (fetchpatch { - url = "https://github.com/WebAssembly/wabt/pull/1408/commits/9115d0c55067435ec9c55924e8a2bb151bac095d.patch"; - sha256 = "1iklbz630vih08brsgq2d5q91kialg255sgd1mxl7023pvrhi44g"; + url = "https://github.com/WebAssembly/wabt/pull/1408/commits/28505f4db6e4561cf6840af5c304a9aa900c4987.patch"; + sha256 = "1nh1ddsak6w51np17xf2r7i0czxrjslz1i4impmmp88h5bp2yjba"; }) ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix new file mode 100644 index 0000000000..629c1eeb41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -0,0 +1,139 @@ +{ stdenv +, fetchurl +, fetchFromGitHub +, rust +, rustPlatform +, python27 +, installShellFiles +, Security +, CoreServices +}: +let + pname = "deno"; + version = "1.0.0"; + + denoSrc = fetchFromGitHub { + owner = "denoland"; + repo = pname; + rev = "v${version}"; + sha256 = "0k8mqy1hf9hkp60jhd0x4z814y36g51083b3r7prc69ih2523hd1"; + + fetchSubmodules = true; + }; + cargoSha256 = "1fjl07qqvl1f20qazcqxh32xmdfh80jni7i3jzvz6vgsfw1g5cmk"; + + rustyV8Lib = fetchlib "rusty_v8" "0.4.2" { + x86_64-linux = "1ac6kv3kv087df6kdgfd7kbh24187cg9z7xhbz6rw6jjv4ci2zbi"; + aarch64-linux = "06iyjx4p4vp2i81wdy0vxai2k18pki972ff7k0scjqrgmnav1p8k"; + x86_64-darwin = "02hwbpsqdzb9mvfndgykvv44f1jig3w3a26l0h26hs5shsrp47jv"; + }; + + arch = rust.toRustTarget stdenv.hostPlatform; + fetchlib = name: version: sha256: fetchurl { + url = "https://github.com/denoland/${name}/releases/download/v${version}/librusty_v8_release_${arch}.a"; + sha256 = sha256."${stdenv.hostPlatform.system}"; + meta = { inherit version; }; + }; +in +rustPlatform.buildRustPackage rec { + inherit pname version cargoSha256; + + src = denoSrc; + + nativeBuildInputs = [ + # chromium/V8 requires python 2.7, we're not building V8 from source + # but as a result rusty_v8's download script also uses python 2.7 + # tracking issue: https://bugs.chromium.org/p/chromium/issues/detail?id=942720 + python27 + + # Install completions post-install + installShellFiles + ]; + + buildInputs = with stdenv.lib; [ ] + ++ optionals stdenv.isDarwin [ Security CoreServices ]; + + # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem + # To avoid this we pre-download the file and place it in the locations it will require it in advance + preBuild = '' + # Check the rusty_v8 lib downloaded matches the Cargo.lock file + rusty_v8_ver="$(grep 'name = "rusty_v8"' -A 1 Cargo.lock | grep "version =" | cut -d\" -f2)" + if [ "${rustyV8Lib.meta.version}" != "$rusty_v8_ver" ]; then + printf "%s\n" >&2 \ + "version mismatch between 'rusty_v8' in Cargo.lock and downloaded library:" \ + " wanted: ${rustyV8Lib.meta.version}" \ + " got: $rusty_v8_ver" + exit 1 + fi; + + _rusty_v8_setup() { + for v in "$@"; do + dir="target/$v/gn_out/obj" + mkdir -p "$dir" && cp "${rustyV8Lib}" "$dir/librusty_v8.a" + done + } + + # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed + _rusty_v8_setup "debug" "release" "${arch}/release" + ''; + + # Set home to existing env var TMP dir so tests that write there work correctly + preCheck = '' + export HOME="$TMPDIR" + ''; + + checkFlags = [ + # Strace not allowed on hydra + "--skip benchmark_test" + + # Tests that try to write to `/build/source/target/debug` + "--skip _017_import_redirect" + "--skip https_import" + "--skip js_unit_tests" + "--skip lock_write_fetch" + + # Cargo test runs a deno test on the std lib with sub-benchmarking-tests, + # The sub-sub-tests that are failing: + # forAwaitFetchDenolandX10, promiseAllFetchDenolandX10is + # Trying to access https://deno.land/ on build's limited network access + "--skip std_tests" + + # Fails on aarch64 machines + # tracking issue: https://github.com/denoland/deno/issues/5324 + "--skip run_v8_flags" + + # Skip for multiple reasons: + # downloads x86_64 binary on aarch64 machines + # tracking issue: https://github.com/denoland/deno/pull/5402 + # downloads a binary that needs ELF patching & tries to run imediately + # upgrade will likely never work with nix as it tries to replace itself + # code: https://github.com/denoland/deno/blob/v1.0.0/cli/upgrade.rs#L211 + "--skip upgrade_in_tmpdir" + "--skip upgrade_with_version_in_tmpdir" + ]; + + # TODO: Move to enhanced installShellCompletion when merged: PR #83630 + postInstall = '' + $out/bin/deno completions bash > deno.bash + $out/bin/deno completions fish > deno.fish + $out/bin/deno completions zsh > _deno + installShellCompletion deno.{bash,fish} --zsh _deno + ''; + + meta = with stdenv.lib; { + homepage = "https://deno.land/"; + description = "A secure runtime for JavaScript and TypeScript"; + longDescription = '' + Deno aims to be a productive and secure scripting environment for the modern programmer. + Deno will always be distributed as a single executable. + Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable. + Deno explicitly takes on the role of both runtime and package manager. + It uses a standard browser-compatible protocol for loading modules: URLs. + Among other things, Deno is a great replacement for utility scripts that may have been historically written with + bash or python. + ''; + license = licenses.mit; + maintainers = with maintainers; [ jk ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 9cf73bd15f..3392860159 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,26 +2,25 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.117"; + version = "0.0.123"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0i9azvhlwp5g699yagfbd5rnsr5kdnbw6lsz28nz1dzvmrj9xp7w"; + sha256 = "1gs796n2cw8kpfsqr21zqxzp8dmnhhmjfy7vnpi838566i5ql9q3"; }; preBuild = '' go generate ./... ''; - preFixup = '' - rm $out/bin/doc - rm $out/bin/helpgen - ''; + subPackages = [ "." ]; vendorSha256 = "10wcyxzkwvbhf86dq1rh852zgdg28draay0515zp459z34vv4zna"; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; + meta = with lib; { description = "Command line tools for fly.io services"; homepage = "https://fly.io/"; diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/development/web/minify/default.nix index 7396063a3f..b813e87b54 100644 --- a/third_party/nixpkgs/pkgs/development/web/minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/minify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minify"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "12jns7m9liyjg9wy8ynvji2d2g4k2z1ymp6k3610mivmvg159sy4"; + sha256 = "06xzb681g4lfrpqa1rhpq5mm83vpik8qp6gjxqm2n21bfph88jm2"; }; vendorSha256 = "120d3nzk8cr5496cxp5p6ydlzw9mmpg7dllqhv1kpgwlbxmd8vr3"; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index af8595b564..ae1536de34 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.3"; - sha256 = "18srfcv9zi39960szdnd4rgfj9w295z1agjvpw8arwn75449nmgh"; + version = "12.17.0"; + sha256 = "0csfdwzn1qssmkanxa8m3znjcc6h5qjaw934mkq9bz7zly39wvfa"; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix index 1c9c353fd5..da7bf09e9f 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.2.0"; - sha256 = "1kqnkqkv2chw9s0hazbaba5y1555h526825xqk4rr441wcxcrzcf"; + version = "14.3.0"; + sha256 = "0xqs9z0pxx8m5dk9gm1r9pxfk9vdmpvfsj94mfdkqar578nfm8gi"; } diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index 2b3bf34807..e56ab1bbba 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.23.0"; + version = "7.24.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0m3pjimpahc3kiwdq21rwyg6ckdh3avhzx3apmygisaz4gnab94d"; + sha256 = "0wriyj58icgljmghghyxi1mnjr1vh5jyp8lzwcf6lcsdvsh0ccmw"; name = "${pname}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index a9496f26de..87a25ef0bf 100644 --- a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "1gdzp54f2xyvbw9hnyjlj4s69jvxkxr3hqclq1c8ajmx39s7rymz"; + sha256 = "0wnz7112qfar5qaadxbsp2qpcjaqn0mmzi4j0v4z6rx6lyvar5mb"; }; buildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix index e5cfe6da17..03aa5d5430 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -16,6 +16,7 @@ , enableTruetype ? true , enableFPS ? false , enableTextMode ? false +, enableSound ? true }: with lib; @@ -32,7 +33,7 @@ buildEnv { paths = [ (dwarf-fortress.override { inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme - enableIntro enableTruetype enableFPS enableTextMode; + enableIntro enableTruetype enableFPS enableTextMode enableSound; })] ++ lib.optional enableDwarfTherapist dwarf-therapist ++ lib.optional enableLegendsBrowser legends-browser; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix index 31b21c5a43..79b63e3ce9 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -12,6 +12,7 @@ , enableTruetype ? true , enableFPS ? false , enableTextMode ? false +, enableSound ? true }: let @@ -67,7 +68,8 @@ let substituteInPlace $out/data/init/init.txt \ --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ - --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' + --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' \ + --replace '[SOUND:YES]' '[SOUND:${unBool enableSound}]' '')); env = buildEnv { diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix index 691140b5bb..19ed6ccab3 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/default.nix +++ b/third_party/nixpkgs/pkgs/games/factorio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL -, factorio-utils +, libSM, libICE, libXext, factorio-utils , releaseType , mods ? [] , username ? "", token ? "" # get/reset token at https://factorio.com/profile @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; + experimental = bdist { sha256 = "1ypq9qxry2b9a74p2i20f1yl20yf37xr4kvflbg1cn5nb8vvznxq"; version = "0.18.26"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; + experimental = bdist { sha256 = "1srlzncwp1gcdy6ih8cc1ml5ggvg6xkw5jc2q95qjb9gpjv29mnl"; version = "0.18.26"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; @@ -166,7 +166,7 @@ let ''; homepage = "https://www.factorio.com/"; license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ Baughn elitak ]; + maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; }; @@ -186,6 +186,9 @@ let libXrandr libXi libGL + libSM + libICE + libXext ]; installPhase = base.installPhase + '' diff --git a/third_party/nixpkgs/pkgs/games/katago/default.nix b/third_party/nixpkgs/pkgs/games/katago/default.nix index cbbdb53851..0a9ebd9e3e 100644 --- a/third_party/nixpkgs/pkgs/games/katago/default.nix +++ b/third_party/nixpkgs/pkgs/games/katago/default.nix @@ -6,6 +6,7 @@ , cmake , makeWrapper , fetchFromGitHub +, fetchpatch , cudnn ? null , cudatoolkit ? null , libGL_driver ? null @@ -34,15 +35,30 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "1625s3fh0xc2ldgyl6sjdjmpliyys7rzzkcys6h9x6k828g8n0lq"; + sha256 = "0qdc9hgbzd175b2xkjs62dy6gyybcn9lf1mifiyhjbzjpgv192h4"; }; + # To workaround CMake 3.17.0's new buggy behavior wrt CUDA Compiler testing + # See the following tracking issues: + # KataGo: + # - Issue #225: https://github.com/lightvector/KataGo/issues/225 + # - PR #227: https://github.com/lightvector/KataGo/pull/227 + # CMake: + # - Issue #20708: https://gitlab.kitware.com/cmake/cmake/-/issues/20708 + patches = [ + (fetchpatch { + name = "227.patch"; + url = "https://patch-diff.githubusercontent.com/raw/lightvector/KataGo/pull/227.patch"; + sha256 = "03f1vmdjhb79mpj95sijcwla8acy32clrjgrn4xqw5h90zdgj511"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper diff --git a/third_party/nixpkgs/pkgs/games/linux-steam-integration/default.nix b/third_party/nixpkgs/pkgs/games/linux-steam-integration/default.nix deleted file mode 100644 index 2a814f30a5..0000000000 --- a/third_party/nixpkgs/pkgs/games/linux-steam-integration/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, gettext, - gcc_multi, libressl, gnome3, steam }: - -let - version = "0.7.3"; - -in stdenv.mkDerivation { - pname = "linux-steam-integration"; - inherit version; - - src = fetchFromGitHub { - owner = "clearlinux"; - repo = "linux-steam-integration"; - rev = "v${version}"; - sha256 = "0brv3swx8h170ycxksb31sf5jvj85csfpx7gjlf6yrfz7jw2j6vp"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; - buildInputs = [ gtk libressl ]; - - # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c - # Patch path to lsi-steam in lsi-steam.desktop - # Patch path to zenity in lsi.c - postPatch = '' - substituteInPlace src/shim/shim.c --replace "/usr/" $out - substituteInPlace data/lsi-steam.desktop --replace "/usr/" $out - substituteInPlace src/lsi/lsi.c --replace zenity ${gnome3.zenity}/bin/zenity - substituteInPlace data/lsi-settings.desktop.in \ - --replace "Name=Linux Steam Integration" "Name=Linux Steam Integration Settings" - ''; - - configurePhase = '' - # Configure 64bit things - meson build \ - -Dwith-shim=co-exist \ - -Dwith-frontend=true \ - -Dwith-steam-binary=${steam}/bin/steam \ - -Dwith-new-libcxx-abi=true \ - -Dwith-libressl-mode=native \ - --prefix / \ - --libexecdir lib \ - --libdir lib \ - --bindir bin - - # Configure 32bit things - CC="gcc -m32" CXX="g++ -m32" meson build32 \ - -Dwith-shim=none \ - -Dwith-libressl-mode=native \ - --prefix / \ - --libexecdir lib32 \ - --libdir lib32 - ''; - - buildPhase = '' - # Build 64bit things - ninja -C build - - # Build 32bit things - ninja -C build32 - ''; - - installPhase = '' - DESTDIR="$out" ninja -C build install - DESTDIR="$out" ninja -C build32 install - ''; - - meta = with stdenv.lib; { - description = "Steam wrapper to improve compability and performance"; - longDescription = '' - Linux Steam Integration is a helper system to make the Steam Client and - Steam games run better on Linux. In a nutshell, LSI automatically applies - various workarounds to get games working, and fixes long standing bugs in - both games and the client - ''; - homepage = "https://github.com/clearlinux/linux-steam-integration"; - license = licenses.lgpl21; - maintainers = [ maintainers.etu ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index b2d958c5e0..db36b43ea2 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.1.1"; - sha256 = "0cjj63333b7j4ydfq0h9yc6d2jvmyjd7n7zbd08yrf0rcibrj2k0"; - dataSha256 = "1r9fxz2j24q74a9injvbxbf2xk67fzabv616i676zw2cvgv9hn39"; + version = "5.2.0"; + sha256 = "0pj9hkxwc1vzng2khbixi79557sbawf6mqkzl589jciyqa7jqkv1"; + dataSha256 = "1kjz7x3xiqqnpyrd6339a139pbdxx31c4qpg8pmns410hsm8i358"; }; in { diff --git a/third_party/nixpkgs/pkgs/games/nottetris2/default.nix b/third_party/nixpkgs/pkgs/games/nottetris2/default.nix new file mode 100644 index 0000000000..dde35e4fe3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/nottetris2/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, zip, love_0_7, makeWrapper, makeDesktopItem }: + +let + pname = "nottetris2"; + version = "2.0"; + + desktopItem = makeDesktopItem { + name = "nottetris2"; + exec = pname; + comment = "It's like tetris, but it's not"; + desktopName = "nottetris2"; + genericName = "nottetris2"; + categories = "Game"; + }; + +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "Stabyourself"; + repo = pname; + rev = "v${version}"; + sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs"; + }; + + nativeBuildInputs = [ zip ]; + buildInputs = [ love_0_7 makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = + '' + mkdir -p $out/bin $out/share/games/lovegames $out/share/applications + zip -9 -r ${pname}.love ./* + mv ${pname}.love $out/share/games/lovegames/${pname}.love + makeWrapper ${love_0_7}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + description = "It's like Tetris, but it's not"; + platforms = platforms.linux; + license = licenses.wtfpl; + maintainers = with maintainers; [ yorickvp ]; + downloadPage = "https://stabyourself.net/nottetris2/"; + }; + +} diff --git a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix index 222aa68dba..59bdc69010 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix @@ -50,6 +50,12 @@ in openmw.overrideAttrs (oldAttrs: rec { "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" ]; + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95175 + patches = [ + ./tes3mp.patch + ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; + preConfigure = '' substituteInPlace files/version.in \ --subst-var-by OPENMW_VERSION_COMMITHASH ${compatHash} diff --git a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.patch b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.patch new file mode 100644 index 0000000000..c2a78f9db9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.patch @@ -0,0 +1,13 @@ +diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp +index be365cfb8..204dcdc7b 100644 +--- a/apps/openmw-mp/Script/Types.hpp ++++ b/apps/openmw-mp/Script/Types.hpp +@@ -105,7 +105,7 @@ struct ScriptFunctionPointer : public ScriptIdentity + void *addr; + #if (!defined(__clang__) && defined(__GNUC__)) + template +- constexpr ScriptFunctionPointer(Function addr) : ScriptIdentity(addr), addr((void*)(addr)) {} ++ constexpr ScriptFunctionPointer(Function addr) : ScriptIdentity(addr), addr(addr) {} + #else + template + constexpr ScriptFunctionPointer(Function addr) : ScriptIdentity(addr), addr(addr) {} diff --git a/third_party/nixpkgs/pkgs/games/pentobi/default.nix b/third_party/nixpkgs/pkgs/games/pentobi/default.nix index 61be5e834a..909f09a0b3 100644 --- a/third_party/nixpkgs/pkgs/games/pentobi/default.nix +++ b/third_party/nixpkgs/pkgs/games/pentobi/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "17.3"; + version = "18.0"; pname = "pentobi"; src = fetchurl { url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz"; - sha256 = "00c495i4vrji9hs7v8xr9gm8yqs97bfk2wzsayhps11hmbqzllx9"; + sha256 = "0dlvshywxijl0hrkl66szamcr77arh118f44ngr1ail8mg1fx1fy"; }; nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/games/supertux/default.nix b/third_party/nixpkgs/pkgs/games/supertux/default.nix index 25f36e9ff3..68b49fd551 100644 --- a/third_party/nixpkgs/pkgs/games/supertux/default.nix +++ b/third_party/nixpkgs/pkgs/games/supertux/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "supertux"; - version = "0.6.1.1"; + version = "0.6.2"; src = fetchurl { url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; - sha256 = "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f"; + sha256 = "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/third_party/nixpkgs/pkgs/games/taisei/0001-lto-fix.patch b/third_party/nixpkgs/pkgs/games/taisei/0001-lto-fix.patch new file mode 100644 index 0000000000..eed7b845f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/taisei/0001-lto-fix.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 80aa58d..c7e9d0a 100644 +--- a/meson.build ++++ b/meson.build +@@ -17,7 +17,7 @@ project('taisei', 'c', + # You may want to change these for a debug build dir + 'buildtype=release', + 'strip=true', +- 'b_lto=true', ++ 'b_lto=false', + 'b_ndebug=if-release', + ] + ) diff --git a/third_party/nixpkgs/pkgs/games/taisei/default.nix b/third_party/nixpkgs/pkgs/games/taisei/default.nix new file mode 100644 index 0000000000..c3b76b4980 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/taisei/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl +# Build depends +, docutils, meson, ninja, pkgconfig, python3 +# Runtime depends +, glfw, SDL2, SDL2_mixer +, freetype, libpng, libwebp, libzip, zlib +}: + +stdenv.mkDerivation rec { + pname = "taisei"; + version = "1.3"; + + src = fetchurl { + url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; + sha256 = "0fl41cbjr8h6gmhc27l44cfkcnhg5c10b4fcfvnfsbjii8gdwvjd"; + }; + + nativeBuildInputs = [ + docutils meson ninja pkgconfig python3 + ]; + + buildInputs = [ + glfw SDL2 SDL2_mixer + freetype libpng libwebp libzip zlib + ]; + + patches = [ ./0001-lto-fix.patch ]; + + preConfigure = '' + patchShebangs . + ''; + + meta = with stdenv.lib; { + description = "A free and open-source Touhou Project clone and fangame"; + longDescription = '' + Taisei is an open clone of the Tōhō Project series. Tōhō is a one-man + project of shoot-em-up games set in an isolated world full of Japanese + folklore. + ''; + homepage = https://taisei-project.org/; + license = [ licenses.mit licenses.cc-by-40 ]; + maintainers = [ maintainers.lambda-11235 ]; + platforms = platforms.all; + }; +} + diff --git a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix index dab0b653ee..d3198e2b35 100644 --- a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix @@ -1,36 +1,30 @@ -{ stdenv, lib, file, fetchurl, unzip }: +{ stdenv, lib, file, fetchurl, autoPatchelfHook, unzip }: stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.3.5.3"; - urlVersion = lib.replaceChars ["."] [""] version; + version = "1.4.0.4"; + urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { - url = "https://terraria.org/server/terraria-server-${urlVersion}.zip"; - sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; + url = "https://terraria.org/system/dedicated_servers/archives/000/000/038/original/terraria-server-${urlVersion}.zip"; + sha256 = "09zkadjd04gbx1yvwpqmm89viydwxqgixbqhbqncb94qb2z5gfxk"; }; buildInputs = [ file unzip ]; + nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' mkdir -p $out/bin cp -r Linux $out/ chmod +x "$out/Linux/TerrariaServer.bin.x86_64" ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer - # Fix "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. - find "$out" | while read filepath; do - if file "$filepath" | grep -q "ELF.*executable"; then - echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath" - patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath" - test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } - fi - done ''; meta = with lib; { - homepage = "http://terraria.org"; - description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; - platforms = ["x86_64-linux"]; + homepage = "https://terraria.org"; + description = + "Dedicated server for Terraria, a 2D action-adventure sandbox"; + platforms = [ "x86_64-linux" ]; license = licenses.unfree; }; } diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index a1420a0428..94b8407762 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200425154102/https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" ]; - sha256 = "1gcdzmqli7jycljm66mdssivb3lk223ih6zg0l3lyn7hj2gbkinm"; + sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix index 6959376061..d72af71f66 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "220"; + minorVersion = "221"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "0ddmq3lagk7f1wkgybckcci4sigcqn1gzafggnnqjzq2q8viww0c"; + sha256 = "1pqwa5qcrk0wgbyns6fkv7j3pn7byf216cixc3phhhgvfidgr8ww"; }; hardeningDisable = [ "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mednafen/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mednafen/default.nix index a8ab7e908f..e356e636c5 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mednafen/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mednafen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "0v3w0miyz86ihcir7ab82zjfklp550pk6g9xjxcx6mmvhp9dws8i"; + sha256 = "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix index a93f7e6aea..b73c6d351a 100644 --- a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , meson , ninja -, pkgconfig +, pkg-config , fetchpatch , platform-tools @@ -10,10 +10,10 @@ }: let - version = "1.13"; + version = "1.14"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "11gqsl2x18hgwdjajag9q8qdxqvdqr9m67zka22z7hnd3k569vjz"; + sha256 = "082n57a9lw39lfjxybgim09qf0id9m0rpfb3zmqng58fp2i1h6qx"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "1zc73l5vm4hca8niaa3y76kpk7i9vj89wv4gbxmf1yjmixb71hby"; + sha256 = "1w06gsvgjdbpb9lvvhpjwmysxjl0daiigjfh3cxfgz88447bgw7j"; }; # postPatch: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" ''; - nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ]; + nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; buildInputs = [ ffmpeg SDL2 ]; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 2c39ed599e..9cc093f222 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.62"; + name = "xlockmore-5.63"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0b05wgj4mpssy4hd7km5c48i454dfg45p11mfmsr7xjd2gnz5gqi"; + sha256 = "1qhbl6axffbajxzwg4xyf52hdxk5xvg63gxk0s9z8g0fdfj242wr"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/solfege/css.patch b/third_party/nixpkgs/pkgs/misc/solfege/css.patch new file mode 100644 index 0000000000..40273df013 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/solfege/css.patch @@ -0,0 +1,33 @@ +Fix theme parsing errors: https://savannah.gnu.org/bugs/index.php?53107 + +--- a/solfege.css ++++ b/solfege.css +@@ -7,19 +7,19 @@ +-#ProgressionNameLabel, #Feedback { font: "Sans 18" } +-#ProgressionLabelNumber { font: "Sans 12" } +-#BoldText { font: Bold } ++#ProgressionNameLabel, #Feedback { font: 18px Sans } ++#ProgressionLabelNumber { font: 12px Sans } ++#BoldText { font: 12px Sans Bold } + +-#StatisticsH1, #Heading1 { font: Sans 18 } +-#StatisticsH2, #Heading2 { font: Sans 14 } ++#StatisticsH1, #Heading1 { font: 18px Sans } ++#StatisticsH2, #Heading2 { font: 14px Sans } + +-#BpmInactiveLabel { font: Sans 12 } +-#BpmActiveLabel { font: Sans Bold 12 } ++#BpmInactiveLabel { font: 12px Sans } ++#BpmActiveLabel { font: 12px Sans Bold } + + #DIALOGWARNING2 { background: red; } + #DIALOGWARNING { background: yellow; } + + #DEBUGWARNING { + background: red; +- font: Sans Bold 24; ++ font: 24px Sans Bold; + } + +-#FlashBarLabel { font: Sans 16 } ++#FlashBarLabel { font: 16px Sans } diff --git a/third_party/nixpkgs/pkgs/misc/solfege/default.nix b/third_party/nixpkgs/pkgs/misc/solfege/default.nix index aea4da3eae..05e13f3c9a 100644 --- a/third_party/nixpkgs/pkgs/misc/solfege/default.nix +++ b/third_party/nixpkgs/pkgs/misc/solfege/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo -, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123 -, alsaUtils, vorbis-tools, csound, lilypond -, wrapGAppsHook +{ lib, fetchurl, gettext, pkgconfig, texinfo, wrapGAppsHook +, buildPythonApplication, pycairo, pygobject3 +, gobject-introspection, gtk3, librsvg +, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond }: -pythonPackages.buildPythonApplication rec { - name = "solfege-3.22.2"; +buildPythonApplication rec { + name = "solfege-3.23.4"; src = fetchurl { url = "mirror://sourceforge/solfege/${name}.tar.gz"; - sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; + sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; }; - nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ]; - buildInputs = [ librsvg ]; - propagatedBuildInputs = [ pythonPackages.pygtk ]; + patches = [ + ./css.patch + ./menubar.patch + ./webbrowser.patch + ]; + + nativeBuildInputs = [ gettext pkgconfig texinfo wrapGAppsHook ]; + buildInputs = [ gobject-introspection gtk3 librsvg ]; + propagatedBuildInputs = [ pycairo pygobject3 ]; preBuild = '' sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ @@ -30,11 +36,11 @@ pythonPackages.buildPythonApplication rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ear training program"; homepage = "http://www.solfege.org/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor orivej ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/solfege/menubar.patch b/third_party/nixpkgs/pkgs/misc/solfege/menubar.patch new file mode 100644 index 0000000000..36d3944af6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/solfege/menubar.patch @@ -0,0 +1,7 @@ +Fix https://savannah.gnu.org/bugs/index.php?53109 + +--- a/solfege/mainwin.py ++++ b/solfege/mainwin.py +@@ -270,1 +270,1 @@ +- hdlbox = Gtk.HandleBox() ++ hdlbox = Gtk.HBox() diff --git a/third_party/nixpkgs/pkgs/misc/solfege/webbrowser.patch b/third_party/nixpkgs/pkgs/misc/solfege/webbrowser.patch new file mode 100644 index 0000000000..2c9b77d0b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/solfege/webbrowser.patch @@ -0,0 +1,8 @@ +Fix startup. + +--- a/solfege/mainwin.py ++++ b/solfege/mainwin.py +@@ -27,2 +27,3 @@ import textwrap + try: ++ webbrowser.register_standard_browsers() + i = webbrowser._tryorder.index("x-www-browser") diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index f0d93572de..dd105b8e74 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -53,24 +53,24 @@ let alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist-vim"; - version = "2020-04-08"; + version = "2020-04-27"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "9fc2594deea196897997c31e68056b7977f13495"; - sha256 = "1mnghdw3yhqh1lzjqfrmwrvnx391dkayfzkgcpx7sx01hnvqc9ib"; + rev = "3d370d163a48bdeccea4be541686cce67a52b996"; + sha256 = "0svciz70yccaaifq1ivb7f0cwfjssmrkm7fbpjlylslx6wjjfc1i"; }; meta.homepage = "https://github.com/slashmili/alchemist.vim/"; }; ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-04-21"; + version = "2020-05-22"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "36e5337e30095afb10d02ef2ae362c8d6055e70d"; - sha256 = "0mcc2d0a4fiv2a1q8z778jzjj7i71v64m2zswsvpdym062b65fk3"; + rev = "7265ceb6d050d1a4642741d248f11e4f2abd37e1"; + sha256 = "172ip0wbrmrwxhv5nvpgb0g982w9smyzlwg16gphrjiwnxllj1w7"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-04-08"; + version = "2020-05-14"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "ad76abd6bccfa1a5195d20f7964c6393fe1a9524"; - sha256 = "098jnybc11cxv2q8396hx9r814i5793y7a9kdl4ambpbvhm86vad"; + rev = "fa0192fe508000d904e79d17706471732075c653"; + sha256 = "12nhiz5hnbi4l5ksb26xhj47r5g5z68zncgdlmqkkfqzqw1cj9c3"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -269,12 +269,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-02-14"; + version = "2020-05-24"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "55d0495ff03260d82a5c80365cb754871ce35460"; - sha256 = "0xi2g6x5lf8r36c5ld8pvz5c7n7jx3d6whwbk4gibmz6hlfrslwr"; + rev = "b2e7a69945c2b452598a1d4fa25d8fc94aa8b02c"; + sha256 = "03fx03pdw4bwqyd4jyk0ixb5fhv900x0lg615ig0i4qg9nqjnc8n"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -293,12 +293,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-04-20"; + version = "2020-05-12"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "3c6b7d2448bd32bf998ae403c9c15d06ea641b36"; - sha256 = "06ym0qhcvd9ajlj6cd4y391bgfiwclzhb3cvrbv723j8amdv1y1q"; + rev = "2c6b9f2d9a2b4d172adde4c393b1a04c59a0b471"; + sha256 = "0137vs50xmdggc2nqclp6i7i640nkj31czm8cmqx19504b7hy8vw"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; @@ -329,12 +329,12 @@ let clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2018-09-19"; + version = "2020-05-06"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f"; - sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc"; + rev = "10e5102af5d1b16ba7aa3fb51d67153041f82ed7"; + sha256 = "0crynvmdp9a5rws5hfnsn19kxqviyp29n8fz40wq7k1g5vrhvdl7"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -377,60 +377,60 @@ let coc-emmet = buildVimPluginFrom2Nix { pname = "coc-emmet"; - version = "2019-12-03"; + version = "2020-05-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-emmet"; - rev = "1e65237f65b94bd5f9376023f557a26c14c9d35a"; - sha256 = "16f3gdnprxw939zwdy7lzksj1qwlwfs174vk0nzf1d8yb04a7y2g"; + rev = "5424c10fb8c451059cdcf04b10aa7c28178ce5b0"; + sha256 = "15zfmsy7ymcp3js3y8f6wvwj3r0p9a45v1zvq07ilwri91z6nkrl"; }; meta.homepage = "https://github.com/neoclide/coc-emmet/"; }; coc-eslint = buildVimPluginFrom2Nix { pname = "coc-eslint"; - version = "2020-02-10"; + version = "2020-05-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-eslint"; - rev = "2f9de5cf232223f886b5e9711b0e9a5260f65db9"; - sha256 = "0q1sizzj6ac6gzfp4s7ka600pa9f2dhr17v14j98cdlmyp6pyfhz"; + rev = "eed42192dab175bbf249e21c18c85cbd5afdd92a"; + sha256 = "1a9csiyj7abksar917acfjgypmc28rcfsqga0p1550mjxvkjr2ia"; }; meta.homepage = "https://github.com/neoclide/coc-eslint/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-04-19"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "82e846d193856660be716c8b89e668aead06d665"; - sha256 = "0rpxjxw51mks6jq6akw5sgl77px038gdgqa4yhpmlpidb679apg2"; + rev = "ba8cf9afc8aae3ea4086d89a01bd414d42a6b8bc"; + sha256 = "13dv08kpp3cxqgikznyxkl7nsjzxn97aklk6k6s19cw3b5al15pn"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-04-18"; + version = "2020-05-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "623a5351c8eca639e3cffee38f941426f2df2422"; - sha256 = "1v5q9775602drj7dr1dhshd22jbz6kxmkacqhbnddjpw2drdfzv1"; + rev = "b45372104d2234612f89658570887c55e6efea83"; + sha256 = "1p7ah0dr31h0pllx00ms46fd5pmkp604zlkk08z40w54hzhr5qhh"; }; meta.homepage = "https://github.com/neoclide/coc-git/"; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2020-03-10"; + version = "2020-05-25"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "587501a4445c1edb5d5e10927c5f8274f0e0ea52"; - sha256 = "16cgdxn93zf0q5d80xb9c6khzgx02qvsjdaw3kf07qqsmdjvy4gj"; + rev = "d9756fd65dc1d6740e797fa22d3f6f4fdb2b00d5"; + sha256 = "14qc9ny12y52rbxn0gcwh6cpqc2zpwgb4jlla5p72w9pfh9gfh6z"; }; meta.homepage = "https://github.com/josa42/coc-go/"; }; @@ -485,48 +485,48 @@ let coc-jest = buildVimPluginFrom2Nix { pname = "coc-jest"; - version = "2020-04-09"; + version = "2020-05-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-jest"; - rev = "3fac1864ef1af87ee096f0ab6514a4b890363231"; - sha256 = "1z2sbzr84gh935553g6bfkpx7s4i37s200a1s9dqay9cq92jh7hy"; + rev = "431471caa9011868327fff0f9f7e0a944b7ca33b"; + sha256 = "0vcri3kp8njsp4zgl74vc6ydhxq5spzx6pm798jh2lvrid2byvg9"; }; meta.homepage = "https://github.com/neoclide/coc-jest/"; }; coc-json = buildVimPluginFrom2Nix { pname = "coc-json"; - version = "2020-03-13"; + version = "2020-05-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-json"; - rev = "33ca64c00ee5c0d759a6f537b23971476b85f8e3"; - sha256 = "07mblxxvl95kfy0wwm5r75j6y3v8fvyh6cwiza5rg1z9dlw1xddw"; + rev = "66b482dbc8008b9a111e6141aa2e63baa16fb2d4"; + sha256 = "0ixqk417ba1yz7lnjkir5h9h8qm5jc9sh2190vmddxr8wgxhjhbb"; }; meta.homepage = "https://github.com/neoclide/coc-json/"; }; coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2020-04-18"; + version = "2020-04-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "f68a09974d8bd9a4474bfc7845c2e628919bb619"; - sha256 = "1fcz7m1pbf69gnys9j777w77pxwsiwi1jdlcnb61c57xdrdcqr5d"; + rev = "aaa16caf94c50e7c301cb3848e988639cf0599a3"; + sha256 = "1m8i8r7fl1csnx6f4mrbaf7ncng8yyfnprqax0zyiryc5i4nqjbg"; }; meta.homepage = "https://github.com/neoclide/coc-lists/"; }; coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-04-22"; + version = "2020-05-25"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "b35bb16122d8771c9936f1203d0c712d45017f13"; - sha256 = "1w9vgxai421j3qbzbm42hq3fyzwf2a9n89y10vj9vhir0q0j8az0"; + rev = "99431ec2eb4e5a9a0309d63bd4167e5af2f1d781"; + sha256 = "13qqfhwv745svf5672hm7m4n3dk9c15py5l0znygn5a6gs5rjzzm"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -557,24 +557,24 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2020-04-13"; + version = "2020-05-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "771bb16700e8123d7a114ff9c02a8c3ba1641108"; - sha256 = "09srgkg1sqdh01ix767ssi4mp4p76g9am4pg8fzqdj3pdjyr2yk2"; + rev = "1fbfe34dfce455111e3eae939fc8a37d2fd1ec42"; + sha256 = "170zhsq73shykxszwwcqakrnl5cawf9kkgc1mqy0l0jqmw3jk8qy"; }; meta.homepage = "https://github.com/neoclide/coc-prettier/"; }; coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2020-04-24"; + version = "2020-05-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "968aec39f74c6f80e6c9c3c0fed51b6113a1a35a"; - sha256 = "135z48idr8r7604ymiqdsml9z6d3swaja89697znszigpy05nz11"; + rev = "c4b450a62020ff37b27ea0b8d05de3e3c53344c6"; + sha256 = "1hk29c55nk21avhrk9i8dppcid62jnr1y2b9lml14c4y01yr4mpp"; }; meta.homepage = "https://github.com/neoclide/coc-python/"; }; @@ -593,25 +593,26 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2020-04-23"; + version = "2020-05-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "142353e2f71cb6c1b235db0cf430ca53e211613b"; - sha256 = "07gkspvh5l25vyny5waiw0y3fm5a8qbrml13r7llgp4lqzzh96bd"; + rev = "166fd05342d026759246594eb5fd8d0bc240505d"; + sha256 = "17x0h2g5791z5xmhl7kps09b9zrac2yni3r59rrx96rry50fkca5"; }; meta.homepage = "https://github.com/neoclide/coc-rls/"; }; coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-04-24"; + version = "2020-05-27"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "1dcdf6768520bff29921c50ef904478cbdfe0fb8"; - sha256 = "1p6hyixx9bjpyy42g2w4bnxwv9hafs5ppsx1fq8gndnq3nsjcyl3"; + rev = "95fe45bb82f88a5da5461a2925c7daac1ff24155"; + sha256 = "1zczdz07fmcd7i05bz99m3a90v1dnbf4mjbh1iha0h2kyj0fj0sd"; }; + meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; coc-smartf = buildVimPluginFrom2Nix { @@ -628,12 +629,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-04-23"; + version = "2020-05-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "cad80795d4abcbbd2aa6da462af1087e9134b4eb"; - sha256 = "04wk7x148dcw3rx4fh3c7c80qillq0bf9vfdkc9l8xaglk0xh73h"; + rev = "f5e7a3575a04ee9cacd659380d0d0118fa4bb5cd"; + sha256 = "0zrllqqdgf1ckzgaxhk7459cbkv7x1vkfgwsvilcjspxaww1s1bv"; }; meta.homepage = "https://github.com/neoclide/coc-snippets/"; }; @@ -652,12 +653,12 @@ let coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-03-16"; + version = "2020-05-15"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "4a8195f5f22d9d7b42998b7e3b846aa2aef7de52"; - sha256 = "1w8b9icwdam8ljprc8avs5pwdiwmx3j1jxsg03d1lvis9w5xm0cd"; + rev = "bc9802c667aac992fab2f47b0da096c28dca0dfd"; + sha256 = "1fsjf07w0z9l2zra46krpg1d6qxg51niz9zmxas66si90qb2j3d7"; }; meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; @@ -712,24 +713,24 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-04-18"; + version = "2020-05-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "1f46ed360e0cae124add5ff9c4a0718fccb66acb"; - sha256 = "1fccyar9qmydj1ii7ixiwcnfrpsvk0q0xz3q4vr3mz34lmcj74rw"; + rev = "bac002caef532d6dc58c10a2885eeed463082d4f"; + sha256 = "1b10bdlqbj82rragymka691fz0phgk6v63diijkyb1ia302q1613"; }; meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2020-03-27"; + version = "2020-05-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "314df846b6bc2be9b7c808ed949a1fd693bba402"; - sha256 = "14fmyrfmyk66wbfnbb2iwy7azjk10d8gyrv5p950aagmv8shif52"; + rev = "679eb834ac8c16290a0cc50ab7c222e1144644f7"; + sha256 = "1jkz0qixrp7vzpv9l2ls0yl5kyqzi3bbvydpifdb858j8jqbk4dq"; }; meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; @@ -784,12 +785,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-04-23"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "0d4f02555e5aaecbd8efef47a70ba2f2c6412d1f"; - sha256 = "0129gr3hsagr1lzngvbgs4bnvj92izxavval0zyxgh68w3vlak42"; + rev = "60cd2a0935319ec7150006ce6457a9f10a5f04c2"; + sha256 = "1wanp845yv07gkyvl4kv7bd1l46mz8wy0mw7bmcxi4d6qqfjpdrv"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -820,12 +821,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2019-12-01"; + version = "2020-05-09"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "9bdc2e1585419640129a48c646bbf8459f96951b"; - sha256 = "0iim0lhib6fiainyb48ibl2qzgv8cmn9yinmd1k6i2y5y26wlhfy"; + rev = "9c7f81208a32fe4d26096d0d268ac6e802d945fd"; + sha256 = "0jmwhlcycb1hp65d2g54mdd7xmpmvr33lm0130c9yk16mv2ia65i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -833,12 +834,12 @@ let committia-vim = buildVimPluginFrom2Nix { pname = "committia-vim"; - version = "2018-10-23"; + version = "2020-05-14"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "d367190c7ffe95f4ac5d30b2e9da4cd9898579b9"; - sha256 = "1yqsdy1mxc775qcrcl1yi930m2q6364mgjdj06vwnph1rg98w0ql"; + rev = "2cded48477a5e308c77a0d289cc9b540669b701f"; + sha256 = "1g6ykdh7d16q6nvpvmxx4ss8w7cisx5r8qmbrrvhpwmbb3894pxp"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; @@ -855,14 +856,26 @@ let meta.homepage = "https://github.com/chikatoike/concealedyank.vim/"; }; + conjure = buildVimPluginFrom2Nix { + pname = "conjure"; + version = "2020-05-26"; + src = fetchFromGitHub { + owner = "Olical"; + repo = "conjure"; + rev = "5cb5e37913fa6fe410ee150f5cd8c75e34b060c4"; + sha256 = "1h23qf0i97lcng1llc0q80jizsv7hkpnyvaj5dr3kfbwi84nfkmp"; + }; + meta.homepage = "https://github.com/Olical/conjure/"; + }; + context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2020-03-13"; + version = "2020-04-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "f200fe69939089da9e61bd9a3ff75b4ef7adc708"; - sha256 = "06pclan83yww5qf26fmqhby8iks0rzlxgpk254vxmkihbypvpa51"; + rev = "a96f74ac35b77ebe2c5788ca31e66d87ab239adb"; + sha256 = "1pgb86cpv4649qnxfw4280sqghldm66s572pg610giqjxda4a52s"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -905,12 +918,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-04-20"; + version = "2020-05-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "22e07247161c72adc029497b77d1b5d91b6b184b"; - sha256 = "1p6zsqgbs9qr7dznq8nls8n405jjd0bsyzjrns9h8jxk6sf7n56j"; + rev = "361e9c1190c53d78446743be308709bb1c253981"; + sha256 = "104qgkcvnvff59ydk18wwlsvsyw6l3nh6x49f1j2rpfmnlclamcs"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -953,24 +966,24 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-02-08"; + version = "2020-05-26"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "585143acbe15f362852d78bd050baff3c12902d7"; - sha256 = "0ijkzlb08sc47cax4f328hlk68nscx5wdzhihpj106vrnfyrpyx3"; + rev = "d93d97813dc839ef0782302a0debd7c4877f09f3"; + sha256 = "0lgw839xnmdsbaiflqp3i2liqhg4lp01iaz0jv380kbw9g6k666k"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-03-31"; + version = "2020-05-20"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "4375ab9cc1fe0077c36a9aba5dd7145ce4a2fa6f"; - sha256 = "03cl55s4f2qa8hwag2w38gfc7mpp6jhy0vx7qsmkn24cqk1jvv2k"; + rev = "70bc2f27d579d24e4973aea19df2fdffb1a8c95d"; + sha256 = "01agwm0scg7g5l04djxmj22rd5rd3di1z9g89hp2lr3rqp8ipdrn"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1001,12 +1014,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-04-20"; + version = "2020-05-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "1fb1d5f9b09ff6da815dfcdf3dfcb277605b9650"; - sha256 = "0vih85hb4igy200lml7gvaiifkgydjqqjlh7ymcvg3sx5l6psapy"; + rev = "56e0c4fd9ce28dce416420a0639792b0fc42115f"; + sha256 = "1nliphg9fjyga8p5b3flzqn7znxyazqakpzr03czzdm0vr96z9r1"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1049,12 +1062,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-04-21"; + version = "2020-05-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "609c85797a5f6acc2e2357cf56e7f6c78c561145"; - sha256 = "0rx0nvsyzj1wl7p30g769cidspkq3xpvzpdhz94qfsczdm68yhi0"; + rev = "09c22ad10f4adaca9845db106b7a46a80dd6f6ca"; + sha256 = "1prkahf7793bi4zr60vmjsky33bzn69wjgsfkdhvgjla8kyiwf6v"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1184,12 +1197,12 @@ let deoplete-khard = buildVimPluginFrom2Nix { pname = "deoplete-khard"; - version = "2019-09-02"; + version = "2020-04-30"; src = fetchFromGitHub { owner = "nicoe"; repo = "deoplete-khard"; - rev = "27221723a3bb8e480ff8cbe7f4be9ff38c076bf7"; - sha256 = "0g7sysm5lb8fpgagfg4565fz4rn16djdc4m2213ryq1s3crx40gw"; + rev = "7f81116b1c68d49f189a2aca62a31729fb7bb0e7"; + sha256 = "0jnpv0lpli9qjqwkzfl66fyhywa6q586q44d26q3h7sllxpz0066"; }; meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; @@ -1280,12 +1293,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-04-15"; + version = "2020-05-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "bbec852adee45a1500fa817a3c17889dc328cad0"; - sha256 = "159ki94lb3n1kkmnd4cbmyc96xbpni45p7fgsml8x314j6iiihgk"; + rev = "8aef99a951686488c03070d1cf1a2155837f5f1b"; + sha256 = "0rhni3hix26flls9i1ajwnpfdynkvqxll5rhi1256pvhy2nizamq"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1340,12 +1353,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-04-07"; + version = "2020-05-26"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "8aff78a03357bf573abcec407a543762f281b7d3"; - sha256 = "015sfz2j0mfnfpm6zf8jnh0lm8943cpccjlbj7ks1dsvs36m056i"; + rev = "0818c7eb7ccd1cfb687161e68e55355c34694d28"; + sha256 = "1qiljz47b59sd3gyvr7l0kmb13hbi5204nnhjnpj8bd98kf676w7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -1365,12 +1378,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2020-03-07"; + version = "2020-05-04"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "c7643e5b616430f766528b225528a5228adb43df"; - sha256 = "0wjxx648lp11nqzgrdcbqikjs85knpvk594b9l25hadhd5awgahv"; + rev = "76285f8ec456a8c0d01ea0fa9d0b757c7eb0bab3"; + sha256 = "1qrqg4kr55hisi5f4qlkj1zvvlgfpby9pyynlb669d8414013f67"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -1438,12 +1451,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2020-02-09"; + version = "2020-05-15"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "24633d3047eb93013743b28b0ea735783c7850d9"; - sha256 = "06c3x3fqks30rzkj7z28qsgx9fcghz86ajc0cx3aai69xhgdipb5"; + rev = "6218891a01418377c67b12ad57046ec78958ced2"; + sha256 = "1sjia8bk9gmwymhdrc3bksax4msincychd96ar5bdmifr6p1klg4"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; @@ -1509,6 +1522,18 @@ let meta.homepage = "https://github.com/megaannum/forms/"; }; + fruzzy = buildVimPluginFrom2Nix { + pname = "fruzzy"; + version = "2019-10-28"; + src = fetchFromGitHub { + owner = "raghur"; + repo = "fruzzy"; + rev = "b312ae79db98cf6939c8319f2511efa06889e8e3"; + sha256 = "01iisbawq2w7yw866qvv109amnvyaymzyz9nqal3cjrrcwk6mmdk"; + }; + meta.homepage = "https://github.com/raghur/fruzzy/"; + }; + fugitive-gitlab-vim = buildVimPluginFrom2Nix { pname = "fugitive-gitlab-vim"; version = "2019-10-24"; @@ -1523,12 +1548,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-04-09"; + version = "2020-05-23"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "f86ef1bce602713fe0b5b68f4bdca8c6943ecb59"; - sha256 = "0h3mlc4lvnlzg7pfrr09vrfn93lglzfp5ca6bl4jhsi63xw7x3ad"; + rev = "7a655179a43cd431862a2bf5d297d9e55fd3f814"; + sha256 = "1ivxkg60g3jlmd14ndwfqdkzm74naddfghafpv622dainv4qw20j"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1559,12 +1584,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-04-13"; + version = "2020-05-17"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "bcbb1c9182fc1940d5e55bb716dc7621ab7c36bc"; - sha256 = "1my9khiq1ssqkp0nixrzly0xlyla6bzdl3x9ky6687848cpriaz0"; + rev = "64f693f6581c3acdee71897eaba7c4e793eaa946"; + sha256 = "194njs7nfdmpnv1bkadamvicp735834kq0ijha5s41i492hb589i"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1631,12 +1656,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2020-02-24"; + version = "2020-05-23"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "f5711c15480b83378bde13306fa997057c0c81cd"; - sha256 = "0vx289a7av31dxm58c6kmfdnsrwnq1rzj5rwci2pqjdac8ds2qm0"; + rev = "933b6cc35a0f180ff488ef20c7b534c9c3b6701a"; + sha256 = "0w10hcz66dgilx6fv07bb3zsf5c0x9gv4vhp15c5fp2rzwxi10bn"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1655,12 +1680,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2020-01-27"; + version = "2020-05-22"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "72dc64df998355b41a75ebfa32adfd08ed5c5819"; - sha256 = "01g4rnsh2n691n9a6gqhyzivr4mzlgz3i2mwb7vxpkp61yf755bb"; + rev = "61d877d23caaad9009d672f90fe2ab576ab93d2d"; + sha256 = "00h4d6jah0fdr5m8x9c1gmmm9wskplixnvbbalfbbpc599xhgj83"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -1703,12 +1728,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-04-23"; + version = "2020-05-15"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "acf6696e14fd8cfa2ed338076a7c3a68fad42486"; - sha256 = "1hy9n37nkkax6qdcg23a522bz26r8b23w9kj570qml9v3ck4ihqm"; + rev = "bdd630fb15dca7793b04deaf1c1fb3a6af33ceae"; + sha256 = "045jm4gz8gqv7mgz04l3q42mj1ji9qv99n915zq8fgzfskc0pixj"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -1884,12 +1909,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-04-24"; + version = "2020-05-21"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "c97e5cfb6ef20b725f859af694bec9c6a3a44145"; - sha256 = "1349v5lhc4dg7ir42jj157jyf29bm7pj73h64n2501ddqdkb1zqd"; + rev = "2d0b6e4018d6cc01b96ab326ff6495876200866d"; + sha256 = "1ijmxxw63mraa5afddahfvwbh9acrf11q7g6hf32k6923rfccrnq"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -1992,72 +2017,72 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-04-13"; + version = "2020-05-12"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "505b5b6350671e978f8e7392e9b0dadbd98752a7"; - sha256 = "18g4hpdkhj747r7ga153nk8qc5rbnxx1avx1n2h1xsj5m75fdhjx"; + rev = "8dbdb135f3704790f9e66a141d2785d4b65c238d"; + sha256 = "0phfqg6ax79vsz1sy6pvjflz1929x58k7nifiqki9bzp2m6knls9"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-03-02"; + version = "2020-05-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "dc91bb1e8ef45a0810d9c1ad412863977c8c4baf"; - sha256 = "1yjmykn92i54cajr5wrj7m0wvaigy106c3hm8ks30xn4zm970x03"; + rev = "2f70a30a342969e8cf4e21c965d523ff456173a9"; + sha256 = "0qpiqrcr9azamvm8mzcfb3fbp7rxgbhi2bdc926i9a7psazgmyfl"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-03-06"; + version = "2020-05-18"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "3a8383f2efbd7496c17a70bf4593773f6149435f"; - sha256 = "0c6gnksyjyvsxqbp13q8bp9j4cg9x9m0kzrkx01p9k6wq297kpd9"; + rev = "03673b75c2b2ba8d25c1323804725a6eb9bbb995"; + sha256 = "0nk3s916k7vv9cgpf4rxf5qc4bmsf74mxa59fdi8wlzda0m5dyhk"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2020-01-18"; + version = "2020-04-30"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "a1931d473d6600ccf7e426158b79c9df29463dda"; - sha256 = "1zmwi4b8sbl3zpzp8hlz7j3gg4p9628s0174pcd2n6mdkfh235g5"; + rev = "23352556fdaa067209fa22df424f1b88ab370f6a"; + sha256 = "1cz1pcz6qxddpalymj2p19clnwsj568zlvbyg7mai0vxx6cv7a9w"; }; meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-02-14"; + version = "2020-05-08"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "17683bc5802de7f295f2583a15461e2bc662f98b"; - sha256 = "1rlamxwk2gm9pyxl9vym9w6rhgimzqa2hjghy3qdqwvif6w8ir6l"; + rev = "ef674de5ca1c963ad12f04631ea58f90dbbc70da"; + sha256 = "0kdla3gmkyk77vqz6hj41alq3jmrkml7836fhsd3hb50f6wwvk11"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-04-06"; + version = "2020-05-18"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "b8976d2e549b417e5d1c1594fb9034b749976cc0"; - sha256 = "1w86bg63qvigdva1g8w4lba63ghlsxfbjb0rqsxyxg6w7m9k6lhd"; + rev = "c172131e0369672bc1b9454a2aec6d532d350dcc"; + sha256 = "04nxldbb885n11vwz61c1r4h65y26six5cs9invbz27h4pgyrvna"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2280,12 +2305,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-04-24"; + version = "2020-05-17"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "7af08e5a80c095a836d3f6762b991c6f9c4f2f2f"; - sha256 = "17llh2jh2igkbjmnbii54g4x9g57y6xflh8d40wim980pb3jr57s"; + rev = "a3561bf2032a162bc9f53d96fa4e5a2ada98854c"; + sha256 = "15lsxwf4f1mg5h716zikwv1hbb0i41d24hrvyrqhwqlnqbwizlbi"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2328,24 +2353,24 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-03-25"; + version = "2020-05-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "2e72985f712f0d5cb707beba151555a1f0003630"; - sha256 = "1lvm37q9zq4a077f2zm9dfp8zfg5d3853bmlih6sc8d6i477kcmb"; + rev = "66abcb7de82a45be6ba8b669d5e7bdca51deafdd"; + sha256 = "0a0irlhj1skkwy1897q6dbg9zh8v6b0sx12dsgj3z37rvplfw78y"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-04-02"; + version = "2020-05-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "3aaf5e763410f57916227da407fd90726e19a612"; - sha256 = "0zkw2q2s7756p4xgf49v4lj8lrzw35x81h1wzia7d9k92d7ivwca"; + rev = "70f855d93c4bc727873c42111432660cf6929cdc"; + sha256 = "1gh7vh3qc9k8xhpmcvhdn5nfff81y7hkfky0mgs75a97mkd8qhnz"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2364,12 +2389,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-04-23"; + version = "2020-04-29"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "48900bd6a008120aeb33e3807f1d2c18985ad210"; - sha256 = "1x788nrrxaa12cqsdi2gdx2haxji3v4rahpxjq309kd5s40m9z2j"; + rev = "667f02bc417d2a4669502d1fc6876684882d8ba9"; + sha256 = "0xa4w935hfbs8nqw4aqw7ihasw4rlsqjx2i92pi1x5w8d40jnws1"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2424,12 +2449,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-04-15"; + version = "2020-05-26"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "29a321d061032df5b2ec347b6b4b778f665305a6"; - sha256 = "08gfmpikxz6j9hymf64fbxd1630x3gvkq72d2dmdfr9an2xxh6zm"; + rev = "052b1f00a0ef14b0019f4d0cda9906ba93f9a0d6"; + sha256 = "1wn0gf8cqhmv23llhydvkhd638b3n5ya8fa6r74gm40f9h3qcp85"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2508,12 +2533,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-03-17"; + version = "2020-05-20"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "9ea1cd2cd110a8efa40dc893036596b39f979a7a"; - sha256 = "10qcs59r27fkzk0pg90gywbrz7y7b4hvavbws5kx6fjx3h2mbfsh"; + rev = "67c37060deba03d123c4654c1b3da426c92d6f61"; + sha256 = "0rsgpnl20pxfqcwd5gr89mkqv3im4s7v4d1cvxvi9wj0ix06pxm1"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -2532,12 +2557,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-04-24"; + version = "2020-05-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "d1507239df1d9f2758f1ad75634046c4d024cfd8"; - sha256 = "00smhjk73xwzmxqjwqi1srmfbirl065gii65gj1lhfi6vha7h9k1"; + rev = "54f4f823a27ffa8f9e6c308d550888f3ae21373e"; + sha256 = "19v8gwq6ym0ipia039x6xw00xlwrhrmm1bw8s5v5d6j1wl1mbcmz"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -2580,12 +2605,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2019-08-17"; + version = "2020-05-06"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e"; - sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql"; + rev = "970abdf26b399100cbb59c6b6e693c4ff877c59d"; + sha256 = "1v34n0cz7jkx0wlbl6kv693qgifs0frcw4mv32ll36pmqfyb4m0h"; }; meta.homepage = "https://github.com/sonph/onehalf/"; }; @@ -2604,12 +2629,12 @@ let open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser-vim"; - version = "2020-03-06"; + version = "2020-05-20"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "57b894d0aa5f800220d25fdeeccf28d8a7f6ac89"; - sha256 = "0q87hna0irl431kmd4knblzkahrmw3mrnvw1cq19indfky85516v"; + rev = "d6f1784685abdd86500fdb5fa2fbaf2aab833f18"; + sha256 = "1akgsq1v9v5klm995y09zmka0hbfsa0gr44gyp2nvqi9ggfadp0k"; }; meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; @@ -2676,12 +2701,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2020-03-30"; + version = "2020-05-09"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "25070c47cae8c7a9d62c8c09a1339e761448fbc4"; - sha256 = "1x2a1wnxs2qmv2zqgq2bmwskdp1i4ga0yjxjyziyr96p48m7dcjp"; + rev = "8dddc45f3f7ba4f0319a14e6f0167d97a703ac55"; + sha256 = "1fkls8qwkdgr5fyaml9rlrjzrbwav2zyp2xyfdyg4h6pbgchvkbl"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -2760,12 +2785,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-04-04"; + version = "2020-05-09"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "ac80025b868bb6e52b9dda893246ee5f992612de"; - sha256 = "1pvw8d53dgm580r9n2qcx0w56g4kanvd00ny6c6l71hxw9lixnlb"; + rev = "95578ca8eef44fcdba5e144b78604018590c6cef"; + sha256 = "1h5kc2wffvaljdvggp2s74jkd7z88y2r5g1flqlgda2x1ihlhavm"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -2796,12 +2821,12 @@ let rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2019-10-09"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "c876f4bc6e737241d53669415f88cb5f2afd8ad9"; - sha256 = "1kmgm91q507qv9bvg37dn0lddzb8gwkmslajampnfjyfhbs0shgz"; + rev = "4d15633cdaf61602e1d9fd216a77fc02e0881b2d"; + sha256 = "168mbdf2h3zhkqrdyyhh0pbkjdvxwida80rdwk8ml97mxxii8ziw"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -2928,12 +2953,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-04-20"; + version = "2020-05-13"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "2b916c8c8b3975988c13460918b46115f6a06802"; - sha256 = "06a9liz3a7fyjcd7phpfzrpqnjjzm5ai3bb41wh4hdc5ic8lgrij"; + rev = "953b10061f595496b35aec84b75c413ee5751a23"; + sha256 = "1abacayriz439lj4r3s1x92pp3wwxqav3kqsanxq9k6f6p2b2fyb"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3060,12 +3085,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-03-31"; + version = "2020-05-14"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "58fc865f83b600ee8906fe35d02749dec6659607"; - sha256 = "0rv9a6gzn5q2ajsyfvsrybn7hyskckfa7wad4jr8xaylccn5r7x7"; + rev = "23c7a3948cd1861150346762a002dc7fa196c616"; + sha256 = "1sbc9ivczkyfylhk1n4sm2sqzp8vddw03k0xb6z8k475n5vm8mvq"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; @@ -3132,12 +3157,13 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-04-20"; + version = "2020-05-16"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "62d42e1ac5dcf8f3c70bd344d31300ee39d0e580"; - sha256 = "1d0ik668lhkrd972brh99lizrfl249srj6y8i1ag4ykr99nmydqg"; + rev = "99d12007112b63b8e3fd0fcf435471ac63ccf030"; + sha256 = "1mar7v4sp3zbvbczs54n8zj17bh042g0384ichwvqkamfcfxgdid"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; @@ -3240,12 +3266,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-04-24"; + version = "2020-05-05"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "1e50ea85361b7144acad459eb091973089b780f6"; - sha256 = "09w7vwzacny6kbf9s2ihan8k682qljp8zad1dh5ds0738a3nwxpl"; + rev = "2a1486447aa62e47faeb98e43fe75c50007870b3"; + sha256 = "0003l09xhdyyq9m0y7hs1nccv3vdmz64qd3ra3rl6lqigzv8v01n"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3276,12 +3302,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-04-13"; + version = "2020-05-12"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "a20a34b0e3129314a820419234d8707a7cc9b872"; - sha256 = "1ms3yy1b1mpjckqfam4bdz2yllxvzac3dfbs213c0hz6l6y20y4n"; + rev = "22f3707fd19e1573b4379f3b8db0e967f4ae6492"; + sha256 = "0nj7bsmkw8yc4hfnbsm32lf4qcwc4qd18nr5sb7vrkm6ipsr2qyz"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -3324,12 +3350,12 @@ let thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; - version = "2020-01-31"; + version = "2020-05-07"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "7d65524dddaeed5629e6b9c8926c56ef8dd0c553"; - sha256 = "02707pl5dqfgkxx2i4wcfxx2zdpm86g5l4n4wn1dms35bcn2c8l8"; + rev = "c238441923d4eefd0c1436686b35e8fa9e643a3e"; + sha256 = "101w0pvfcnms07w4l6yjhn4b4hb3rvwm827qb2z4rb14fydakias"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -3421,12 +3447,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-03-19"; + version = "2020-05-19"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "ee31ea1c7d08ced8577120b4c1d55c5a05351a75"; - sha256 = "01nm3d95qjd2v3j9ln7w52i8bn2fgi5zms9078832w1x4iyb1mwn"; + rev = "e83c82099d9bd43dc7895e3cb5b114ee5a2a07c6"; + sha256 = "0a9fqgg8sg8s19q9inxyzl6lqdsnxs22csqs2rss1qz9dsic4yrh"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -3505,24 +3531,24 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2020-04-01"; + version = "2020-05-24"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "c6f7ca14554196ae15a5fef9e568d69f04b9ff56"; - sha256 = "1hx9rgx44dhc449r0j6azkp1bm20n9c3fyb112w277a2jvf0a2c5"; + rev = "e2449daa3272a6d5ad33e433cca3208bf68607a7"; + sha256 = "16w1nskfxsfs9dhk1yxmk16i5vjg0wq8l3fsqwa0904rh5wnakjn"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-04-22"; + version = "2020-05-19"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "043518d3a9c48049bc0ae0af72dcbb239bf1d36d"; - sha256 = "0v25yk0d4488yn1yvzkpcqh8ldx51q4hbfn678vkr9ga5i0nkkwp"; + rev = "494dbe9d4effff140ffe6743b614d900a0f34dd7"; + sha256 = "0d85kgxb52xw6120q6zrksr10nj54s8qi0fl6gqw6nc08ldaq0b1"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -3541,12 +3567,12 @@ let vim-addon-actions = buildVimPluginFrom2Nix { pname = "vim-addon-actions"; - version = "2018-01-18"; + version = "2020-05-03"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-actions"; - rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; - sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; + rev = "6d350ca6075779af32016f0a0bd3e3521ec4a9eb"; + sha256 = "1098jc4amwfvcrfjfa5hgmyrjrbl680c3s56h7grvyl3i6n4hj34"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; @@ -3769,12 +3795,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-04-24"; + version = "2020-05-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "ff3f66ed30fbab70af1f37c8532327bd9617f7c7"; - sha256 = "1gppy9lk9vyxrqyb9lxvvl8nl31ha5mjwvhlang8g69j2vqpxikr"; + rev = "c744fb81b657417512af20063a36e7cb1ecd4f5c"; + sha256 = "1x55gkqgvy9k2wmcs5y1jmzqni6xd7fjh5269c3465br3hhzlgh2"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -3793,12 +3819,12 @@ let vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2020-04-17"; + version = "2020-04-25"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "237827115523a1c39e3aed9f83bffb009b82a3c2"; - sha256 = "06padj0r3h2lhrf17vlq8ky4q2z7a1jppfb9gjms0sddvjcis5fc"; + rev = "1e5ee4f2a3281201aeb71766d45800e192c103f2"; + sha256 = "1d187w74y0viv502gqxfqi0kyak0lyi0dbpcfkjd9c0fjbqrydd6"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -3877,12 +3903,12 @@ let vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2017-10-28"; + version = "2020-05-14"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "8054352c43168ece62094dfc8ec510e347e19e3c"; - sha256 = "0fd4fbdmhapdhjr3f9bhd4lqxzpdwwvpf64vyqwahkqn8hrrbc4m"; + rev = "53ab32f82723d685648b691af3d8a64a2a119d43"; + sha256 = "1vvfr1wz2770h4rh48qnaqbbdbfxj6pcyhyfh0vf641l46v6wzf8"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -3925,12 +3951,12 @@ let vim-bufkill = buildVimPluginFrom2Nix { pname = "vim-bufkill"; - version = "2018-03-20"; + version = "2020-04-29"; src = fetchFromGitHub { owner = "qpkorr"; repo = "vim-bufkill"; - rev = "795dd38f3cff69d0d8fe9e71847907e200860959"; - sha256 = "1nji86vjjbfjw4xy52yazq53hrlsr7v30xkx2awgiakz7ih0bdxa"; + rev = "1bcdcb4a03a6ac1de06bc84b7f94ca08f4485f42"; + sha256 = "0j3r63j2vs0lm1vnfzwcwqbahncnqq46wmaf1rp8i9l8skqm20px"; }; meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; @@ -3985,12 +4011,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-04-01"; + version = "2020-05-08"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "d3d8b8b6d73da3e1b19089f98a85901f0b652e2f"; - sha256 = "0r20cl6i4k7r2y5d8i3dbrxmn01mlnww2qgvjgmafa8nqd16gl57"; + rev = "57d6fbb4ab3480ab0b0f4c10ecc7c14eb44d94bc"; + sha256 = "0a8w2cb1aj4764hbdxnjpnpdl6xf6slsz4f19lbm8fdsq0v3izk8"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4033,12 +4059,12 @@ let vim-colorschemes = buildVimPluginFrom2Nix { pname = "vim-colorschemes"; - version = "2019-02-24"; + version = "2020-05-15"; src = fetchFromGitHub { owner = "flazz"; repo = "vim-colorschemes"; - rev = "9e7ab1cfec5d3db85aa1c4e87329fd869ecf94e9"; - sha256 = "0w9q41rl9g319xw2xs2yf34h3pdkq8a2pmh4gf9gb72v2k5z0dbm"; + rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; + sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -4117,24 +4143,24 @@ let vim-cue = buildVimPluginFrom2Nix { pname = "vim-cue"; - version = "2020-02-06"; + version = "2020-05-20"; src = fetchFromGitHub { owner = "jjo"; repo = "vim-cue"; - rev = "482f0b1df03f59bbd1bf4bca99314770289a7f35"; - sha256 = "05c9amxpn4zyb8hvcnzrzq43r70hzs32rhn5rjaf5jflgmwaph0q"; + rev = "9b26fb250d473f949fc90cabe70efff316a90248"; + sha256 = "0aybj1xxi860cn7wzg13z50f16kdsyhba0z7qwchps4fr24xkjms"; }; meta.homepage = "https://github.com/jjo/vim-cue/"; }; vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2020-03-19"; + version = "2020-05-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "b5f8a4b148b566626210d0c1f6b63036b62322bb"; - sha256 = "0a4gznfxmg7a62xwk4mmjcxykcgmm7mh5vv7n5hskxjczdrvl400"; + rev = "109604ab6f35744e133802d7cf61795721612cac"; + sha256 = "1mrkkl6pchrmd2s5wjdh46p54hchv7jvgdbjjxmvzhg5ndk0zxvf"; }; meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; @@ -4153,36 +4179,36 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2020-04-09"; + version = "2020-04-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "62646c502fac1455318933b9ea13ec5899ba7c84"; - sha256 = "0qpgx81xpwr3ab3ardp820aqifvxh2jsk1qw94p26q6iiab7kdcv"; + rev = "779e8d6efc89b68be951ac1419baae75541cf51c"; + sha256 = "019k26g88y713wy3q06sbab82dgcgsj7f08g9xr2z2xsjmijp8g4"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2019-09-29"; + version = "2020-05-18"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "9c7484eaea26b8dd1edd8af21a38cee6c4ef4f49"; - sha256 = "1rjckipy7b4ygwvc1hbc24da1x3pwklbkfljrz16znlcm2y5q72k"; + rev = "efee6525f7f61f2b201cbb09c888941c3e5a5e27"; + sha256 = "186rvr9vw140sin219q6psvh70vlqas9vfnbbg5ms6n7wvhz6a19"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-04-11"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "58e57b6eeb407dba7ff6e607342c08c32b6fd398"; - sha256 = "0czkkhj2s9vjis5h4gajvnqc1nraxyqhyvzk2ndffhnzxvylhd5w"; + rev = "8a5133cb5ba229fa80055a031b6070b1651cd102"; + sha256 = "0lxvl378gjwaywmj5fskr8bzdchlh0g33p79ja0pgzs6qffg4jj2"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4213,12 +4239,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-02-24"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "0a53fadc22ab6df6aed9cc580c9e498715870522"; - sha256 = "09q5xpc4xbskzxppp66ypzd5mnic5bcwxahmhb259ch9xs8qmrc6"; + rev = "a19760770b810050e748de14ced589dd34c2dcb5"; + sha256 = "0iz72p992z2bkvz66x7fgyd9hpjq558h009bsjvfr4l6fpbi4ys2"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4321,12 +4347,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-04-18"; + version = "2020-04-25"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "80f0dae8da035d60a094fd1b04bd5b803790ac2b"; - sha256 = "0gdsrbdj6nciivm4vaiq6kppky622r0wxjk4wb0q92j2dzadwsk9"; + rev = "53c530f79cfcd12498e31fcf8ecc466eba34c75c"; + sha256 = "13yr7iwi4w0m4zgkq1ia74qcca9wh9k0bz2y1yvm81db0bllsf6s"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -4513,24 +4539,24 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-04-21"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "05bbfcd0dc24088f302e7221c7ec000d0ee62982"; - sha256 = "1yrfci26yr02s2728jlk4bd29g1abh8dwps8q9l1pk93rzlchisc"; + rev = "5d32f7528988644c3b4a9491a9a4b37ccbd1aa62"; + sha256 = "1h544c7h53fjn9cnvx67p1yays6147v0d445h60n6zwz02zgr4q1"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; vim-ghost = buildVimPluginFrom2Nix { pname = "vim-ghost"; - version = "2019-01-05"; + version = "2020-05-20"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "156f393d9c45a5c9dd16f9316a9ad125da67c449"; - sha256 = "0b21yamsfrljk3mfjql0gzsv5mv24qwbs551hxqsapgmrv7j2acg"; + rev = "795b24dd248d507b88e30baadc46080ace07cdea"; + sha256 = "1g0gblkwba7fd4jgkp2y6rsdld7zhhwf7m2fv63j0aj5fhr74q5r"; }; meta.homepage = "https://github.com/raghur/vim-ghost/"; }; @@ -4573,12 +4599,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-04-24"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "6b46098b2a83becda06586d7c430ffdc4a27db88"; - sha256 = "0q8yvjgxvfjd40f3pspv2kzdcz45q242jfpl948mw74arl0121g8"; + rev = "b356cc9a7da08ebeb919cd04b2831dad71a34d38"; + sha256 = "0y13nbrfank0rqsq5pf1cfcrrfapfvqinhbww97lxhs9clv44kny"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4609,12 +4635,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-04-24"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b7edb21cc518a5404b16997df056d560b6ae067f"; - sha256 = "1acwh0kqk7vy0p5vinmm42c4map4qara0590yd6mzc3ym0zyjvi0"; + rev = "9d76bb022e09c1d7c26a71748aa523453da9a764"; + sha256 = "0yi0m25m1vh2h4gfqj04zf6llqg6cinxd96c7q42h1fa9w8kx93s"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4631,6 +4657,18 @@ let meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; + vim-graphql = buildVimPluginFrom2Nix { + pname = "vim-graphql"; + version = "2020-03-30"; + src = fetchFromGitHub { + owner = "jparise"; + repo = "vim-graphql"; + rev = "a3ff39f955e60baeddd8c3c4d1cab291ce37d66e"; + sha256 = "0d98b0zpbyjcafp0q25c3qsx13q74nszxsi5jxxjnpz1wv6s83x1"; + }; + meta.homepage = "https://github.com/jparise/vim-graphql/"; + }; + vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; version = "2019-12-09"; @@ -4657,24 +4695,24 @@ let vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2020-02-15"; + version = "2020-04-15"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "96cd7dbfe324e8983da68468085967e0b85dc898"; - sha256 = "15xvknzy2r178jh0w76cagmxprxsznzk0zgv41h33rns4hy5q1vf"; + rev = "8e69652c7a7e7aabd96cff21b6ee6b6a295c901c"; + sha256 = "1j9548h2cqvnmqa89hha0s1wfvijdgk6ilakq60awlijdw427f04"; }; meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; vim-hardtime = buildVimPluginFrom2Nix { pname = "vim-hardtime"; - version = "2017-03-31"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "takac"; repo = "vim-hardtime"; - rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; - sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; + rev = "ef06cf30fd3843e7857fdb79c6868660220b9391"; + sha256 = "0yhai27zqkdmgck1iy64fw9yy2vghmqvj4g2lbh21h50df1sa8cf"; }; meta.homepage = "https://github.com/takac/vim-hardtime/"; }; @@ -4765,12 +4803,12 @@ let vim-html-template-literals = buildVimPluginFrom2Nix { pname = "vim-html-template-literals"; - version = "2020-02-07"; + version = "2020-05-17"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "3b370b69bce94bdeb0ca7137f548356f775cadcc"; - sha256 = "1wmyxscyqs6344jsn839dyrx7k3iiwv07ic9gxh5d93g5s3c3pml"; + rev = "0959db06cd74408935a589fb59ec63af91a1557b"; + sha256 = "0vq0y9adx2023p0nqv020921r474216msrkm0lkb5v776xm4mks2"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -4921,12 +4959,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2020-04-13"; + version = "2020-05-11"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "c3966153e81bc3766b1627e6ab0cd53333b61c1e"; - sha256 = "1sbd5a06linzkx59lndfw27r66ng2bfm4pgn2cgjlcsjmkbcgakn"; + rev = "3c90d0cc37bb8b78422f647e62587f498a5dd7bd"; + sha256 = "16s3s883azfmwkr6hhnh8m7ibk6jm3vnvpmsagangxn0mz6ky533"; }; meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; @@ -4970,12 +5008,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2019-02-08"; + version = "2020-05-16"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "b23073449d1df98ecfe73828079115e0d1d7573b"; - sha256 = "0r91lr3gpjbaalqln7k8kv4q88w9rclfyji87yzmnr3apjaazyjj"; + rev = "5e8eac9d8e38c273cc05c359730a2a74a1578f2b"; + sha256 = "0biyf2vzvnqzzdykq0agf1hzs2ynbbly4fxfwrfablznbdgsm0pz"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5090,12 +5128,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2020-03-30"; + version = "2020-05-25"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "47186eb47f543becc34a048a37298954d89bf7c8"; - sha256 = "0265614sa2d2s3xpzfliq159v7bmdvlc9yyw5c89pqv4b86gjxzf"; + rev = "b3e6f3dfaa922cda7771a4db20d3ae0267e08133"; + sha256 = "1jx814sqs0n0mrdi2lrh6xa3d2cmgyc78176gd5c1n8k5q7qkp40"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -5126,12 +5164,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2020-02-25"; + version = "2020-05-20"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "fc2f789ce7afa4bbdefbbb4599a802b39b7e7596"; - sha256 = "19drgnsn4rb9kv30ykndwjgflsfs328dhm44a9hcp8f8faqpim3d"; + rev = "7f9d254a0c46889454cc2fd2d5918b413e4cb85a"; + sha256 = "0428hbcj4w9lwmsv9jribkp5fjcbw3sg0gs81jf9n5ax0mxgnbzy"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -5150,24 +5188,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-04-13"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "fb8056a305a4e3221304ca1483231b6960de5321"; - sha256 = "0glg6225h84ahabahb9q5inipbbi7shcx5y44s8r2gyaqw1l773p"; + rev = "22ad7433b35b194015856d5b41037b752e192764"; + sha256 = "1jww2x2cl9pfgjxwcmcl829fvhxqagn1fcnk4d5hrgg7w6k4c10g"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-04-18"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "f630b985facf383ae1657d569ff69582224cca04"; - sha256 = "1v0f9l12afr4kh6d9sdyl5fxvcgz0c018vll5932pfcrlwhkvdd3"; + rev = "7260313ed17b2cd11b18d817d4afc8fb8cb6f3f3"; + sha256 = "0nn8c1kyg0s41id46g7s9qklnnxck8xvnvsd3gpak5ii1rxpzrsh"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5234,12 +5272,12 @@ let vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; - version = "2020-03-03"; + version = "2020-05-07"; src = fetchFromGitHub { owner = "phanviet"; repo = "vim-monokai-pro"; - rev = "c18f35725a5b0d569bfe6921fc4f56c029324828"; - sha256 = "1nz8jnlhd6z9zqa9dfbxa9fabihpzz8ajlf4plkaxdy9137z1zqc"; + rev = "baf3046bb44cdffe3bf9a571b3ec24039e2c9f88"; + sha256 = "0rszkf070d8w94dhgjpsl1kyn19j7bqyz434qshz4j88jk7hap6h"; }; meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; @@ -5258,24 +5296,24 @@ let vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2020-01-22"; + version = "2020-05-21"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "f13357964cc074d4fe747787065bfb19046f7fce"; - sha256 = "0kqik4xgnk3cw7ls53djij086rbp49klzckc4zs4ph4cjwcpjhgq"; + rev = "56ded939230b13ba5b93a38e79e2b61675a8f6ef"; + sha256 = "1z6h8qwr12isr0xhpdqjf9imprz84gijaqgr761vgh7l2q1piqqv"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2020-02-06"; + version = "2020-05-19"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "701e92dd4cfd1b0f511e83a96d52bc590c0218dd"; - sha256 = "0a7fghk025f8gj5rsixi1hn8vkg2982fja7maf427v3wq74s6j1c"; + rev = "ec93676024590327263e8138443614ec4da8c9bc"; + sha256 = "09rcs435nh74p5dwdw8k1mv1w2lni4y098dg99j6dh6859lc3hw8"; }; meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; @@ -5402,12 +5440,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2020-03-03"; + version = "2020-05-09"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "44faafa1d846691645b66e83f198f46afa755a6e"; - sha256 = "1s649hksrwq70xyi8cvcd9bqcfyczga5c1g4fsas50rs107fcccn"; + rev = "ecdc5b279d7b4e0ae4ebfb9e0f139e3ca6698033"; + sha256 = "00yihsp5fmpw1ch013brrjkxb6h4slkxms1n154glz8pm95bqsm0"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -5426,12 +5464,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-04-17"; + version = "2020-05-15"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "c6e2ddb1318cc141b2d84d630e493a14df942ea1"; - sha256 = "15ci141jiv84ibrg1v98as1k376cnx06p1zp50w1qmccv696n8nv"; + rev = "e49f9e7e3fc041dab0e9a1de4b564b3ddd8f77aa"; + sha256 = "0i1zcnsc962bzm3q6kw8bldd9xh6vb7kw0j72c4dzwdw4ayx0wf1"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -5546,12 +5584,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-04-11"; + version = "2020-05-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "e718868e85e2a32410144dfcdc3ba1303719450d"; - sha256 = "1znaapjdz9nwgvr5il6rck82mz4dhj1nan87w2216xwpp53w61fb"; + rev = "71c41fccf5ca42081d4d49aa1ea2f71c694bc4cf"; + sha256 = "1cp8qw1fblp26v9hjvd00bl2kcjqi44xw30aclxcqis6pfj1yvv0"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5570,12 +5608,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-04-14"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "14dc82fc4e6c0c08078f97a24a6c1639c1cc5113"; - sha256 = "0cx9wvv8ca589wna7yy0qx0hc0c9g42y50fxa0y7vyw3wwkq8q7n"; + rev = "f0f49cf0fa8bbcb7f84e3ffe699a934142498b14"; + sha256 = "1fpiwjn16lvzcghsjbcak1hf0fqgknfyimbbw3pw4dcnvzv5w03a"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -5594,12 +5632,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-11-13"; + version = "2020-05-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "17a8b2078a9ca1410d2080419e1cb9c9bb2e4492"; - sha256 = "1vf3jdcfiq27k9mdwlvsm2hn1xgxr79ckq3jqq00avj50bpdzs1z"; + rev = "1d95458273a8ecdb678e65db918c045f9bb7e220"; + sha256 = "1h5gb29rs64cfr55g12s1f0w0cqzqs2nhfw8qfbfch5jbh21p10p"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -5690,12 +5728,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2020-02-03"; + version = "2020-05-16"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "f637c35b16d6e83cc71dababbda2a64eb29b3f5e"; - sha256 = "0yf9acqcj3x62qchz0z9mwgf1af5vz39kyzhv5jh1mc0vwksrdwl"; + rev = "3041ad7f0b3f9122d4f00bda2f3bb554bf89105c"; + sha256 = "1ncfw4inb6rdlrayvijy7769wyppiihmazmfcjdx5g42mycfxg0y"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -5894,12 +5932,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-12-07"; + version = "2020-05-18"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "56db16f8d3825c4d066c2faf05315c2b208cd5f5"; - sha256 = "0alargsa6sxdxha6jshax7ff6jy8svzc9yxvsh83f8301zx9vmra"; + rev = "dfa1e55fe1c7f309f8cce4db0243f14f6edb2d4c"; + sha256 = "0p1hnjwhqmrczwns7h8gsmdl95yxcb6sqw59xshz7ji0b80h45mf"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -5990,12 +6028,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-04-21"; + version = "2020-05-16"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "ad4407f31bf170b0813fb9b03f851cf79b5f65ca"; - sha256 = "0nr7xq5kz94fm578ds84pd3ydbhfbxs6r4fc5250anmazip2h2cw"; + rev = "087d3e7c72912baeb6b1d7ba626e61d50092c848"; + sha256 = "1vir3sl2px0m4pr2z013mfzwagrh9wqkj3wagysjvm779l462407"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6086,12 +6124,12 @@ let vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-04-22"; + version = "2020-05-23"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "9db5f782be230368a3a81a21d3eb93678f7523ae"; - sha256 = "0igv2yf1h1ajnv9c0z02pvgqciighwc1y53c9ahfqwxd58kpi5fj"; + rev = "5695f97fc803767bf657a5e512daec19dd1fd786"; + sha256 = "0lksvgk3g2yqbm8pw8ba5f8594djh5cj795hwjhnxc8rrhl29qpq"; }; meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; @@ -6122,24 +6160,24 @@ let vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; - version = "2018-03-09"; + version = "2020-05-09"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; - sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + rev = "35d116cd1c70d2066b332a76ddbf354786cbb996"; + sha256 = "0mxih2ixaqnzh915w8zycdjxf07ax648dw5nvglcp7ym4r8fzg0q"; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-04-19"; + version = "2020-05-06"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "6a6f3565c3bd6ea903c9824b8e9367fcdeb7a7b5"; - sha256 = "0vxkakix6r4x1a4ipzhpr7ix7fxz2bqaskwkpmgap12wy5qg3rzs"; + rev = "640400908075c50704e127448175d3ede6bba2e9"; + sha256 = "0gbj324wwgai1kprn78srq3cvldpi6hx9gsr5kk2sn2yxq32xp3y"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -6182,14 +6220,14 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-04-19"; + version = "2020-05-26"; src = fetchFromGitHub { - owner = "janko"; + owner = "vim-test"; repo = "vim-test"; - rev = "42c216487a2a13dce04e84534461cc1cf96fa774"; - sha256 = "0912d62frdjm488sybhafl113xh4npylzk0gzblbgdi0fl2f9i52"; + rev = "b882783760b954144dda5be7ad6cd4bdefd013fb"; + sha256 = "0s0dlgjkkxajkfnpihc09py0qbbamibhalsv2vdvwcqva02xrylx"; }; - meta.homepage = "https://github.com/janko/vim-test/"; + meta.homepage = "https://github.com/vim-test/vim-test/"; }; vim-textobj-comment = buildVimPluginFrom2Nix { @@ -6374,12 +6412,12 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-11-12"; + version = "2020-04-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "08e66532bffed445c949ae0a0501940c000553ed"; - sha256 = "0sm5rv6z0s80l9c39hijhnfggvgmi24ac6d9a1k58pzjz6i9w2vr"; + rev = "4afbe5ebf32ad85341b4c02b0e1d8ca96a64c561"; + sha256 = "052amdb4bd2qbip3z9xz7h1cv61k4p038j65yijm68vy0hf2724y"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -6398,24 +6436,24 @@ let vim-visual-increment = buildVimPluginFrom2Nix { pname = "vim-visual-increment"; - version = "2015-07-02"; + version = "2020-05-03"; src = fetchFromGitHub { owner = "triglav"; repo = "vim-visual-increment"; - rev = "e50e8f7c062cec759f665278eb58535df1611a23"; - sha256 = "1gd6mxp9y80wf7nxcm02104l54gqz5k3dgv1h98jl9a7q9swb8y6"; + rev = "0e55bb4054cdd5eefc0bb870f3e3c249673817cb"; + sha256 = "0if3r3ih8f4yxy5s4xsl7384xzf14rmalvg60n9mbhshyljggvc4"; }; meta.homepage = "https://github.com/triglav/vim-visual-increment/"; }; vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-04-21"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "5983497180ce1406997e5329f526f40f76b21121"; - sha256 = "0hrc3kwrk65hdnapp056kxwzizifzdy9zsqn242d81nzymfa6353"; + rev = "cdcaa75d5a6054c7c69b6ebbaa4dff2fce6f96ed"; + sha256 = "0mszzkmi4kgmf6qjh5f2mr9y1b3p4jzvlsykvzavz8zb55yy4vkx"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6470,12 +6508,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-03-16"; + version = "2020-05-25"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "4b70b443ba5838b165f90e26f9ed628d7d05e11d"; - sha256 = "197rp20hngrq7qdlii0ai4vb81dlilah0q1wlil8hv3qcf4az7qr"; + rev = "786dceaab0987e164dcee125b8ff6111851df625"; + sha256 = "01afdf37fqz6i9g9371yh0ymv9lsw81z52vcpnwyysbj8n7qswwc"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -6506,12 +6544,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2019-12-14"; + version = "2020-05-22"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "b9839555f70d319b4e21fc7bc9b559d91cf1260a"; - sha256 = "1ql8yv8rxpr9j9phf4jddqs1j81vcb9gpp0p3fmy6f8nf4b26nvw"; + rev = "f54fd6a7357d43a8773313504da72d1bd96d6f1a"; + sha256 = "0542prcclaw6s4f6dlp0ywz5zp10brb7br7hx4lhhizslcakg09v"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -6662,12 +6700,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-04-23"; + version = "2020-05-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "3e2bf3f27ad7253767eefe0b4c4e551c602d5d77"; - sha256 = "1pxkim0mh691lb8clv1828nhs4cqzf8s3vkmynq7164mzvrf77sh"; + rev = "666191bc563be6716af6e167404dccb27f2fb8d1"; + sha256 = "03gc4w57j5xpcnmj60qrsc2qbrkvpmn9cfzz8xwha26cpngrwv9q"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -6686,12 +6724,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2020-01-13"; + version = "2020-05-26"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "64c9f3d36d632b1657616c06ea8f08f14cf6438d"; - sha256 = "0wwfl0bafwh9p8lzic75d0nl6v5dnpfid7fbiffr0i72agp0gcq7"; + rev = "619f04f89861c58e5a6415a4f83847752928252d"; + sha256 = "03dic4vjl3bwd7s6jj3vrz6xicf3a3bccaqgx635hn01ha6vw1jw"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -6710,12 +6748,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-04-24"; + version = "2020-05-23"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "48631457714b6a611b96ad4785ec16a98b639515"; - sha256 = "05zabbnrxbgnymp6iyc6gmfj3sk752679kvyzk5jiraksi32djiw"; + rev = "dab956b05534359fd4e498b45e518f63f097ae9c"; + sha256 = "1wf7plybcrrdx459f0g2rzzl9drik7w264y0i1jxf43y7nlm138n"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -6830,12 +6868,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-04-18"; + version = "2020-05-15"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "7978f7d52e1cfbdba1d17951c7bd4be527807e4e"; - sha256 = "0fiqbnqsyr743vxm8km4q7yyd26anya1yi89gkzjipq2vgpqx7hn"; + rev = "fbbb4b2fa346f556aee8424c98ee51e849949bb1"; + sha256 = "1plgig0m7zb4zk7mqj5g12nc622dpngj4g4wvkg2ffic2krz9fdx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -6843,12 +6881,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-04-18"; + version = "2020-05-25"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "367c1518cd6f2c8695000924b8ec2815a30a9af3"; - sha256 = "0c8982qj93b8rcb4m7dfczscqyfhv2y672irrrpg0kb2yxiwk51m"; + rev = "27362f850ceca80e5369f46512fdd3ba042de4d7"; + sha256 = "1gm8z7rshn2ffc3hdwif2910ckbz01x6aysp0yk8nfmqb7iacnjc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -6892,12 +6930,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-04-12"; + version = "2020-05-21"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "0e914f2ab5ab9a9554c31b90be189dca5c4ee3a8"; - sha256 = "1njf3flx5dcahvk92kaf879sd4a75yq4nnii4ljip7bvkyci8ipa"; + rev = "912e9c792702519ca03cd3e3048e8d276a5d3947"; + sha256 = "1svy3bp8rhcbimcp5p4crz57fiv1p2xvcr4xs90frsncq1r483q9"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 4d5b532216..73c5690b19 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -30,6 +30,9 @@ # vCoolor dependency , gnome3 + +# fruzzy dependency +, nim }: self: super: { @@ -383,6 +386,38 @@ self: super: { dependencies = with super; [ super.self ]; }); + fruzzy = let # until https://github.com/NixOS/nixpkgs/pull/67878 is merged, there's no better way to install nim libraries with nix + nimpy = fetchFromGitHub { + owner = "yglukhov"; + repo = "nimpy"; + rev = "4840d1e438985af759ddf0923e7a9250fd8ea0da"; + sha256 = "0qqklvaajjqnlqm3rkk36pwwnn7x942mbca7nf2cvryh36yg4q5k"; + }; + binaryheap = fetchFromGitHub { + owner = "bluenote10"; + repo = "nim-heap"; + rev = "c38039309cb11391112571aa332df9c55f625b54"; + sha256 = "05xdy13vm5n8dw2i366ppbznc4cfhq23rdcklisbaklz2jhdx352"; + }; + in super.fruzzy.overrideAttrs(old: { + buildInputs = [ nim ]; + patches = [ + (substituteAll { + src = ./patches/fruzzy/get_version.patch; + version = old.version; + }) + ]; + configurePhase = '' + substituteInPlace Makefile \ + --replace \ + "nim c" \ + "nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}" + ''; + buildPhase = '' + make build + ''; + }); + ghcid = super.ghcid.overrideAttrs(old: { configurePhase = "cd plugins/nvim"; }); diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch b/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch new file mode 100644 index 0000000000..62aaba118f --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch @@ -0,0 +1,25 @@ +diff --git a/rplugin/python3/fruzzy_mod.nim b/rplugin/python3/fruzzy_mod.nim +index dba0689..0109285 100644 +--- a/rplugin/python3/fruzzy_mod.nim ++++ b/rplugin/python3/fruzzy_mod.nim +@@ -12,9 +12,7 @@ when defined(profile): + import nimprof + + proc getVersion(): string {.compileTime.}= +- let ver = staticExec("git describe --tags --always --dirty").strip() +- # let cTime = format(times.now(), "yyyy-MM-dd hh:mm:ss") +- let branch = staticExec("git rev-parse --abbrev-ref HEAD").strip() ++ let ver = "@version@" + var options:seq[string] = newSeq[string]() + if not defined(removelogger): + options.add("info") +@@ -26,7 +24,7 @@ proc getVersion(): string {.compileTime.}= + options.add("release") + let optionsStr = options.join(",") + +- return &"rev: {ver} on branch: {branch} with options: {optionsStr}" ++ return &"version: {ver} with options: {optionsStr}" + + let L = newConsoleLogger(levelThreshold = logging.Level.lvlDebug) + addHandler(L) + diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 4af22bd833..6e558ed67f 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -153,7 +153,6 @@ itchyny/vim-cursorword itchyny/vim-gitbranch ivanov/vim-ipython jacoborus/tender.vim -janko/vim-test jaredgorski/SpaceCamp JazzCore/ctrlp-cmatcher jceb/vim-hier @@ -175,6 +174,7 @@ jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-go jpalardy/vim-slime +jparise/vim-graphql jparise/vim-phabricator jreybert/vimagit jsfaint/gen_tags.vim @@ -360,6 +360,7 @@ ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 octol/vim-cpp-enhanced-highlight +Olical/conjure OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -387,6 +388,7 @@ Quramy/tsuquyomi racer-rust/vim-racer rafaqz/ranger.vim rafi/awesome-vim-colorschemes +raghur/fruzzy raghur/vim-ghost Raimondi/delimitMate rakr/vim-one @@ -548,6 +550,7 @@ vim-scripts/utl.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-syntastic/syntastic +vim-test/vim-test vim-utils/vim-husk Vimjas/vim-python-pep8-indent vimlab/split-term.vim diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix index 4e94151a81..146a661542 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "btfs"; - version = "2.20"; + version = "2.21"; src = fetchFromGitHub { owner = "johang"; repo = pname; rev = "v${version}"; - sha256 = "1xil18nmivakdv6rz4sd3203gzfisdvj79spni59kv7dby64rxdz"; + sha256 = "0zqkzfc49jl9kn3m0cg7q0156xyzrdl5w4v70p16sqxdly86mwb0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix index 01e70fbb04..7984c25bf3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "00s4qg4h9s9vi46jyw7lz36lb5i8h3s9cmicnngp17764xgkr916"; + sha256 = "035ydf7kp9yh5gpjnq4cgi76j582a0q6dxcbgkraxpkml0d8n2xd"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch index bd7d9d145c..880c073fbc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch @@ -5,13 +5,13 @@ start_service() { - systemctl start displaylink-driver -+ @systemd@/bin/systemctl start --no-block dlm ++ /run/current-system/systemd/bin/systemctl start --no-block dlm } stop_service() { - systemctl stop displaylink-driver -+ @systemd@/bin/systemctl stop dlm ++ /run/current-system/systemd/bin/systemctl stop dlm } EOF diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix index 2e0f5ef783..8233c065c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ]; + patches = [ ./fix-dbus-path.patch ]; + makeFlags = [ "VERSION=${version}" ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch new file mode 100644 index 0000000000..e1c10cf82f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch @@ -0,0 +1,11 @@ +--- a/kill.c ++++ b/kill.c +@@ -55,7 +55,7 @@ static void notify(const char* summary, const char* body) + } + // Complete command line looks like this: + // dbus-send --system / net.nuetzlich.SystemNotifications.Notify 'string:summary text' 'string:and body text' +- execl("/usr/bin/dbus-send", "dbus-send", "--system", "/", "net.nuetzlich.SystemNotifications.Notify", ++ execlp("dbus-send", "dbus-send", "--system", "/", "net.nuetzlich.SystemNotifications.Notify", + summary2, body2, NULL); + warn("notify: exec failed: %s\n", strerror(errno)); + exit(1); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix index de3bc092fa..a3935d0069 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.1.2"; + version = "2.2.7"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "1dp1q99m2x8hq99his6n62yw0v1lbzrlyv67w1ndc774m2k77r5w"; + sha256 = "1ap100xh5wrdvy5h2ydcy6rqcklb4fz6xxs33ad3j9yx3h1ixj2d"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 2a0e52c658..9fe40cb60f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "ga8MpbY9tTwr0jsmjEAMyFxDC+yD4LBTx5gXRXig31M="; + sha256 = "1wch1n0z89ymfxx7ganiab4h64rdxr54rcg37n5nshw35bc3f390"; }; # libfwupd goes to lib diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix deleted file mode 100644 index bcafa7f337..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: - -let - version = "12"; - - arch = - if stdenv.hostPlatform.isx86_32 - then "ia32" - else stdenv.hostPlatform.parsed.cpu.name; - -in stdenv.mkDerivation { - pname = "fwupdate"; - inherit version; - src = fetchurl { - url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; - sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; - }; - - patches = [ - ./do-not-create-sharedstatedir.patch - ]; - - NIX_CFLAGS_COMPILE = builtins.toString [ - "-I${gnu-efi}/include/efi" - "-I${gnu-efi}/include/efi/${arch}" - "-Wno-error=address-of-packed-member" - ]; - - # TODO: Just apply the disable to the efi subdir - hardeningDisable = [ "stackprotector" ]; - - makeFlags = [ - "EFIDIR=nixos" - "prefix=$(out)" - "LIBDIR=$(out)/lib" - "GNUEFIDIR=${gnu-efi}/lib" - "ESPMOUNTPOINT=$(out)/boot" - ]; - - nativeBuildInputs = [ - pkgconfig - gettext - ]; - - buildInputs = [ - gnu-efi - libsmbios - popt - ]; - - propagatedBuildInputs = [ - efivar - ]; - - postInstall = '' - rm -rf $out/src - rm -rf $out/lib/debug - ''; - - meta = with stdenv.lib; { - description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates"; - maintainers = with maintainers; [ ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch deleted file mode 100644 index b8588ef2b1..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -131,7 +131,6 @@ - ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\ - ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\ - ) -- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/ - $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/ - $(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup - $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index 2bed2aa1c6..608a6d5fa7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "0h1ssw9x37hvks8rcnsjq4nsl6djmhx53iiwrw8fw4lf3nlmdzpx"; + sha256 = "0433f9kx43842ic8dydxhz8plyyrrxvqqwg7kd5ghn599ix28avy"; }; postPatch = '' @@ -50,4 +50,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index 76ec3c691d..d05a8c5255 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.03.00"; + version = "20.05.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "0h56lclvs8l5jf6zh790ki9k4mp9r8sqv2pynnciqlkz8nj71qah"; + sha256 = "14rqm45al6w42mzi0rqpwbw1spy7iv1jhywhwkdgs4w91zzc4gaj"; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 636d174b15..c715c7baf7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -219,6 +219,7 @@ let FB_3DFX_ACCEL = yes; FB_VESA = yes; FRAMEBUFFER_CONSOLE = yes; + FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 76d27e2950..59e6e768a4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,27 +1,22 @@ { "4.14": { - "name": "linux-hardened-4.14.180.a.patch", - "sha256": "0rpk5lq947i4v48d6jv75rgwpncayr4agc3f2iich3hlkh5p72p3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.180.a/linux-hardened-4.14.180.a.patch" + "name": "linux-hardened-4.14.182.a.patch", + "sha256": "1kkchcv3qkm41rgscm12ii852q2846crbpvafywz31qg62lb6qig", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.182.a/linux-hardened-4.14.182.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.122.a.patch", - "sha256": "0jh5wyrwrmm9rqqi8fn6d6bd8lzkhj1aylnphsajyyx5v28hn1b2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.122.a/linux-hardened-4.19.122.a.patch" + "name": "linux-hardened-4.19.125.a.patch", + "sha256": "1dhb8syp4j7hc4mx3s7c2x0gxil5dw7jh0swfqzjm02npbwpp19r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.125.a/linux-hardened-4.19.125.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.40.a.patch", - "sha256": "1w9yc0j8vshjyvb2qgxjvrdgwiy5lmjn3s1rmlch649vqp97j9w7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.40.a/linux-hardened-5.4.40.a.patch" - }, - "5.5": { - "name": "linux-hardened-5.5.19.a.patch", - "sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" + "name": "linux-hardened-5.4.43.a.patch", + "sha256": "14d9sg1f2a0fnr2q9z6ck5biip1kbzqqwlg4xzpwv83vaycq4i3b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.43.a/linux-hardened-5.4.43.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.12.a.patch", - "sha256": "1b6cwffb2b21h9xh2acm9q9j55cay87zbv9jjayv69znry4mzsx3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.12.a/linux-hardened-5.6.12.a.patch" + "name": "linux-hardened-5.6.15.a.patch", + "sha256": "0gvp4mra07aj22mrjj8gzd3k7z1zafvak461iajrxfjhzh1z3bdf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.15.a/linux-hardened-5.6.15.a.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8629eb8cf7..ca48ed4855 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.180"; + version = "4.14.182"; # 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 = "03pd4wpg526n391jwc0kbmbxi059mvq8d42a9qbym9mnv5rzjkj4"; + sha256 = "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 4cb90abc29..20aced02a8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.123"; + version = "4.19.125"; # 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 = "0gwrkbbfy85ajxpg7q6j9mn8mzhmsr1v3wmh5c76p34d3b9i96d7"; + sha256 = "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 58131815e0..a9d45bcdea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/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.223"; + version = "4.4.225"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09fln0sdfif2zv2jifp24yiqi0vcyj8fqx2jz91g21zvsxk3x5nd"; + sha256 = "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 9f2c7659ab..b13ed0e8fc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/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.223"; + version = "4.9.225"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r9ag1fhy0g429q44qlqh0qkf42qkhzxa04gxlmnrinqypk00lyg"; + sha256 = "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index e2554cf91b..801003dc4f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.41"; + version = "5.4.43"; # 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 = "0mxhz3f0ayz0nggndbikp44kx307yxf16qzsv46hni6p8z1ffr0y"; + sha256 = "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix deleted file mode 100644 index 96a349d985..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.5.19"; - - # 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; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1sqiw9d25sqqzdh04dd722i7ff6kchj869jp4l8zalpvf51k6j0l"; - }; -} // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix index e3eb296d6d..d19fe9cbc6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.13"; + version = "5.6.15"; # 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 = "11zriz0jwqizv0pq0laql0svsnspdfnxqykq70v22x39iyfdf9gi"; + sha256 = "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 8b5f1e58d1..f2f0fac3b7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc4"; + version = "5.7-rc6"; extraMeta.branch = "5.7"; # 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 = "1mnknjiax24iaj9n5k0s55vp6fvmb40s931qxj24v5p1lc5fznvb"; + sha256 = "0g04zwdxks7pa5q6shl5xl2rml1w95rxq7sqkkadj11mpk2k89w4"; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix index 6383832a7e..40f92f38d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.10.0"; + version = "1.10.1"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "0amgc5w7qg96r9a21jl92m6jzn4z2j3iyk7jf7kwyzfi4jhlkv89"; + sha256 = "0nf5x4v9rhyd67r6f6q3dw4sraaja8jfdkhhg9g8x41czmx4d456"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix index 22763130ae..48ee5d16c5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "18y8mfr63d91278m1kcid0wvrxa1sgjs8na9af1ks2n28ssvciwq"; + sha256 = "1fpwp2sj8mf98bqasq2h8qwgprxi7k3iw33gcfid3d1lbyiacw0x"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index b57c97c99e..c0201fb01f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200508"; + version = "20200520"; src = fetchFromGitHub { owner = "intel"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix index 616ad9c676..c05adb33ec 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "06cxs41biqx230grvpk7zid3apcaajjywrccag50krb6h2wqafdl"; + sha256 = "0ngh7zffjf6ac8b22hdi4ry7hjlafih172hrbpw8j17r7c0wjy9i"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix index f5b54769f0..dd3b24dd19 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.22"; + version = "0.02.23"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0r355b9syqa2nhfy8ksvxyy5d58v0isf983842js091s6liy0x7g"; + sha256 = "1yj8ja0hw92wscazxh9vr3qdz24wpw2fgd3w7w088srfzg2aqf3a"; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix new file mode 100644 index 0000000000..a86d76a3be --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "rtl88xxau-aircrack-${kernel.version}-${version}"; + rev = "fc0194c1d90453bf4943089ca237159ef19a7374"; + version = "${builtins.substring 0 6 rev}"; + + src = fetchFromGitHub { + owner = "aircrack-ng"; + repo = "rtl8812au"; + inherit rev; + sha256 = "0hf7mrvxaskc6qcjar5w81y9xc7s2rlsxp34achyqly2hjg7fgmy"; + }; + + buildInputs = kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" ]; + + NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support."; + homepage = "https://github.com/aircrack-ng/rtl8812au"; + license = licenses.gpl2; + maintainers = [ maintainers.jethro ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix index 3b4c1c4b66..ad751b9cfe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix @@ -12,14 +12,14 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.6"; + version = "0.7.8"; pname = "usbguard"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"; + sha256 = "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix index d60ff7f364..911b0331f4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,14 +1,23 @@ -{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; inherit (wpa_supplicant) src; + patches = [ + # Fix build with Inkscape 1.0 + # https://github.com/NixOS/nixpkgs/issues/86930 + (fetchpatch { + url = "https://w1.fi/cgit/hostap/patch/?id=0388992905a5c2be5cba9497504eaea346474754"; + sha256 = "YDSY7l/qEco+aZYcYHLf/rxCKvPw35ibGoMorjA5GhY="; + }) + ]; + buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake inkscape imagemagick ]; - prePatch = '' + postPatch = '' cd wpa_supplicant/wpa_gui-qt4 ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 563735deee..581316dc74 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -42,12 +42,7 @@ let inherit rev sha256; }; - patches = [ (fetchpatch { - # https://github.com/openzfs/zfs/pull/9961#issuecomment-585827288 - # will be included in zfs 0.5.4 as well - url = "https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch"; - sha256 = "0zay7cz078v7wcnk7xl96blp7j6y64q1migb91c7h66zkpikqvgb"; - }) ] ++ extraPatches; + patches = [ ] ++ extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts @@ -192,9 +187,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; + sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; }; zfsUnstable = common { @@ -202,9 +197,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.3"; + version = "0.8.4"; - sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw"; + sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; isUnstable = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adminer/default.nix b/third_party/nixpkgs/pkgs/servers/adminer/default.nix index 6d7b12df56..c58d2e6c2b 100644 --- a/third_party/nixpkgs/pkgs/servers/adminer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ { stdenv, libbsd, fetchurl, phpPackages, php }: stdenv.mkDerivation rec { - version = "4.7.6"; + version = "4.7.7"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi"; + sha256 = "1rvvc7xml7ycpbpjgqbgkan8djplx67balrmfignk1b6h9cw3l4q"; }; nativeBuildInputs = with phpPackages; [ php composer ]; diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index e7f0eb73c8..51b5ef06ff 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.3"; + version = "3.8.4"; # 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 = "1fhs3g2pgrq2xi4hnlc437hkv3261l4i134m6mxid00sf1c89p5f"; + sha256 = "1sa9zfd8hv5mxgnxva9sydqnyzwssxjkbba028pwpml2im97z7j5"; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix index d8410c87b7..81f8422bb0 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "13d0vnsvyl8cjdxnp2w284814bnqgbksl8mq7lkjms1x083mhnzi"; + sha256 = "1spykb8f24dlzrcyj01nv1ra278j0b6bxbnvrcnp6yr2s69cjwd0"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix new file mode 100644 index 0000000000..075b5e5844 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchurl, makeWrapper, python3, nixosTests }: + +stdenv.mkDerivation rec { + pname = "bazarr"; + version = "0.8.4.4"; + + src = fetchurl { + url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; + sha256 = "09qpy5fyyidi45968qg37cighfh3rgwsi8pfz4fk5fp2v1xq23yg"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/src + cp -r * $out/src + + mkdir -p $out/bin + makeWrapper "${(python3.withPackages (ps: [ps.lxml])).interpreter}" \ + $out/bin/bazarr \ + --add-flags "$out/src/bazarr.py" \ + ''; + + passthru.tests = { + smoke-test = nixosTests.bazarr; + }; + + meta = with lib; { + description = "Subtitle manager for Sonarr and Radarr"; + homepage = "https://www.bazarr.media/"; + license = licenses.gpl3; + maintainers = with maintainers; [ xwvvvvwx ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index b641699c73..a7581ccbb1 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.11"; + version = "9.14.12"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "1v4y9308w0gd98gjzni4cgxmh8g1s37lbnnkyhsn70xs3xki5b4c"; + sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index d76b51bcc6..3dc6fd3e2c 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -8,11 +8,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "57f3c93a1b40dfa0431508203f559b7ea257afab79078c38bcddf960d5a4a501"; + sha256 = "1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 4964755332..f596934a42 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -16,11 +16,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "9ab179d1dccc6ba59aacac81a4cd10a039615c7a846d9f77f26b851da25d1a86"; + sha256 = "f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index 7d6fa7d9c9..10a18ab1d4 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "13v2iah7z10wc43v9agcjrzi3wds4jna8f0b7ph35nyzhzr31h9b"; + sha256 = "1n9gymis0h1grgg63ig3kk9cb27ayy1w6s8hcn8n4g5dzi90h8sl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/documize-community/default.nix b/third_party/nixpkgs/pkgs/servers/documize-community/default.nix index 4c09d7f1ee..9a6580353f 100644 --- a/third_party/nixpkgs/pkgs/servers/documize-community/default.nix +++ b/third_party/nixpkgs/pkgs/servers/documize-community/default.nix @@ -2,15 +2,13 @@ buildGoModule rec { pname = "documize-community"; - version = "3.7.0"; - - patches = [ ./vendor.patch ]; + version = "3.8.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1pcldf9lqvpb2h2a3kr3mahj2v1jasjwrszj6czjmkyml7x2sz7c"; + sha256 = "0jrqab0c2nnw8632g1f6zll3dycn7xyk01ycmn969i5qxx70am50"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/documize-community/vendor.patch b/third_party/nixpkgs/pkgs/servers/documize-community/vendor.patch deleted file mode 100644 index 82146981f3..0000000000 --- a/third_party/nixpkgs/pkgs/servers/documize-community/vendor.patch +++ /dev/null @@ -1,2392 +0,0 @@ -diff --git a/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml b/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml -new file mode 100644 -index 00000000..e0c87602 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/.coveralls.yml -@@ -0,0 +1 @@ -+repo_token: x2wlA1x0X8CK45ybWpZRCVRB4g7vtkhaw -diff --git a/vendor/github.com/microcosm-cc/bluemonday/.travis.yml b/vendor/github.com/microcosm-cc/bluemonday/.travis.yml -new file mode 100644 -index 00000000..4f666461 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/.travis.yml -@@ -0,0 +1,22 @@ -+language: go -+go: -+ - 1.1.x -+ - 1.2.x -+ - 1.3.x -+ - 1.4.x -+ - 1.5.x -+ - 1.6.x -+ - 1.7.x -+ - 1.8.x -+ - 1.9.x -+ - 1.10.x -+ - 1.11.x -+ - tip -+matrix: -+ allow_failures: -+ - go: tip -+ fast_finish: true -+install: -+ - go get . -+script: -+ - go test -v ./... -diff --git a/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md b/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md -new file mode 100644 -index 00000000..d2b12302 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md -@@ -0,0 +1,51 @@ -+# Contributing to bluemonday -+ -+Third-party patches are essential for keeping bluemonday secure and offering the features developers want. However there are a few guidelines that we need contributors to follow so that we can maintain the quality of work that developers who use bluemonday expect. -+ -+## Getting Started -+ -+* Make sure you have a [Github account](https://github.com/signup/free) -+ -+## Guidelines -+ -+1. Do not vendor dependencies. As a security package, were we to vendor dependencies the projects that then vendor bluemonday may not receive the latest security updates to the dependencies. By not vendoring dependencies the project that implements bluemonday will vendor the latest version of any dependent packages. Vendoring is a project problem, not a package problem. bluemonday will be tested against the latest version of dependencies periodically and during any PR/merge. -+ -+## Submitting an Issue -+ -+* Submit a ticket for your issue, assuming one does not already exist -+* Clearly describe the issue including the steps to reproduce (with sample input and output) if it is a bug -+ -+If you are reporting a security flaw, you may expect that we will provide the code to fix it for you. Otherwise you may want to submit a pull request to ensure the resolution is applied sooner rather than later: -+ -+* Fork the repository on Github -+* Issue a pull request containing code to resolve the issue -+ -+## Submitting a Pull Request -+ -+* Submit a ticket for your issue, assuming one does not already exist -+* Describe the reason for the pull request and if applicable show some example inputs and outputs to demonstrate what the patch does -+* Fork the repository on Github -+* Before submitting the pull request you should -+ 1. Include tests for your patch, 1 test should encapsulate the entire patch and should refer to the Github issue -+ 1. If you have added new exposed/public functionality, you should ensure it is documented appropriately -+ 1. If you have added new exposed/public functionality, you should consider demonstrating how to use it within one of the helpers or shipped policies if appropriate or within a test if modifying a helper or policy is not appropriate -+ 1. Run all of the tests `go test -v ./...` or `make test` and ensure all tests pass -+ 1. Run gofmt `gofmt -w ./$*` or `make fmt` -+ 1. Run vet `go tool vet *.go` or `make vet` and resolve any issues -+ 1. Install golint using `go get -u github.com/golang/lint/golint` and run vet `golint *.go` or `make lint` and resolve every warning -+* When submitting the pull request you should -+ 1. Note the issue(s) it resolves, i.e. `Closes #6` in the pull request comment to close issue #6 when the pull request is accepted -+ -+Once you have submitted a pull request, we *may* merge it without changes. If we have any comments or feedback, or need you to make changes to your pull request we will update the Github pull request or the associated issue. We expect responses from you within two weeks, and we may close the pull request is there is no activity. -+ -+### Contributor Licence Agreement -+ -+We haven't gone for the formal "Sign a Contributor Licence Agreement" thing that projects like [puppet](https://cla.puppetlabs.com/), [Mojito](https://developer.yahoo.com/cocktails/mojito/cla/) and companies like [Google](http://code.google.com/legal/individual-cla-v1.0.html) are using. -+ -+But we do need to know that we can accept and merge your contributions, so for now the act of contributing a pull request should be considered equivalent to agreeing to a contributor licence agreement, specifically: -+ -+You accept that the act of submitting code to the bluemonday project is to grant a copyright licence to the project that is perpetual, worldwide, non-exclusive, no-charge, royalty free and irrevocable. -+ -+You accept that all who comply with the licence of the project (BSD 3-clause) are permitted to use your contributions to the project. -+ -+You accept, and by submitting code do declare, that you have the legal right to grant such a licence to the project and that each of the contributions is your own original creation. -diff --git a/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md b/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md -new file mode 100644 -index 00000000..b98873f3 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/CREDITS.md -@@ -0,0 +1,6 @@ -+1. Andrew Krasichkov @buglloc https://github.com/buglloc -+1. John Graham-Cumming http://jgc.org/ -+1. Mike Samuel mikesamuel@gmail.com -+1. Dmitri Shuralyov shurcooL@gmail.com -+1. https://github.com/opennota -+1. https://github.com/Gufran -\ No newline at end of file -diff --git a/vendor/github.com/microcosm-cc/bluemonday/LICENSE.md b/vendor/github.com/microcosm-cc/bluemonday/LICENSE.md -new file mode 100644 -index 00000000..f822458e ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/LICENSE.md -@@ -0,0 +1,28 @@ -+Copyright (c) 2014, David Kitchen -+ -+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 organisation (Microcosm) 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 COPYRIGHT HOLDER 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. -diff --git a/vendor/github.com/microcosm-cc/bluemonday/Makefile b/vendor/github.com/microcosm-cc/bluemonday/Makefile -new file mode 100644 -index 00000000..b15dc74f ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/Makefile -@@ -0,0 +1,42 @@ -+# Targets: -+# -+# all: Builds the code locally after testing -+# -+# fmt: Formats the source files -+# build: Builds the code locally -+# vet: Vets the code -+# lint: Runs lint over the code (you do not need to fix everything) -+# test: Runs the tests -+# cover: Gives you the URL to a nice test coverage report -+# -+# install: Builds, tests and installs the code locally -+ -+.PHONY: all fmt build vet lint test cover install -+ -+# The first target is always the default action if `make` is called without -+# args we build and install into $GOPATH so that it can just be run -+ -+all: fmt vet test install -+ -+fmt: -+ @gofmt -s -w ./$* -+ -+build: -+ @go build -+ -+vet: -+ @go vet *.go -+ -+lint: -+ @golint *.go -+ -+test: -+ @go test -v ./... -+ -+cover: COVERAGE_FILE := coverage.out -+cover: -+ @go test -coverprofile=$(COVERAGE_FILE) && \ -+ cover -html=$(COVERAGE_FILE) && rm $(COVERAGE_FILE) -+ -+install: -+ @go install ./... -diff --git a/vendor/github.com/microcosm-cc/bluemonday/README.md b/vendor/github.com/microcosm-cc/bluemonday/README.md -new file mode 100644 -index 00000000..ce679c10 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/README.md -@@ -0,0 +1,350 @@ -+# bluemonday [![Build Status](https://travis-ci.org/microcosm-cc/bluemonday.svg?branch=master)](https://travis-ci.org/microcosm-cc/bluemonday) [![GoDoc](https://godoc.org/github.com/microcosm-cc/bluemonday?status.png)](https://godoc.org/github.com/microcosm-cc/bluemonday) [![Sourcegraph](https://sourcegraph.com/github.com/microcosm-cc/bluemonday/-/badge.svg)](https://sourcegraph.com/github.com/microcosm-cc/bluemonday?badge) -+ -+bluemonday is a HTML sanitizer implemented in Go. It is fast and highly configurable. -+ -+bluemonday takes untrusted user generated content as an input, and will return HTML that has been sanitised against a whitelist of approved HTML elements and attributes so that you can safely include the content in your web page. -+ -+If you accept user generated content, and your server uses Go, you **need** bluemonday. -+ -+The default policy for user generated content (`bluemonday.UGCPolicy().Sanitize()`) turns this: -+```html -+Hello World -+``` -+ -+Into a harmless: -+```html -+Hello World -+``` -+ -+And it turns this: -+```html -+XSS -+``` -+ -+Into this: -+```html -+XSS -+``` -+ -+Whilst still allowing this: -+```html -+ -+ -+ -+``` -+ -+To pass through mostly unaltered (it gained a rel="nofollow" which is a good thing for user generated content): -+```html -+ -+ -+ -+``` -+ -+It protects sites from [XSS](http://en.wikipedia.org/wiki/Cross-site_scripting) attacks. There are many [vectors for an XSS attack](https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet) and the best way to mitigate the risk is to sanitize user input against a known safe list of HTML elements and attributes. -+ -+You should **always** run bluemonday **after** any other processing. -+ -+If you use [blackfriday](https://github.com/russross/blackfriday) or [Pandoc](http://johnmacfarlane.net/pandoc/) then bluemonday should be run after these steps. This ensures that no insecure HTML is introduced later in your process. -+ -+bluemonday is heavily inspired by both the [OWASP Java HTML Sanitizer](https://code.google.com/p/owasp-java-html-sanitizer/) and the [HTML Purifier](http://htmlpurifier.org/). -+ -+## Technical Summary -+ -+Whitelist based, you need to either build a policy describing the HTML elements and attributes to permit (and the `regexp` patterns of attributes), or use one of the supplied policies representing good defaults. -+ -+The policy containing the whitelist is applied using a fast non-validating, forward only, token-based parser implemented in the [Go net/html library](https://godoc.org/golang.org/x/net/html) by the core Go team. -+ -+We expect to be supplied with well-formatted HTML (closing elements for every applicable open element, nested correctly) and so we do not focus on repairing badly nested or incomplete HTML. We focus on simply ensuring that whatever elements do exist are described in the policy whitelist and that attributes and links are safe for use on your web page. [GIGO](http://en.wikipedia.org/wiki/Garbage_in,_garbage_out) does apply and if you feed it bad HTML bluemonday is not tasked with figuring out how to make it good again. -+ -+### Supported Go Versions -+ -+bluemonday is tested against Go 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, and tip. -+ -+We do not support Go 1.0 as we depend on `golang.org/x/net/html` which includes a reference to `io.ErrNoProgress` which did not exist in Go 1.0. -+ -+## Is it production ready? -+ -+*Yes* -+ -+We are using bluemonday in production having migrated from the widely used and heavily field tested OWASP Java HTML Sanitizer. -+ -+We are passing our extensive test suite (including AntiSamy tests as well as tests for any issues raised). Check for any [unresolved issues](https://github.com/microcosm-cc/bluemonday/issues?page=1&state=open) to see whether anything may be a blocker for you. -+ -+We invite pull requests and issues to help us ensure we are offering comprehensive protection against various attacks via user generated content. -+ -+## Usage -+ -+Install in your `${GOPATH}` using `go get -u github.com/microcosm-cc/bluemonday` -+ -+Then call it: -+```go -+package main -+ -+import ( -+ "fmt" -+ -+ "github.com/microcosm-cc/bluemonday" -+) -+ -+func main() { -+ // Do this once for each unique policy, and use the policy for the life of the program -+ // Policy creation/editing is not safe to use in multiple goroutines -+ p := bluemonday.UGCPolicy() -+ -+ // The policy can then be used to sanitize lots of input and it is safe to use the policy in multiple goroutines -+ html := p.Sanitize( -+ `Google`, -+ ) -+ -+ // Output: -+ // Google -+ fmt.Println(html) -+} -+``` -+ -+We offer three ways to call Sanitize: -+```go -+p.Sanitize(string) string -+p.SanitizeBytes([]byte) []byte -+p.SanitizeReader(io.Reader) bytes.Buffer -+``` -+ -+If you are obsessed about performance, `p.SanitizeReader(r).Bytes()` will return a `[]byte` without performing any unnecessary casting of the inputs or outputs. Though the difference is so negligible you should never need to care. -+ -+You can build your own policies: -+```go -+package main -+ -+import ( -+ "fmt" -+ -+ "github.com/microcosm-cc/bluemonday" -+) -+ -+func main() { -+ p := bluemonday.NewPolicy() -+ -+ // Require URLs to be parseable by net/url.Parse and either: -+ // mailto: http:// or https:// -+ p.AllowStandardURLs() -+ -+ // We only allow

and -+ p.AllowAttrs("href").OnElements("a") -+ p.AllowElements("p") -+ -+ html := p.Sanitize( -+ `Google`, -+ ) -+ -+ // Output: -+ // Google -+ fmt.Println(html) -+} -+``` -+ -+We ship two default policies: -+ -+1. `bluemonday.StrictPolicy()` which can be thought of as equivalent to stripping all HTML elements and their attributes as it has nothing on its whitelist. An example usage scenario would be blog post titles where HTML tags are not expected at all and if they are then the elements *and* the content of the elements should be stripped. This is a *very* strict policy. -+2. `bluemonday.UGCPolicy()` which allows a broad selection of HTML elements and attributes that are safe for user generated content. Note that this policy does *not* whitelist iframes, object, embed, styles, script, etc. An example usage scenario would be blog post bodies where a variety of formatting is expected along with the potential for TABLEs and IMGs. -+ -+## Policy Building -+ -+The essence of building a policy is to determine which HTML elements and attributes are considered safe for your scenario. OWASP provide an [XSS prevention cheat sheet](https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet) to help explain the risks, but essentially: -+ -+1. Avoid anything other than the standard HTML elements -+1. Avoid `script`, `style`, `iframe`, `object`, `embed`, `base` elements that allow code to be executed by the client or third party content to be included that can execute code -+1. Avoid anything other than plain HTML attributes with values matched to a regexp -+ -+Basically, you should be able to describe what HTML is fine for your scenario. If you do not have confidence that you can describe your policy please consider using one of the shipped policies such as `bluemonday.UGCPolicy()`. -+ -+To create a new policy: -+```go -+p := bluemonday.NewPolicy() -+``` -+ -+To add elements to a policy either add just the elements: -+```go -+p.AllowElements("b", "strong") -+``` -+ -+Or add elements as a virtue of adding an attribute: -+```go -+// Not the recommended pattern, see the recommendation on using .Matching() below -+p.AllowAttrs("nowrap").OnElements("td", "th") -+``` -+ -+Attributes can either be added to all elements: -+```go -+p.AllowAttrs("dir").Matching(regexp.MustCompile("(?i)rtl|ltr")).Globally() -+``` -+ -+Or attributes can be added to specific elements: -+```go -+// Not the recommended pattern, see the recommendation on using .Matching() below -+p.AllowAttrs("value").OnElements("li") -+``` -+ -+It is **always** recommended that an attribute be made to match a pattern. XSS in HTML attributes is very easy otherwise: -+```go -+// \p{L} matches unicode letters, \p{N} matches unicode numbers -+p.AllowAttrs("title").Matching(regexp.MustCompile(`[\p{L}\p{N}\s\-_',:\[\]!\./\\\(\)&]*`)).Globally() -+``` -+ -+You can stop at any time and call .Sanitize(): -+```go -+// string htmlIn passed in from a HTTP POST -+htmlOut := p.Sanitize(htmlIn) -+``` -+ -+And you can take any existing policy and extend it: -+```go -+p := bluemonday.UGCPolicy() -+p.AllowElements("fieldset", "select", "option") -+``` -+ -+### Links -+ -+Links are difficult beasts to sanitise safely and also one of the biggest attack vectors for malicious content. -+ -+It is possible to do this: -+```go -+p.AllowAttrs("href").Matching(regexp.MustCompile(`(?i)mailto|https?`)).OnElements("a") -+``` -+ -+But that will not protect you as the regular expression is insufficient in this case to have prevented a malformed value doing something unexpected. -+ -+We provide some additional global options for safely working with links. -+ -+`RequireParseableURLs` will ensure that URLs are parseable by Go's `net/url` package: -+```go -+p.RequireParseableURLs(true) -+``` -+ -+If you have enabled parseable URLs then the following option will `AllowRelativeURLs`. By default this is disabled (bluemonday is a whitelist tool... you need to explicitly tell us to permit things) and when disabled it will prevent all local and scheme relative URLs (i.e. `href="localpage.html"`, `href="../home.html"` and even `href="//www.google.com"` are relative): -+```go -+p.AllowRelativeURLs(true) -+``` -+ -+If you have enabled parseable URLs then you can whitelist the schemes (commonly called protocol when thinking of `http` and `https`) that are permitted. Bear in mind that allowing relative URLs in the above option will allow for a blank scheme: -+```go -+p.AllowURLSchemes("mailto", "http", "https") -+``` -+ -+Regardless of whether you have enabled parseable URLs, you can force all URLs to have a rel="nofollow" attribute. This will be added if it does not exist, but only when the `href` is valid: -+```go -+// This applies to "a" "area" "link" elements that have a "href" attribute -+p.RequireNoFollowOnLinks(true) -+``` -+ -+We provide a convenience method that applies all of the above, but you will still need to whitelist the linkable elements for the URL rules to be applied to: -+```go -+p.AllowStandardURLs() -+p.AllowAttrs("cite").OnElements("blockquote", "q") -+p.AllowAttrs("href").OnElements("a", "area") -+p.AllowAttrs("src").OnElements("img") -+``` -+ -+An additional complexity regarding links is the data URI as defined in [RFC2397](http://tools.ietf.org/html/rfc2397). The data URI allows for images to be served inline using this format: -+ -+```html -+ -+``` -+ -+We have provided a helper to verify the mimetype followed by base64 content of data URIs links: -+ -+```go -+p.AllowDataURIImages() -+``` -+ -+That helper will enable GIF, JPEG, PNG and WEBP images. -+ -+It should be noted that there is a potential [security](http://palizine.plynt.com/issues/2010Oct/bypass-xss-filters/) [risk](https://capec.mitre.org/data/definitions/244.html) with the use of data URI links. You should only enable data URI links if you already trust the content. -+ -+We also have some features to help deal with user generated content: -+```go -+p.AddTargetBlankToFullyQualifiedLinks(true) -+``` -+ -+This will ensure that anchor `` links that are fully qualified (the href destination includes a host name) will get `target="_blank"` added to them. -+ -+Additionally any link that has `target="_blank"` after the policy has been applied will also have the `rel` attribute adjusted to add `noopener`. This means a link may start like `` and will end up as ``. It is important to note that the addition of `noopener` is a security feature and not an issue. There is an unfortunate feature to browsers that a browser window opened as a result of `target="_blank"` can still control the opener (your web page) and this protects against that. The background to this can be found here: [https://dev.to/ben/the-targetblank-vulnerability-by-example](https://dev.to/ben/the-targetblank-vulnerability-by-example) -+ -+### Policy Building Helpers -+ -+We also bundle some helpers to simplify policy building: -+```go -+ -+// Permits the "dir", "id", "lang", "title" attributes globally -+p.AllowStandardAttributes() -+ -+// Permits the "img" element and its standard attributes -+p.AllowImages() -+ -+// Permits ordered and unordered lists, and also definition lists -+p.AllowLists() -+ -+// Permits HTML tables and all applicable elements and non-styling attributes -+p.AllowTables() -+``` -+ -+### Invalid Instructions -+ -+The following are invalid: -+```go -+// This does not say where the attributes are allowed, you need to add -+// .Globally() or .OnElements(...) -+// This will be ignored without error. -+p.AllowAttrs("value") -+ -+// This does not say where the attributes are allowed, you need to add -+// .Globally() or .OnElements(...) -+// This will be ignored without error. -+p.AllowAttrs( -+ "type", -+).Matching( -+ regexp.MustCompile("(?i)^(circle|disc|square|a|A|i|I|1)$"), -+) -+``` -+ -+Both examples exhibit the same issue, they declare attributes but do not then specify whether they are whitelisted globally or only on specific elements (and which elements). Attributes belong to one or more elements, and the policy needs to declare this. -+ -+## Limitations -+ -+We are not yet including any tools to help whitelist and sanitize CSS. Which means that unless you wish to do the heavy lifting in a single regular expression (inadvisable), **you should not allow the "style" attribute anywhere**. -+ -+It is not the job of bluemonday to fix your bad HTML, it is merely the job of bluemonday to prevent malicious HTML getting through. If you have mismatched HTML elements, or non-conforming nesting of elements, those will remain. But if you have well-structured HTML bluemonday will not break it. -+ -+## TODO -+ -+* Add support for CSS sanitisation to allow some CSS properties based on a whitelist, possibly using the [Gorilla CSS3 scanner](http://www.gorillatoolkit.org/pkg/css/scanner) - PRs welcome so long as testing covers XSS and demonstrates safety first -+* Investigate whether devs want to blacklist elements and attributes. This would allow devs to take an existing policy (such as the `bluemonday.UGCPolicy()` ) that encapsulates 90% of what they're looking for but does more than they need, and to remove the extra things they do not want to make it 100% what they want -+* Investigate whether devs want a validating HTML mode, in which the HTML elements are not just transformed into a balanced tree (every start tag has a closing tag at the correct depth) but also that elements and character data appear only in their allowed context (i.e. that a `table` element isn't a descendent of a `caption`, that `colgroup`, `thead`, `tbody`, `tfoot` and `tr` are permitted, and that character data is not permitted) -+ -+## Development -+ -+If you have cloned this repo you will probably need the dependency: -+ -+`go get golang.org/x/net/html` -+ -+Gophers can use their familiar tools: -+ -+`go build` -+ -+`go test` -+ -+I personally use a Makefile as it spares typing the same args over and over whilst providing consistency for those of us who jump from language to language and enjoy just typing `make` in a project directory and watch magic happen. -+ -+`make` will build, vet, test and install the library. -+ -+`make clean` will remove the library from a *single* `${GOPATH}/pkg` directory tree -+ -+`make test` will run the tests -+ -+`make cover` will run the tests and *open a browser window* with the coverage report -+ -+`make lint` will run golint (install via `go get github.com/golang/lint/golint`) -+ -+## Long term goals -+ -+1. Open the code to adversarial peer review similar to the [Attack Review Ground Rules](https://code.google.com/p/owasp-java-html-sanitizer/wiki/AttackReviewGroundRules) -+1. Raise funds and pay for an external security review -diff --git a/vendor/github.com/microcosm-cc/bluemonday/doc.go b/vendor/github.com/microcosm-cc/bluemonday/doc.go -new file mode 100644 -index 00000000..71dab608 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/doc.go -@@ -0,0 +1,104 @@ -+// Copyright (c) 2014, David Kitchen -+// -+// 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 organisation (Microcosm) 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 COPYRIGHT HOLDER 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. -+ -+/* -+Package bluemonday provides a way of describing a whitelist of HTML elements -+and attributes as a policy, and for that policy to be applied to untrusted -+strings from users that may contain markup. All elements and attributes not on -+the whitelist will be stripped. -+ -+The default bluemonday.UGCPolicy().Sanitize() turns this: -+ -+ Hello World -+ -+Into the more harmless: -+ -+ Hello World -+ -+And it turns this: -+ -+ XSS -+ -+Into this: -+ -+ XSS -+ -+Whilst still allowing this: -+ -+ -+ -+ -+ -+To pass through mostly unaltered (it gained a rel="nofollow"): -+ -+ -+ -+ -+ -+The primary purpose of bluemonday is to take potentially unsafe user generated -+content (from things like Markdown, HTML WYSIWYG tools, etc) and make it safe -+for you to put on your website. -+ -+It protects sites against XSS (http://en.wikipedia.org/wiki/Cross-site_scripting) -+and other malicious content that a user interface may deliver. There are many -+vectors for an XSS attack (https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet) -+and the safest thing to do is to sanitize user input against a known safe list -+of HTML elements and attributes. -+ -+Note: You should always run bluemonday after any other processing. -+ -+If you use blackfriday (https://github.com/russross/blackfriday) or -+Pandoc (http://johnmacfarlane.net/pandoc/) then bluemonday should be run after -+these steps. This ensures that no insecure HTML is introduced later in your -+process. -+ -+bluemonday is heavily inspired by both the OWASP Java HTML Sanitizer -+(https://code.google.com/p/owasp-java-html-sanitizer/) and the HTML Purifier -+(http://htmlpurifier.org/). -+ -+We ship two default policies, one is bluemonday.StrictPolicy() and can be -+thought of as equivalent to stripping all HTML elements and their attributes as -+it has nothing on its whitelist. -+ -+The other is bluemonday.UGCPolicy() and allows a broad selection of HTML -+elements and attributes that are safe for user generated content. Note that -+this policy does not whitelist iframes, object, embed, styles, script, etc. -+ -+The essence of building a policy is to determine which HTML elements and -+attributes are considered safe for your scenario. OWASP provide an XSS -+prevention cheat sheet ( https://www.google.com/search?q=xss+prevention+cheat+sheet ) -+to help explain the risks, but essentially: -+ -+ 1. Avoid whitelisting anything other than plain HTML elements -+ 2. Avoid whitelisting `script`, `style`, `iframe`, `object`, `embed`, `base` -+ elements -+ 3. Avoid whitelisting anything other than plain HTML elements with simple -+ values that you can match to a regexp -+*/ -+package bluemonday -diff --git a/vendor/github.com/microcosm-cc/bluemonday/go.mod b/vendor/github.com/microcosm-cc/bluemonday/go.mod -new file mode 100644 -index 00000000..fa8453c5 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/go.mod -@@ -0,0 +1,5 @@ -+module github.com/microcosm-cc/bluemonday -+ -+go 1.9 -+ -+require golang.org/x/net v0.0.0-20181220203305-927f97764cc3 -diff --git a/vendor/github.com/microcosm-cc/bluemonday/go.sum b/vendor/github.com/microcosm-cc/bluemonday/go.sum -new file mode 100644 -index 00000000..bee241d1 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/go.sum -@@ -0,0 +1,2 @@ -+golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= -+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -diff --git a/vendor/github.com/microcosm-cc/bluemonday/helpers.go b/vendor/github.com/microcosm-cc/bluemonday/helpers.go -new file mode 100644 -index 00000000..dfa5868d ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/helpers.go -@@ -0,0 +1,297 @@ -+// Copyright (c) 2014, David Kitchen -+// -+// 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 organisation (Microcosm) 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 COPYRIGHT HOLDER 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. -+ -+package bluemonday -+ -+import ( -+ "encoding/base64" -+ "net/url" -+ "regexp" -+) -+ -+// A selection of regular expressions that can be used as .Matching() rules on -+// HTML attributes. -+var ( -+ // CellAlign handles the `align` attribute -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td#attr-align -+ CellAlign = regexp.MustCompile(`(?i)^(center|justify|left|right|char)$`) -+ -+ // CellVerticalAlign handles the `valign` attribute -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td#attr-valign -+ CellVerticalAlign = regexp.MustCompile(`(?i)^(baseline|bottom|middle|top)$`) -+ -+ // Direction handles the `dir` attribute -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/bdo#attr-dir -+ Direction = regexp.MustCompile(`(?i)^(rtl|ltr)$`) -+ -+ // ImageAlign handles the `align` attribute on the `image` tag -+ // http://www.w3.org/MarkUp/Test/Img/imgtest.html -+ ImageAlign = regexp.MustCompile( -+ `(?i)^(left|right|top|texttop|middle|absmiddle|baseline|bottom|absbottom)$`, -+ ) -+ -+ // Integer describes whole positive integers (including 0) used in places -+ // like td.colspan -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td#attr-colspan -+ Integer = regexp.MustCompile(`^[0-9]+$`) -+ -+ // ISO8601 according to the W3 group is only a subset of the ISO8601 -+ // standard: http://www.w3.org/TR/NOTE-datetime -+ // -+ // Used in places like time.datetime -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time#attr-datetime -+ // -+ // Matches patterns: -+ // Year: -+ // YYYY (eg 1997) -+ // Year and month: -+ // YYYY-MM (eg 1997-07) -+ // Complete date: -+ // YYYY-MM-DD (eg 1997-07-16) -+ // Complete date plus hours and minutes: -+ // YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00) -+ // Complete date plus hours, minutes and seconds: -+ // YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00) -+ // Complete date plus hours, minutes, seconds and a decimal fraction of a -+ // second -+ // YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00) -+ ISO8601 = regexp.MustCompile( -+ `^[0-9]{4}(-[0-9]{2}(-[0-9]{2}([ T][0-9]{2}(:[0-9]{2}){1,2}(.[0-9]{1,6})` + -+ `?Z?([\+-][0-9]{2}:[0-9]{2})?)?)?)?$`, -+ ) -+ -+ // ListType encapsulates the common value as well as the latest spec -+ // values for lists -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol#attr-type -+ ListType = regexp.MustCompile(`(?i)^(circle|disc|square|a|A|i|I|1)$`) -+ -+ // SpaceSeparatedTokens is used in places like `a.rel` and the common attribute -+ // `class` which both contain space delimited lists of data tokens -+ // http://www.w3.org/TR/html-markup/datatypes.html#common.data.tokens-def -+ // Regexp: \p{L} matches unicode letters, \p{N} matches unicode numbers -+ SpaceSeparatedTokens = regexp.MustCompile(`^([\s\p{L}\p{N}_-]+)$`) -+ -+ // Number is a double value used on HTML5 meter and progress elements -+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-button-element.html#the-meter-element -+ Number = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$`) -+ -+ // NumberOrPercent is used predominantly as units of measurement in width -+ // and height attributes -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-height -+ NumberOrPercent = regexp.MustCompile(`^[0-9]+[%]?$`) -+ -+ // Paragraph of text in an attribute such as *.'title', img.alt, etc -+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-title -+ // Note that we are not allowing chars that could close tags like '>' -+ Paragraph = regexp.MustCompile(`^[\p{L}\p{N}\s\-_',\[\]!\./\\\(\)]*$`) -+ -+ // dataURIImagePrefix is used by AllowDataURIImages to define the acceptable -+ // prefix of data URIs that contain common web image formats. -+ // -+ // This is not exported as it's not useful by itself, and only has value -+ // within the AllowDataURIImages func -+ dataURIImagePrefix = regexp.MustCompile( -+ `^image/(gif|jpeg|png|webp);base64,`, -+ ) -+) -+ -+// AllowStandardURLs is a convenience function that will enable rel="nofollow" -+// on "a", "area" and "link" (if you have allowed those elements) and will -+// ensure that the URL values are parseable and either relative or belong to the -+// "mailto", "http", or "https" schemes -+func (p *Policy) AllowStandardURLs() { -+ // URLs must be parseable by net/url.Parse() -+ p.RequireParseableURLs(true) -+ -+ // !url.IsAbs() is permitted -+ p.AllowRelativeURLs(true) -+ -+ // Most common URL schemes only -+ p.AllowURLSchemes("mailto", "http", "https") -+ -+ // For all anchors we will add rel="nofollow" if it does not already exist -+ // This applies to "a" "area" "link" -+ p.RequireNoFollowOnLinks(true) -+} -+ -+// AllowStandardAttributes will enable "id", "title" and the language specific -+// attributes "dir" and "lang" on all elements that are whitelisted -+func (p *Policy) AllowStandardAttributes() { -+ // "dir" "lang" are permitted as both language attributes affect charsets -+ // and direction of text. -+ p.AllowAttrs("dir").Matching(Direction).Globally() -+ p.AllowAttrs( -+ "lang", -+ ).Matching(regexp.MustCompile(`[a-zA-Z]{2,20}`)).Globally() -+ -+ // "id" is permitted. This is pretty much as some HTML elements require this -+ // to work well ("dfn" is an example of a "id" being value) -+ // This does create a risk that JavaScript and CSS within your web page -+ // might identify the wrong elements. Ensure that you select things -+ // accurately -+ p.AllowAttrs("id").Matching( -+ regexp.MustCompile(`[a-zA-Z0-9\:\-_\.]+`), -+ ).Globally() -+ -+ // "title" is permitted as it improves accessibility. -+ p.AllowAttrs("title").Matching(Paragraph).Globally() -+} -+ -+// AllowStyling presently enables the class attribute globally. -+// -+// Note: When bluemonday ships a CSS parser and we can safely sanitise that, -+// this will also allow sanitized styling of elements via the style attribute. -+func (p *Policy) AllowStyling() { -+ -+ // "class" is permitted globally -+ p.AllowAttrs("class").Matching(SpaceSeparatedTokens).Globally() -+} -+ -+// AllowImages enables the img element and some popular attributes. It will also -+// ensure that URL values are parseable. This helper does not enable data URI -+// images, for that you should also use the AllowDataURIImages() helper. -+func (p *Policy) AllowImages() { -+ -+ // "img" is permitted -+ p.AllowAttrs("align").Matching(ImageAlign).OnElements("img") -+ p.AllowAttrs("alt").Matching(Paragraph).OnElements("img") -+ p.AllowAttrs("height", "width").Matching(NumberOrPercent).OnElements("img") -+ -+ // Standard URLs enabled -+ p.AllowStandardURLs() -+ p.AllowAttrs("src").OnElements("img") -+} -+ -+// AllowDataURIImages permits the use of inline images defined in RFC2397 -+// http://tools.ietf.org/html/rfc2397 -+// http://en.wikipedia.org/wiki/Data_URI_scheme -+// -+// Images must have a mimetype matching: -+// image/gif -+// image/jpeg -+// image/png -+// image/webp -+// -+// NOTE: There is a potential security risk to allowing data URIs and you should -+// only permit them on content you already trust. -+// http://palizine.plynt.com/issues/2010Oct/bypass-xss-filters/ -+// https://capec.mitre.org/data/definitions/244.html -+func (p *Policy) AllowDataURIImages() { -+ -+ // URLs must be parseable by net/url.Parse() -+ p.RequireParseableURLs(true) -+ -+ // Supply a function to validate images contained within data URI -+ p.AllowURLSchemeWithCustomPolicy( -+ "data", -+ func(url *url.URL) (allowUrl bool) { -+ if url.RawQuery != "" || url.Fragment != "" { -+ return false -+ } -+ -+ matched := dataURIImagePrefix.FindString(url.Opaque) -+ if matched == "" { -+ return false -+ } -+ -+ _, err := base64.StdEncoding.DecodeString(url.Opaque[len(matched):]) -+ if err != nil { -+ return false -+ } -+ -+ return true -+ }, -+ ) -+} -+ -+// AllowLists will enabled ordered and unordered lists, as well as definition -+// lists -+func (p *Policy) AllowLists() { -+ // "ol" "ul" are permitted -+ p.AllowAttrs("type").Matching(ListType).OnElements("ol", "ul") -+ -+ // "li" is permitted -+ p.AllowAttrs("type").Matching(ListType).OnElements("li") -+ p.AllowAttrs("value").Matching(Integer).OnElements("li") -+ -+ // "dl" "dt" "dd" are permitted -+ p.AllowElements("dl", "dt", "dd") -+} -+ -+// AllowTables will enable a rich set of elements and attributes to describe -+// HTML tables -+func (p *Policy) AllowTables() { -+ -+ // "table" is permitted -+ p.AllowAttrs("height", "width").Matching(NumberOrPercent).OnElements("table") -+ p.AllowAttrs("summary").Matching(Paragraph).OnElements("table") -+ -+ // "caption" is permitted -+ p.AllowElements("caption") -+ -+ // "col" "colgroup" are permitted -+ p.AllowAttrs("align").Matching(CellAlign).OnElements("col", "colgroup") -+ p.AllowAttrs("height", "width").Matching( -+ NumberOrPercent, -+ ).OnElements("col", "colgroup") -+ p.AllowAttrs("span").Matching(Integer).OnElements("colgroup", "col") -+ p.AllowAttrs("valign").Matching( -+ CellVerticalAlign, -+ ).OnElements("col", "colgroup") -+ -+ // "thead" "tr" are permitted -+ p.AllowAttrs("align").Matching(CellAlign).OnElements("thead", "tr") -+ p.AllowAttrs("valign").Matching(CellVerticalAlign).OnElements("thead", "tr") -+ -+ // "td" "th" are permitted -+ p.AllowAttrs("abbr").Matching(Paragraph).OnElements("td", "th") -+ p.AllowAttrs("align").Matching(CellAlign).OnElements("td", "th") -+ p.AllowAttrs("colspan", "rowspan").Matching(Integer).OnElements("td", "th") -+ p.AllowAttrs("headers").Matching( -+ SpaceSeparatedTokens, -+ ).OnElements("td", "th") -+ p.AllowAttrs("height", "width").Matching( -+ NumberOrPercent, -+ ).OnElements("td", "th") -+ p.AllowAttrs( -+ "scope", -+ ).Matching( -+ regexp.MustCompile(`(?i)(?:row|col)(?:group)?`), -+ ).OnElements("td", "th") -+ p.AllowAttrs("valign").Matching(CellVerticalAlign).OnElements("td", "th") -+ p.AllowAttrs("nowrap").Matching( -+ regexp.MustCompile(`(?i)|nowrap`), -+ ).OnElements("td", "th") -+ -+ // "tbody" "tfoot" -+ p.AllowAttrs("align").Matching(CellAlign).OnElements("tbody", "tfoot") -+ p.AllowAttrs("valign").Matching( -+ CellVerticalAlign, -+ ).OnElements("tbody", "tfoot") -+} -diff --git a/vendor/github.com/microcosm-cc/bluemonday/policies.go b/vendor/github.com/microcosm-cc/bluemonday/policies.go -new file mode 100644 -index 00000000..570bba88 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/policies.go -@@ -0,0 +1,253 @@ -+// Copyright (c) 2014, David Kitchen -+// -+// 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 organisation (Microcosm) 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 COPYRIGHT HOLDER 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. -+ -+package bluemonday -+ -+import ( -+ "regexp" -+) -+ -+// StrictPolicy returns an empty policy, which will effectively strip all HTML -+// elements and their attributes from a document. -+func StrictPolicy() *Policy { -+ return NewPolicy() -+} -+ -+// StripTagsPolicy is DEPRECATED. Use StrictPolicy instead. -+func StripTagsPolicy() *Policy { -+ return StrictPolicy() -+} -+ -+// UGCPolicy returns a policy aimed at user generated content that is a result -+// of HTML WYSIWYG tools and Markdown conversions. -+// -+// This is expected to be a fairly rich document where as much markup as -+// possible should be retained. Markdown permits raw HTML so we are basically -+// providing a policy to sanitise HTML5 documents safely but with the -+// least intrusion on the formatting expectations of the user. -+func UGCPolicy() *Policy { -+ -+ p := NewPolicy() -+ -+ /////////////////////// -+ // Global attributes // -+ /////////////////////// -+ -+ // "class" is not permitted as we are not allowing users to style their own -+ // content -+ -+ p.AllowStandardAttributes() -+ -+ ////////////////////////////// -+ // Global URL format policy // -+ ////////////////////////////// -+ -+ p.AllowStandardURLs() -+ -+ //////////////////////////////// -+ // Declarations and structure // -+ //////////////////////////////// -+ -+ // "xml" "xslt" "DOCTYPE" "html" "head" are not permitted as we are -+ // expecting user generated content to be a fragment of HTML and not a full -+ // document. -+ -+ ////////////////////////// -+ // Sectioning root tags // -+ ////////////////////////// -+ -+ // "article" and "aside" are permitted and takes no attributes -+ p.AllowElements("article", "aside") -+ -+ // "body" is not permitted as we are expecting user generated content to be a fragment -+ // of HTML and not a full document. -+ -+ // "details" is permitted, including the "open" attribute which can either -+ // be blank or the value "open". -+ p.AllowAttrs( -+ "open", -+ ).Matching(regexp.MustCompile(`(?i)^(|open)$`)).OnElements("details") -+ -+ // "fieldset" is not permitted as we are not allowing forms to be created. -+ -+ // "figure" is permitted and takes no attributes -+ p.AllowElements("figure") -+ -+ // "nav" is not permitted as it is assumed that the site (and not the user) -+ // has defined navigation elements -+ -+ // "section" is permitted and takes no attributes -+ p.AllowElements("section") -+ -+ // "summary" is permitted and takes no attributes -+ p.AllowElements("summary") -+ -+ ////////////////////////// -+ // Headings and footers // -+ ////////////////////////// -+ -+ // "footer" is not permitted as we expect user content to be a fragment and -+ // not structural to this extent -+ -+ // "h1" through "h6" are permitted and take no attributes -+ p.AllowElements("h1", "h2", "h3", "h4", "h5", "h6") -+ -+ // "header" is not permitted as we expect user content to be a fragment and -+ // not structural to this extent -+ -+ // "hgroup" is permitted and takes no attributes -+ p.AllowElements("hgroup") -+ -+ ///////////////////////////////////// -+ // Content grouping and separating // -+ ///////////////////////////////////// -+ -+ // "blockquote" is permitted, including the "cite" attribute which must be -+ // a standard URL. -+ p.AllowAttrs("cite").OnElements("blockquote") -+ -+ // "br" "div" "hr" "p" "span" "wbr" are permitted and take no attributes -+ p.AllowElements("br", "div", "hr", "p", "span", "wbr") -+ -+ /////////// -+ // Links // -+ /////////// -+ -+ // "a" is permitted -+ p.AllowAttrs("href").OnElements("a") -+ -+ // "area" is permitted along with the attributes that map image maps work -+ p.AllowAttrs("name").Matching( -+ regexp.MustCompile(`^([\p{L}\p{N}_-]+)$`), -+ ).OnElements("map") -+ p.AllowAttrs("alt").Matching(Paragraph).OnElements("area") -+ p.AllowAttrs("coords").Matching( -+ regexp.MustCompile(`^([0-9]+,)+[0-9]+$`), -+ ).OnElements("area") -+ p.AllowAttrs("href").OnElements("area") -+ p.AllowAttrs("rel").Matching(SpaceSeparatedTokens).OnElements("area") -+ p.AllowAttrs("shape").Matching( -+ regexp.MustCompile(`(?i)^(default|circle|rect|poly)$`), -+ ).OnElements("area") -+ p.AllowAttrs("usemap").Matching( -+ regexp.MustCompile(`(?i)^#[\p{L}\p{N}_-]+$`), -+ ).OnElements("img") -+ -+ // "link" is not permitted -+ -+ ///////////////////// -+ // Phrase elements // -+ ///////////////////// -+ -+ // The following are all inline phrasing elements -+ p.AllowElements("abbr", "acronym", "cite", "code", "dfn", "em", -+ "figcaption", "mark", "s", "samp", "strong", "sub", "sup", "var") -+ -+ // "q" is permitted and "cite" is a URL and handled by URL policies -+ p.AllowAttrs("cite").OnElements("q") -+ -+ // "time" is permitted -+ p.AllowAttrs("datetime").Matching(ISO8601).OnElements("time") -+ -+ //////////////////// -+ // Style elements // -+ //////////////////// -+ -+ // block and inline elements that impart no semantic meaning but style the -+ // document -+ p.AllowElements("b", "i", "pre", "small", "strike", "tt", "u") -+ -+ // "style" is not permitted as we are not yet sanitising CSS and it is an -+ // XSS attack vector -+ -+ ////////////////////// -+ // HTML5 Formatting // -+ ////////////////////// -+ -+ // "bdi" "bdo" are permitted -+ p.AllowAttrs("dir").Matching(Direction).OnElements("bdi", "bdo") -+ -+ // "rp" "rt" "ruby" are permitted -+ p.AllowElements("rp", "rt", "ruby") -+ -+ /////////////////////////// -+ // HTML5 Change tracking // -+ /////////////////////////// -+ -+ // "del" "ins" are permitted -+ p.AllowAttrs("cite").Matching(Paragraph).OnElements("del", "ins") -+ p.AllowAttrs("datetime").Matching(ISO8601).OnElements("del", "ins") -+ -+ /////////// -+ // Lists // -+ /////////// -+ -+ p.AllowLists() -+ -+ //////////// -+ // Tables // -+ //////////// -+ -+ p.AllowTables() -+ -+ /////////// -+ // Forms // -+ /////////// -+ -+ // By and large, forms are not permitted. However there are some form -+ // elements that can be used to present data, and we do permit those -+ // -+ // "button" "fieldset" "input" "keygen" "label" "output" "select" "datalist" -+ // "textarea" "optgroup" "option" are all not permitted -+ -+ // "meter" is permitted -+ p.AllowAttrs( -+ "value", -+ "min", -+ "max", -+ "low", -+ "high", -+ "optimum", -+ ).Matching(Number).OnElements("meter") -+ -+ // "progress" is permitted -+ p.AllowAttrs("value", "max").Matching(Number).OnElements("progress") -+ -+ ////////////////////// -+ // Embedded content // -+ ////////////////////// -+ -+ // Vast majority not permitted -+ // "audio" "canvas" "embed" "iframe" "object" "param" "source" "svg" "track" -+ // "video" are all not permitted -+ -+ p.AllowImages() -+ -+ return p -+} -diff --git a/vendor/github.com/microcosm-cc/bluemonday/policy.go b/vendor/github.com/microcosm-cc/bluemonday/policy.go -new file mode 100644 -index 00000000..f61d98f5 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/policy.go -@@ -0,0 +1,552 @@ -+// Copyright (c) 2014, David Kitchen -+// -+// 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 organisation (Microcosm) 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 COPYRIGHT HOLDER 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. -+ -+package bluemonday -+ -+import ( -+ "net/url" -+ "regexp" -+ "strings" -+) -+ -+// Policy encapsulates the whitelist of HTML elements and attributes that will -+// be applied to the sanitised HTML. -+// -+// You should use bluemonday.NewPolicy() to create a blank policy as the -+// unexported fields contain maps that need to be initialized. -+type Policy struct { -+ -+ // Declares whether the maps have been initialized, used as a cheap check to -+ // ensure that those using Policy{} directly won't cause nil pointer -+ // exceptions -+ initialized bool -+ -+ // If true then we add spaces when stripping tags, specifically the closing -+ // tag is replaced by a space character. -+ addSpaces bool -+ -+ // When true, add rel="nofollow" to HTML anchors -+ requireNoFollow bool -+ -+ // When true, add rel="nofollow" to HTML anchors -+ // Will add for href="http://foo" -+ // Will skip for href="/foo" or href="foo" -+ requireNoFollowFullyQualifiedLinks bool -+ -+ // When true add target="_blank" to fully qualified links -+ // Will add for href="http://foo" -+ // Will skip for href="/foo" or href="foo" -+ addTargetBlankToFullyQualifiedLinks bool -+ -+ // When true, URLs must be parseable by "net/url" url.Parse() -+ requireParseableURLs bool -+ -+ // When true, u, _ := url.Parse("url"); !u.IsAbs() is permitted -+ allowRelativeURLs bool -+ -+ // When true, allow data attributes. -+ allowDataAttributes bool -+ -+ // map[htmlElementName]map[htmlAttributeName]attrPolicy -+ elsAndAttrs map[string]map[string]attrPolicy -+ -+ // map[htmlAttributeName]attrPolicy -+ globalAttrs map[string]attrPolicy -+ -+ // If urlPolicy is nil, all URLs with matching schema are allowed. -+ // Otherwise, only the URLs with matching schema and urlPolicy(url) -+ // returning true are allowed. -+ allowURLSchemes map[string]urlPolicy -+ -+ // If an element has had all attributes removed as a result of a policy -+ // being applied, then the element would be removed from the output. -+ // -+ // However some elements are valid and have strong layout meaning without -+ // any attributes, i.e. . To prevent those being removed we maintain -+ // a list of elements that are allowed to have no attributes and that will -+ // be maintained in the output HTML. -+ setOfElementsAllowedWithoutAttrs map[string]struct{} -+ -+ setOfElementsToSkipContent map[string]struct{} -+} -+ -+type attrPolicy struct { -+ -+ // optional pattern to match, when not nil the regexp needs to match -+ // otherwise the attribute is removed -+ regexp *regexp.Regexp -+} -+ -+type attrPolicyBuilder struct { -+ p *Policy -+ -+ attrNames []string -+ regexp *regexp.Regexp -+ allowEmpty bool -+} -+ -+type urlPolicy func(url *url.URL) (allowUrl bool) -+ -+// init initializes the maps if this has not been done already -+func (p *Policy) init() { -+ if !p.initialized { -+ p.elsAndAttrs = make(map[string]map[string]attrPolicy) -+ p.globalAttrs = make(map[string]attrPolicy) -+ p.allowURLSchemes = make(map[string]urlPolicy) -+ p.setOfElementsAllowedWithoutAttrs = make(map[string]struct{}) -+ p.setOfElementsToSkipContent = make(map[string]struct{}) -+ p.initialized = true -+ } -+} -+ -+// NewPolicy returns a blank policy with nothing whitelisted or permitted. This -+// is the recommended way to start building a policy and you should now use -+// AllowAttrs() and/or AllowElements() to construct the whitelist of HTML -+// elements and attributes. -+func NewPolicy() *Policy { -+ -+ p := Policy{} -+ -+ p.addDefaultElementsWithoutAttrs() -+ p.addDefaultSkipElementContent() -+ -+ return &p -+} -+ -+// AllowAttrs takes a range of HTML attribute names and returns an -+// attribute policy builder that allows you to specify the pattern and scope of -+// the whitelisted attribute. -+// -+// The attribute policy is only added to the core policy when either Globally() -+// or OnElements(...) are called. -+func (p *Policy) AllowAttrs(attrNames ...string) *attrPolicyBuilder { -+ -+ p.init() -+ -+ abp := attrPolicyBuilder{ -+ p: p, -+ allowEmpty: false, -+ } -+ -+ for _, attrName := range attrNames { -+ abp.attrNames = append(abp.attrNames, strings.ToLower(attrName)) -+ } -+ -+ return &abp -+} -+ -+// AllowDataAttributes whitelists all data attributes. We can't specify the name -+// of each attribute exactly as they are customized. -+// -+// NOTE: These values are not sanitized and applications that evaluate or process -+// them without checking and verification of the input may be at risk if this option -+// is enabled. This is a 'caveat emptor' option and the person enabling this option -+// needs to fully understand the potential impact with regards to whatever application -+// will be consuming the sanitized HTML afterwards, i.e. if you know you put a link in a -+// data attribute and use that to automatically load some new window then you're giving -+// the author of a HTML fragment the means to open a malicious destination automatically. -+// Use with care! -+func (p *Policy) AllowDataAttributes() { -+ p.allowDataAttributes = true -+} -+ -+// AllowNoAttrs says that attributes on element are optional. -+// -+// The attribute policy is only added to the core policy when OnElements(...) -+// are called. -+func (p *Policy) AllowNoAttrs() *attrPolicyBuilder { -+ -+ p.init() -+ -+ abp := attrPolicyBuilder{ -+ p: p, -+ allowEmpty: true, -+ } -+ return &abp -+} -+ -+// AllowNoAttrs says that attributes on element are optional. -+// -+// The attribute policy is only added to the core policy when OnElements(...) -+// are called. -+func (abp *attrPolicyBuilder) AllowNoAttrs() *attrPolicyBuilder { -+ -+ abp.allowEmpty = true -+ -+ return abp -+} -+ -+// Matching allows a regular expression to be applied to a nascent attribute -+// policy, and returns the attribute policy. Calling this more than once will -+// replace the existing regexp. -+func (abp *attrPolicyBuilder) Matching(regex *regexp.Regexp) *attrPolicyBuilder { -+ -+ abp.regexp = regex -+ -+ return abp -+} -+ -+// OnElements will bind an attribute policy to a given range of HTML elements -+// and return the updated policy -+func (abp *attrPolicyBuilder) OnElements(elements ...string) *Policy { -+ -+ for _, element := range elements { -+ element = strings.ToLower(element) -+ -+ for _, attr := range abp.attrNames { -+ -+ if _, ok := abp.p.elsAndAttrs[element]; !ok { -+ abp.p.elsAndAttrs[element] = make(map[string]attrPolicy) -+ } -+ -+ ap := attrPolicy{} -+ if abp.regexp != nil { -+ ap.regexp = abp.regexp -+ } -+ -+ abp.p.elsAndAttrs[element][attr] = ap -+ } -+ -+ if abp.allowEmpty { -+ abp.p.setOfElementsAllowedWithoutAttrs[element] = struct{}{} -+ -+ if _, ok := abp.p.elsAndAttrs[element]; !ok { -+ abp.p.elsAndAttrs[element] = make(map[string]attrPolicy) -+ } -+ } -+ } -+ -+ return abp.p -+} -+ -+// Globally will bind an attribute policy to all HTML elements and return the -+// updated policy -+func (abp *attrPolicyBuilder) Globally() *Policy { -+ -+ for _, attr := range abp.attrNames { -+ if _, ok := abp.p.globalAttrs[attr]; !ok { -+ abp.p.globalAttrs[attr] = attrPolicy{} -+ } -+ -+ ap := attrPolicy{} -+ if abp.regexp != nil { -+ ap.regexp = abp.regexp -+ } -+ -+ abp.p.globalAttrs[attr] = ap -+ } -+ -+ return abp.p -+} -+ -+// AllowElements will append HTML elements to the whitelist without applying an -+// attribute policy to those elements (the elements are permitted -+// sans-attributes) -+func (p *Policy) AllowElements(names ...string) *Policy { -+ p.init() -+ -+ for _, element := range names { -+ element = strings.ToLower(element) -+ -+ if _, ok := p.elsAndAttrs[element]; !ok { -+ p.elsAndAttrs[element] = make(map[string]attrPolicy) -+ } -+ } -+ -+ return p -+} -+ -+// RequireNoFollowOnLinks will result in all tags having a rel="nofollow" -+// added to them if one does not already exist -+// -+// Note: This requires p.RequireParseableURLs(true) and will enable it. -+func (p *Policy) RequireNoFollowOnLinks(require bool) *Policy { -+ -+ p.requireNoFollow = require -+ p.requireParseableURLs = true -+ -+ return p -+} -+ -+// RequireNoFollowOnFullyQualifiedLinks will result in all tags that point -+// to a non-local destination (i.e. starts with a protocol and has a host) -+// having a rel="nofollow" added to them if one does not already exist -+// -+// Note: This requires p.RequireParseableURLs(true) and will enable it. -+func (p *Policy) RequireNoFollowOnFullyQualifiedLinks(require bool) *Policy { -+ -+ p.requireNoFollowFullyQualifiedLinks = require -+ p.requireParseableURLs = true -+ -+ return p -+} -+ -+// AddTargetBlankToFullyQualifiedLinks will result in all tags that point -+// to a non-local destination (i.e. starts with a protocol and has a host) -+// having a target="_blank" added to them if one does not already exist -+// -+// Note: This requires p.RequireParseableURLs(true) and will enable it. -+func (p *Policy) AddTargetBlankToFullyQualifiedLinks(require bool) *Policy { -+ -+ p.addTargetBlankToFullyQualifiedLinks = require -+ p.requireParseableURLs = true -+ -+ return p -+} -+ -+// RequireParseableURLs will result in all URLs requiring that they be parseable -+// by "net/url" url.Parse() -+// This applies to: -+// - a.href -+// - area.href -+// - blockquote.cite -+// - img.src -+// - link.href -+// - script.src -+func (p *Policy) RequireParseableURLs(require bool) *Policy { -+ -+ p.requireParseableURLs = require -+ -+ return p -+} -+ -+// AllowRelativeURLs enables RequireParseableURLs and then permits URLs that -+// are parseable, have no schema information and url.IsAbs() returns false -+// This permits local URLs -+func (p *Policy) AllowRelativeURLs(require bool) *Policy { -+ -+ p.RequireParseableURLs(true) -+ p.allowRelativeURLs = require -+ -+ return p -+} -+ -+// AllowURLSchemes will append URL schemes to the whitelist -+// Example: p.AllowURLSchemes("mailto", "http", "https") -+func (p *Policy) AllowURLSchemes(schemes ...string) *Policy { -+ p.init() -+ -+ p.RequireParseableURLs(true) -+ -+ for _, scheme := range schemes { -+ scheme = strings.ToLower(scheme) -+ -+ // Allow all URLs with matching scheme. -+ p.allowURLSchemes[scheme] = nil -+ } -+ -+ return p -+} -+ -+// AllowURLSchemeWithCustomPolicy will append URL schemes with -+// a custom URL policy to the whitelist. -+// Only the URLs with matching schema and urlPolicy(url) -+// returning true will be allowed. -+func (p *Policy) AllowURLSchemeWithCustomPolicy( -+ scheme string, -+ urlPolicy func(url *url.URL) (allowUrl bool), -+) *Policy { -+ -+ p.init() -+ -+ p.RequireParseableURLs(true) -+ -+ scheme = strings.ToLower(scheme) -+ -+ p.allowURLSchemes[scheme] = urlPolicy -+ -+ return p -+} -+ -+// AddSpaceWhenStrippingTag states whether to add a single space " " when -+// removing tags that are not whitelisted by the policy. -+// -+// This is useful if you expect to strip tags in dense markup and may lose the -+// value of whitespace. -+// -+// For example: "

Hello

World

"" would be sanitized to "HelloWorld" -+// with the default value of false, but you may wish to sanitize this to -+// " Hello World " by setting AddSpaceWhenStrippingTag to true as this would -+// retain the intent of the text. -+func (p *Policy) AddSpaceWhenStrippingTag(allow bool) *Policy { -+ -+ p.addSpaces = allow -+ -+ return p -+} -+ -+// SkipElementsContent adds the HTML elements whose tags is needed to be removed -+// with its content. -+func (p *Policy) SkipElementsContent(names ...string) *Policy { -+ -+ p.init() -+ -+ for _, element := range names { -+ element = strings.ToLower(element) -+ -+ if _, ok := p.setOfElementsToSkipContent[element]; !ok { -+ p.setOfElementsToSkipContent[element] = struct{}{} -+ } -+ } -+ -+ return p -+} -+ -+// AllowElementsContent marks the HTML elements whose content should be -+// retained after removing the tag. -+func (p *Policy) AllowElementsContent(names ...string) *Policy { -+ -+ p.init() -+ -+ for _, element := range names { -+ delete(p.setOfElementsToSkipContent, strings.ToLower(element)) -+ } -+ -+ return p -+} -+ -+// addDefaultElementsWithoutAttrs adds the HTML elements that we know are valid -+// without any attributes to an internal map. -+// i.e. we know that
is valid, but isn't valid as the "dir" attr -+// is mandatory -+func (p *Policy) addDefaultElementsWithoutAttrs() { -+ p.init() -+ -+ p.setOfElementsAllowedWithoutAttrs["abbr"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["acronym"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["address"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["article"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["aside"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["audio"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["b"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["bdi"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["blockquote"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["body"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["br"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["button"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["canvas"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["caption"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["center"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["cite"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["code"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["col"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["colgroup"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["datalist"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["dd"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["del"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["details"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["dfn"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["div"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["dl"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["dt"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["em"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["fieldset"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["figcaption"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["figure"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["footer"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["h1"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["h2"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["h3"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["h4"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["h5"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["h6"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["head"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["header"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["hgroup"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["hr"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["html"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["i"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["ins"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["kbd"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["li"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["mark"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["marquee"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["nav"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["ol"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["optgroup"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["option"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["p"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["pre"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["q"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["rp"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["rt"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["ruby"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["s"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["samp"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["script"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["section"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["select"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["small"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["span"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["strike"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["strong"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["style"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["sub"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["summary"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["sup"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["svg"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["table"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["tbody"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["td"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["textarea"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["tfoot"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["th"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["thead"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["title"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["time"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["tr"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["tt"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["u"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["ul"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["var"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["video"] = struct{}{} -+ p.setOfElementsAllowedWithoutAttrs["wbr"] = struct{}{} -+ -+} -+ -+// addDefaultSkipElementContent adds the HTML elements that we should skip -+// rendering the character content of, if the element itself is not allowed. -+// This is all character data that the end user would not normally see. -+// i.e. if we exclude a tag. -+func (p *Policy) addDefaultSkipElementContent() { -+ p.init() -+ -+ p.setOfElementsToSkipContent["frame"] = struct{}{} -+ p.setOfElementsToSkipContent["frameset"] = struct{}{} -+ p.setOfElementsToSkipContent["iframe"] = struct{}{} -+ p.setOfElementsToSkipContent["noembed"] = struct{}{} -+ p.setOfElementsToSkipContent["noframes"] = struct{}{} -+ p.setOfElementsToSkipContent["noscript"] = struct{}{} -+ p.setOfElementsToSkipContent["nostyle"] = struct{}{} -+ p.setOfElementsToSkipContent["object"] = struct{}{} -+ p.setOfElementsToSkipContent["script"] = struct{}{} -+ p.setOfElementsToSkipContent["style"] = struct{}{} -+ p.setOfElementsToSkipContent["title"] = struct{}{} -+} -diff --git a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go -new file mode 100644 -index 00000000..65ed89b7 ---- /dev/null -+++ b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go -@@ -0,0 +1,581 @@ -+// Copyright (c) 2014, David Kitchen -+// -+// 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 organisation (Microcosm) 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 COPYRIGHT HOLDER 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. -+ -+package bluemonday -+ -+import ( -+ "bytes" -+ "io" -+ "net/url" -+ "regexp" -+ "strings" -+ -+ "golang.org/x/net/html" -+) -+ -+var ( -+ dataAttribute = regexp.MustCompile("^data-.+") -+ dataAttributeXMLPrefix = regexp.MustCompile("^xml.+") -+ dataAttributeInvalidChars = regexp.MustCompile("[A-Z;]+") -+) -+ -+// Sanitize takes a string that contains a HTML fragment or document and applies -+// the given policy whitelist. -+// -+// It returns a HTML string that has been sanitized by the policy or an empty -+// string if an error has occurred (most likely as a consequence of extremely -+// malformed input) -+func (p *Policy) Sanitize(s string) string { -+ if strings.TrimSpace(s) == "" { -+ return s -+ } -+ -+ return p.sanitize(strings.NewReader(s)).String() -+} -+ -+// SanitizeBytes takes a []byte that contains a HTML fragment or document and applies -+// the given policy whitelist. -+// -+// It returns a []byte containing the HTML that has been sanitized by the policy -+// or an empty []byte if an error has occurred (most likely as a consequence of -+// extremely malformed input) -+func (p *Policy) SanitizeBytes(b []byte) []byte { -+ if len(bytes.TrimSpace(b)) == 0 { -+ return b -+ } -+ -+ return p.sanitize(bytes.NewReader(b)).Bytes() -+} -+ -+// SanitizeReader takes an io.Reader that contains a HTML fragment or document -+// and applies the given policy whitelist. -+// -+// It returns a bytes.Buffer containing the HTML that has been sanitized by the -+// policy. Errors during sanitization will merely return an empty result. -+func (p *Policy) SanitizeReader(r io.Reader) *bytes.Buffer { -+ return p.sanitize(r) -+} -+ -+// Performs the actual sanitization process. -+func (p *Policy) sanitize(r io.Reader) *bytes.Buffer { -+ -+ // It is possible that the developer has created the policy via: -+ // p := bluemonday.Policy{} -+ // rather than: -+ // p := bluemonday.NewPolicy() -+ // If this is the case, and if they haven't yet triggered an action that -+ // would initiliaze the maps, then we need to do that. -+ p.init() -+ -+ var ( -+ buff bytes.Buffer -+ skipElementContent bool -+ skippingElementsCount int64 -+ skipClosingTag bool -+ closingTagToSkipStack []string -+ mostRecentlyStartedToken string -+ ) -+ -+ tokenizer := html.NewTokenizer(r) -+ for { -+ if tokenizer.Next() == html.ErrorToken { -+ err := tokenizer.Err() -+ if err == io.EOF { -+ // End of input means end of processing -+ return &buff -+ } -+ -+ // Raw tokenizer error -+ return &bytes.Buffer{} -+ } -+ -+ token := tokenizer.Token() -+ switch token.Type { -+ case html.DoctypeToken: -+ -+ // DocType is not handled as there is no safe parsing mechanism -+ // provided by golang.org/x/net/html for the content, and this can -+ // be misused to insert HTML tags that are not then sanitized -+ // -+ // One might wish to recursively sanitize here using the same policy -+ // but I will need to do some further testing before considering -+ // this. -+ -+ case html.CommentToken: -+ -+ // Comments are ignored by default -+ -+ case html.StartTagToken: -+ -+ mostRecentlyStartedToken = token.Data -+ -+ aps, ok := p.elsAndAttrs[token.Data] -+ if !ok { -+ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { -+ skipElementContent = true -+ skippingElementsCount++ -+ } -+ if p.addSpaces { -+ buff.WriteString(" ") -+ } -+ break -+ } -+ -+ if len(token.Attr) != 0 { -+ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) -+ } -+ -+ if len(token.Attr) == 0 { -+ if !p.allowNoAttrs(token.Data) { -+ skipClosingTag = true -+ closingTagToSkipStack = append(closingTagToSkipStack, token.Data) -+ if p.addSpaces { -+ buff.WriteString(" ") -+ } -+ break -+ } -+ } -+ -+ if !skipElementContent { -+ buff.WriteString(token.String()) -+ } -+ -+ case html.EndTagToken: -+ -+ if mostRecentlyStartedToken == token.Data { -+ mostRecentlyStartedToken = "" -+ } -+ -+ if skipClosingTag && closingTagToSkipStack[len(closingTagToSkipStack)-1] == token.Data { -+ closingTagToSkipStack = closingTagToSkipStack[:len(closingTagToSkipStack)-1] -+ if len(closingTagToSkipStack) == 0 { -+ skipClosingTag = false -+ } -+ if p.addSpaces { -+ buff.WriteString(" ") -+ } -+ break -+ } -+ -+ if _, ok := p.elsAndAttrs[token.Data]; !ok { -+ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { -+ skippingElementsCount-- -+ if skippingElementsCount == 0 { -+ skipElementContent = false -+ } -+ } -+ if p.addSpaces { -+ buff.WriteString(" ") -+ } -+ break -+ } -+ -+ if !skipElementContent { -+ buff.WriteString(token.String()) -+ } -+ -+ case html.SelfClosingTagToken: -+ -+ aps, ok := p.elsAndAttrs[token.Data] -+ if !ok { -+ if p.addSpaces { -+ buff.WriteString(" ") -+ } -+ break -+ } -+ -+ if len(token.Attr) != 0 { -+ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) -+ } -+ -+ if len(token.Attr) == 0 && !p.allowNoAttrs(token.Data) { -+ if p.addSpaces { -+ buff.WriteString(" ") -+ } -+ break -+ } -+ -+ if !skipElementContent { -+ buff.WriteString(token.String()) -+ } -+ -+ case html.TextToken: -+ -+ if !skipElementContent { -+ switch mostRecentlyStartedToken { -+ case "script": -+ // not encouraged, but if a policy allows JavaScript we -+ // should not HTML escape it as that would break the output -+ buff.WriteString(token.Data) -+ case "style": -+ // not encouraged, but if a policy allows CSS styles we -+ // should not HTML escape it as that would break the output -+ buff.WriteString(token.Data) -+ default: -+ // HTML escape the text -+ buff.WriteString(token.String()) -+ } -+ } -+ default: -+ // A token that didn't exist in the html package when we wrote this -+ return &bytes.Buffer{} -+ } -+ } -+} -+ -+// sanitizeAttrs takes a set of element attribute policies and the global -+// attribute policies and applies them to the []html.Attribute returning a set -+// of html.Attributes that match the policies -+func (p *Policy) sanitizeAttrs( -+ elementName string, -+ attrs []html.Attribute, -+ aps map[string]attrPolicy, -+) []html.Attribute { -+ -+ if len(attrs) == 0 { -+ return attrs -+ } -+ -+ // Builds a new attribute slice based on the whether the attribute has been -+ // whitelisted explicitly or globally. -+ cleanAttrs := []html.Attribute{} -+ for _, htmlAttr := range attrs { -+ if p.allowDataAttributes { -+ // If we see a data attribute, let it through. -+ if isDataAttribute(htmlAttr.Key) { -+ cleanAttrs = append(cleanAttrs, htmlAttr) -+ continue -+ } -+ } -+ // Is there an element specific attribute policy that applies? -+ if ap, ok := aps[htmlAttr.Key]; ok { -+ if ap.regexp != nil { -+ if ap.regexp.MatchString(htmlAttr.Val) { -+ cleanAttrs = append(cleanAttrs, htmlAttr) -+ continue -+ } -+ } else { -+ cleanAttrs = append(cleanAttrs, htmlAttr) -+ continue -+ } -+ } -+ -+ // Is there a global attribute policy that applies? -+ if ap, ok := p.globalAttrs[htmlAttr.Key]; ok { -+ -+ if ap.regexp != nil { -+ if ap.regexp.MatchString(htmlAttr.Val) { -+ cleanAttrs = append(cleanAttrs, htmlAttr) -+ } -+ } else { -+ cleanAttrs = append(cleanAttrs, htmlAttr) -+ } -+ } -+ } -+ -+ if len(cleanAttrs) == 0 { -+ // If nothing was allowed, let's get out of here -+ return cleanAttrs -+ } -+ // cleanAttrs now contains the attributes that are permitted -+ -+ if linkable(elementName) { -+ if p.requireParseableURLs { -+ // Ensure URLs are parseable: -+ // - a.href -+ // - area.href -+ // - link.href -+ // - blockquote.cite -+ // - q.cite -+ // - img.src -+ // - script.src -+ tmpAttrs := []html.Attribute{} -+ for _, htmlAttr := range cleanAttrs { -+ switch elementName { -+ case "a", "area", "link": -+ if htmlAttr.Key == "href" { -+ if u, ok := p.validURL(htmlAttr.Val); ok { -+ htmlAttr.Val = u -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } -+ break -+ } -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ case "blockquote", "q": -+ if htmlAttr.Key == "cite" { -+ if u, ok := p.validURL(htmlAttr.Val); ok { -+ htmlAttr.Val = u -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } -+ break -+ } -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ case "img", "script": -+ if htmlAttr.Key == "src" { -+ if u, ok := p.validURL(htmlAttr.Val); ok { -+ htmlAttr.Val = u -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } -+ break -+ } -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ default: -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } -+ } -+ cleanAttrs = tmpAttrs -+ } -+ -+ if (p.requireNoFollow || -+ p.requireNoFollowFullyQualifiedLinks || -+ p.addTargetBlankToFullyQualifiedLinks) && -+ len(cleanAttrs) > 0 { -+ -+ // Add rel="nofollow" if a "href" exists -+ switch elementName { -+ case "a", "area", "link": -+ var hrefFound bool -+ var externalLink bool -+ for _, htmlAttr := range cleanAttrs { -+ if htmlAttr.Key == "href" { -+ hrefFound = true -+ -+ u, err := url.Parse(htmlAttr.Val) -+ if err != nil { -+ continue -+ } -+ if u.Host != "" { -+ externalLink = true -+ } -+ -+ continue -+ } -+ } -+ -+ if hrefFound { -+ var ( -+ noFollowFound bool -+ targetBlankFound bool -+ ) -+ -+ addNoFollow := (p.requireNoFollow || -+ externalLink && p.requireNoFollowFullyQualifiedLinks) -+ -+ addTargetBlank := (externalLink && -+ p.addTargetBlankToFullyQualifiedLinks) -+ -+ tmpAttrs := []html.Attribute{} -+ for _, htmlAttr := range cleanAttrs { -+ -+ var appended bool -+ if htmlAttr.Key == "rel" && addNoFollow { -+ -+ if strings.Contains(htmlAttr.Val, "nofollow") { -+ noFollowFound = true -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ appended = true -+ } else { -+ htmlAttr.Val += " nofollow" -+ noFollowFound = true -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ appended = true -+ } -+ } -+ -+ if elementName == "a" && htmlAttr.Key == "target" { -+ if htmlAttr.Val == "_blank" { -+ targetBlankFound = true -+ } -+ if addTargetBlank && !targetBlankFound { -+ htmlAttr.Val = "_blank" -+ targetBlankFound = true -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ appended = true -+ } -+ } -+ -+ if !appended { -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } -+ } -+ if noFollowFound || targetBlankFound { -+ cleanAttrs = tmpAttrs -+ } -+ -+ if addNoFollow && !noFollowFound { -+ rel := html.Attribute{} -+ rel.Key = "rel" -+ rel.Val = "nofollow" -+ cleanAttrs = append(cleanAttrs, rel) -+ } -+ -+ if elementName == "a" && addTargetBlank && !targetBlankFound { -+ rel := html.Attribute{} -+ rel.Key = "target" -+ rel.Val = "_blank" -+ targetBlankFound = true -+ cleanAttrs = append(cleanAttrs, rel) -+ } -+ -+ if targetBlankFound { -+ // target="_blank" has a security risk that allows the -+ // opened window/tab to issue JavaScript calls against -+ // window.opener, which in effect allow the destination -+ // of the link to control the source: -+ // https://dev.to/ben/the-targetblank-vulnerability-by-example -+ // -+ // To mitigate this risk, we need to add a specific rel -+ // attribute if it is not already present. -+ // rel="noopener" -+ // -+ // Unfortunately this is processing the rel twice (we -+ // already looked at it earlier ^^) as we cannot be sure -+ // of the ordering of the href and rel, and whether we -+ // have fully satisfied that we need to do this. This -+ // double processing only happens *if* target="_blank" -+ // is true. -+ var noOpenerAdded bool -+ tmpAttrs := []html.Attribute{} -+ for _, htmlAttr := range cleanAttrs { -+ var appended bool -+ if htmlAttr.Key == "rel" { -+ if strings.Contains(htmlAttr.Val, "noopener") { -+ noOpenerAdded = true -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } else { -+ htmlAttr.Val += " noopener" -+ noOpenerAdded = true -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } -+ -+ appended = true -+ } -+ if !appended { -+ tmpAttrs = append(tmpAttrs, htmlAttr) -+ } -+ } -+ if noOpenerAdded { -+ cleanAttrs = tmpAttrs -+ } else { -+ // rel attr was not found, or else noopener would -+ // have been added already -+ rel := html.Attribute{} -+ rel.Key = "rel" -+ rel.Val = "noopener" -+ cleanAttrs = append(cleanAttrs, rel) -+ } -+ -+ } -+ } -+ default: -+ } -+ } -+ } -+ -+ return cleanAttrs -+} -+ -+func (p *Policy) allowNoAttrs(elementName string) bool { -+ _, ok := p.setOfElementsAllowedWithoutAttrs[elementName] -+ return ok -+} -+ -+func (p *Policy) validURL(rawurl string) (string, bool) { -+ if p.requireParseableURLs { -+ // URLs are valid if when space is trimmed the URL is valid -+ rawurl = strings.TrimSpace(rawurl) -+ -+ // URLs cannot contain whitespace, unless it is a data-uri -+ if (strings.Contains(rawurl, " ") || -+ strings.Contains(rawurl, "\t") || -+ strings.Contains(rawurl, "\n")) && -+ !strings.HasPrefix(rawurl, `data:`) { -+ return "", false -+ } -+ -+ // URLs are valid if they parse -+ u, err := url.Parse(rawurl) -+ if err != nil { -+ return "", false -+ } -+ -+ if u.Scheme != "" { -+ -+ urlPolicy, ok := p.allowURLSchemes[u.Scheme] -+ if !ok { -+ return "", false -+ -+ } -+ -+ if urlPolicy == nil || urlPolicy(u) == true { -+ return u.String(), true -+ } -+ -+ return "", false -+ } -+ -+ if p.allowRelativeURLs { -+ if u.String() != "" { -+ return u.String(), true -+ } -+ } -+ -+ return "", false -+ } -+ -+ return rawurl, true -+} -+ -+func linkable(elementName string) bool { -+ switch elementName { -+ case "a", "area", "blockquote", "img", "link", "script": -+ return true -+ default: -+ return false -+ } -+} -+ -+func isDataAttribute(val string) bool { -+ if !dataAttribute.MatchString(val) { -+ return false -+ } -+ rest := strings.Split(val, "data-") -+ if len(rest) == 1 { -+ return false -+ } -+ // data-xml* is invalid. -+ if dataAttributeXMLPrefix.MatchString(rest[1]) { -+ return false -+ } -+ // no uppercase or semi-colons allowed. -+ if dataAttributeInvalidChars.MatchString(rest[1]) { -+ return false -+ } -+ return true -+} -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 0bae0d5d..ff6a5d78 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -49,6 +49,8 @@ github.com/lib/pq/oid - github.com/lib/pq/scram - # github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d - github.com/mb0/diff -+# github.com/microcosm-cc/bluemonday v1.0.2 -+github.com/microcosm-cc/bluemonday - # github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d - github.com/nu7hatch/gouuid - # github.com/pkg/errors v0.8.0 diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix new file mode 100644 index 0000000000..699ec033d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "etcd"; + version = "3.4.9"; + + #vendorSha256 = null; revert to `null` for > 3.4.9 + + vendorSha256 = "1fhrycl8m8ddb7mwasbyfiwrl4d9lfdk7zd3mxb7ahkipdp2c94z"; + deleteVendor = true; + + src = fetchFromGitHub { + owner = "etcd-io"; + repo = "etcd"; + rev = "v${version}"; + sha256 = "16l4wmnm7mkhpb2vzf6xnhhyx6lj8xx3z6x1bfs05idajnrw824p"; + }; + + buildPhase = '' + patchShebangs . + ./build + ./functional/build + ''; + + installPhase = '' + install -Dm755 bin/* bin/functional/cmd/* -t $out/bin + ''; + + meta = with lib; { + description = "Distributed reliable key-value store for the most critical data of a distributed system"; + license = licenses.asl20; + homepage = "https://etcd.io/"; + maintainers = with maintainers; [ offline zowoq ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/etcd/default.nix b/third_party/nixpkgs/pkgs/servers/etcd/default.nix index bdb4b4883d..4c0df659f3 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { pname = "etcd"; - version = "3.3.20"; + version = "3.3.22"; - # change to "go.etcd.io/etcd" for >= 3.4 goPackagePath = "github.com/coreos/etcd"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "1iqq12kkky3cl28k7fabqqyx1i0a2wmbkq0bs8yhiwywp076k08w"; + sha256 = "1rd390qfx9k20j9gh1wp1g9ygc571f2kv1dg2wvqij3kwydhymcj"; }; buildPhase = '' @@ -34,7 +33,7 @@ buildGoPackage rec { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline zowoq ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/gortr/default.nix b/third_party/nixpkgs/pkgs/servers/gortr/default.nix index 3b9ed15a84..c0534d0f89 100644 --- a/third_party/nixpkgs/pkgs/servers/gortr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gortr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.1"; + version = "0.14.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "03wxlras2akk2ig8sxzs89nvbc6zr2kbcmjlqldjdfhs1rcg82ra"; + sha256 = "1srwlpl8g0pzrxb2nyp6xvg10cidm2i6qb9m08k2g296hfgdqqq3"; }; vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index e1cf8ada01..0b9dd3e447 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -1,18 +1,14 @@ -From 55cb3ba4458bd43588e7921906d091d001130ab0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Thu, 9 Apr 2020 07:20:46 +0100 +From 9d730514540929dc95a7313bdb385bab95d9a28c Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Wed, 20 May 2020 23:23:23 +0200 Subject: [PATCH] setup.py: relax dependencies -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Signed-off-by: Jörg Thalheim --- - setup.py | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) + setup.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py -index 0c56e89b67..ba04546130 100755 +index 1473fd1f5f..149af58b3a 100755 --- a/setup.py +++ b/setup.py @@ -32,24 +32,24 @@ PROJECT_URLS = { @@ -23,25 +19,24 @@ index 0c56e89b67..ba04546130 100755 + "aiohttp>=3.6.1", "astral==1.10.1", "async_timeout==3.0.1", -- "attrs==19.3.0", -+ "attrs>=19.3.0", + "attrs==19.3.0", "bcrypt==3.1.7", -- "certifi>=2020.4.5.1", -+ "certifi>=2019.11.28", + "certifi>=2020.4.5.1", "ciso8601==2.1.3", - "importlib-metadata==1.6.0", + "importlib-metadata>=1.5.0", "jinja2>=2.11.1", "PyJWT==1.7.1", # PyJWT has loose dependency. We want the latest one. -- "cryptography==2.9", +- "cryptography==2.9.2", + "cryptography>=2.9", "pip>=8.0.3", "python-slugify==4.0.0", - "pytz>=2019.03", +- "pytz>=2020.1", - "pyyaml==5.3.1", - "requests==2.23.0", - "ruamel.yaml==0.15.100", ++ "pytz>=2019.03", + "pyyaml>=5.2", + "requests>=2.22", + "ruamel.yaml>=0.15.100", @@ -49,5 +44,5 @@ index 0c56e89b67..ba04546130 100755 "voluptuous-serialize==2.3.0", ] -- -2.26.1 +2.26.2 diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix index 17e5559821..6b7758dd5e 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.8.0"; + version = "0.9.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0qq42b2a0rlrzaxwf3zqks5gzgv0hf4pz4yjjl6ldnizw8fcj40n"; + sha256 = "1a31ky2p5w8byf0bjgma6xi328jj690qqksm3dwbi3v8dpqvghgf"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 96ca0c8389..aff2e9dc0c 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.109.6"; + version = "0.110.1"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -10,6 +10,7 @@ "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome "ads" = ps: with ps; [ ]; # missing inputs: pyads "aftership" = ps: with ps; [ ]; # missing inputs: pyaftership + "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly "airvisual" = ps: with ps; [ pyairvisual]; @@ -75,6 +76,7 @@ "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird + "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy "blinksticklight" = ps: with ps; [ BlinkStick]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt @@ -94,6 +96,7 @@ "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt + "bsblan" = ps: with ps; [ ]; # missing inputs: bsblan "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar @@ -154,6 +157,7 @@ "device_automation" = ps: with ps; [ aiohttp-cors]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; + "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors]; "digital_ocean" = ps: with ps; [ digital-ocean]; @@ -243,6 +247,7 @@ "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant + "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou @@ -251,6 +256,7 @@ "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async + "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortigate" = ps: with ps; [ ]; # missing inputs: pyfgt "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam @@ -328,8 +334,9 @@ "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 + "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors]; # missing inputs: base36 fnvhash + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg]; # missing inputs: PyTurboJPEG base36 fnvhash "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip @@ -379,7 +386,7 @@ "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator "iss" = ps: with ps; [ ]; # missing inputs: pyiss - "isy994" = ps: with ps; [ ]; # missing inputs: PyISY + "isy994" = ps: with ps; [ ]; # missing inputs: pyisy "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir "itunes" = ps: with ps; [ ]; "izone" = ps: with ps; [ ]; # missing inputs: python-izone @@ -533,6 +540,7 @@ "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo "nuki" = ps: with ps; [ ]; # missing inputs: pynuki + "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "nut" = ps: with ps; [ ]; # missing inputs: pynut2 "nws" = ps: with ps; [ ]; # missing inputs: pynws "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 @@ -546,14 +554,14 @@ "onboarding" = ps: with ps; [ aiohttp-cors]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet "onkyo" = ps: with ps; [ onkyo-eiscp]; - "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: onvif-zeep-async + "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; - "opengarage" = ps: with ps; [ ]; + "opengarage" = ps: with ps; [ ]; # missing inputs: open-garage "openhardwaremonitor" = ps: with ps; [ ]; "openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice "opensensemap" = ps: with ps; [ ]; # missing inputs: opensensemap-api @@ -569,6 +577,7 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors]; + "ozw" = ps: with ps; [ ]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect]; @@ -604,7 +613,7 @@ "proxy" = ps: with ps; [ pillow]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd - "pulseaudio_loopback" = ps: with ps; [ ]; + "pulseaudio_loopback" = ps: with ps; [ pulsectl]; "push" = ps: with ps; [ aiohttp-cors]; "pushbullet" = ps: with ps; [ pushbullet]; "pushover" = ps: with ps; [ pushover-complete]; @@ -647,7 +656,7 @@ "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API - "roku" = ps: with ps; [ roku]; + "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy "route53" = ps: with ps; [ boto3]; # missing inputs: ipify "rova" = ps: with ps; [ ]; # missing inputs: rova @@ -736,7 +745,7 @@ "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime "spotify" = ps: with ps; [ aiohttp-cors spotipy]; "sql" = ps: with ps; [ sqlalchemy]; - "squeezebox" = ps: with ps; [ ]; + "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox "ssdp" = ps: with ps; [ defusedxml netdisco]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank @@ -836,6 +845,7 @@ "unifi_direct" = ps: with ps; [ pexpect]; "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled "universal" = ps: with ps; [ ]; + "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro]; @@ -883,6 +893,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois + "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api @@ -919,8 +930,9 @@ "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy]; # missing inputs: bellows-homeassistant zigpy-cc zigpy-xbee-homeassistant zigpy-zigate + "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "zigbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 9471a5faad..2d6d734745 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/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.109.6"; + hassVersion = "0.110.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -84,9 +84,9 @@ in with py.pkgs; buildPythonApplication rec { # PyPI tarball is missing tests/ directory src = fetchFromGitHub { owner = "home-assistant"; - repo = "home-assistant"; + repo = "core"; rev = version; - sha256 = "133l6n165yivnc9qmrahk423hmns0hn0dbnx4ys7yaw3x5hqwyns"; + sha256 = "1495kl997mvk9k11lk1ahv5w0yc0185qmxwa1h51j6d0zyqwz749"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 9fb543d06c..3481a2d1bd 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/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 = "20200505.0"; + version = "20200519.1"; src = fetchPypi { inherit pname version; - sha256 = "0h19ddgnws5l49fwr4b0j99j4xkhpxkwdsmq71q36akd4s5lj0ll"; + sha256 = "149v56q5anzdfxf0dw1h39vdmcigx732a7abqjfb0xny5484iq8w"; }; # no Python tests implemented diff --git a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix b/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix index 49c11bf462..4f34fde185 100644 --- a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.26.v20200117"; + version = "9.4.29.v20200521"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0wgh7vap0h6gkz6pk8iycvhwmybyxv25ssinwxxrnzk8jg25g89i"; + sha256 = "0ir7rzr5479k7whgy0fx6bjj7x978ghx4fxc64i39hg2kzcp5dbi"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index 1111990435..4ea7401969 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -73,8 +73,8 @@ in src = fetchFromGitHub { owner = "aperezdc"; repo = "ngx-fancyindex"; - rev = "v0.4.3"; - sha256 = "12xdx6a76sfrq0yciylvyjlnvyczszpadn31jqya8c2dzdkyyx7f"; + rev = "v0.4.4"; + sha256 = "14xmzcl608pr7hb7wng6hpz7by51cfnxlszbka3zhp3kk86ljsi6"; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index 9203f405a7..099caf8796 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "0lzk9nv7fbyc0jbsigw54310pvpwfrvji58z7a08j03vypc0v3x4"; + sha256 = "105mjlbzgv1c8argwgs0d9wm28m06nqi5hrk3358zg2jaa7ahaqf"; rev = "v${version}"; }; @@ -27,4 +27,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ paluh ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/servers/kapow/default.nix b/third_party/nixpkgs/pkgs/servers/kapow/default.nix new file mode 100644 index 0000000000..1990dba381 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/kapow/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kapow"; + version = "0.5.3"; + + goPackagePath = "github.com/BBVA/kapow"; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "BBVA"; + repo = pname; + rev = "v${version}"; + sha256 = "0m5b9lvg5d908d27khyx9p3567pap1b2mxl8fk7cxhb51r89jypj"; + }; + + vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy"; + + meta = with stdenv.lib; { + homepage = "https://github.com/BBVA/kapow"; + description = "Expose command-line tools over HTTP"; + license = licenses.asl20; + maintainers = with maintainers; [ nilp0inter ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix index fd27d18b50..a110df0fb4 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.10"; + pname = "dovecot"; + version = "2.3.10.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,8 +21,8 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite sqlite; src = fetchurl { - url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7"; + url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; + sha256 = "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix index 5c73042e6c..a85cb92a3f 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix @@ -7,11 +7,12 @@ }: stdenv.mkDerivation rec { - name = "exim-4.92.3"; + pname = "exim"; + version = "4.93.0.4"; src = fetchurl { - url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "1zfj4zblv5881qxpzkrg3f6a96pbcq270s9p6p1w85lfxjsknif4"; + url = "https://ftp.exim.org/pub/exim/exim4/fixes/${pname}-${version}.tar.xz"; + sha256 = "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak"; }; nativeBuildInputs = [ pkgconfig ]; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { s:^\(FIXED_NEVER_USERS\)=root$:\1=0: s:^# \(WITH_CONTENT_SCAN\)=.*:\1=yes: s:^# \(AUTH_PLAINTEXT\)=.*:\1=yes: - s:^# \(SUPPORT_TLS\)=.*:\1=yes: + s:^# \(USE_OPENSSL\)=.*:\1=yes: s:^# \(USE_OPENSSL_PC=openssl\)$:\1: s:^# \(LOG_FILE_PATH=syslog\)$:\1: s:^# \(HAVE_IPV6=yes\)$:\1: diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index 134913e85a..0c2cd68cb1 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.6.4p1"; + version = "6.7.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2"; + sha256 = "1f8bp40ywyixflg5qbnang6l210bv4vqa1k2pgm2356bp7bmsgy1"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 3962f7b2da..1cb92baa93 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.12.4"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0psr17ai42ma9923g9bj3q9fd8kph9rx7jpxsxwbfzr2y6lwr306"; + sha256 = "10s34h1qh9k88bxv0l0whvy7kirmx9kwgdxrz7sv3rv42cyr1989"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index dea3d7b1b2..f93054b286 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,32 +1,31 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, olm }: -let -webp = fetchFromGitHub { - owner = "chai2010"; - repo = "webp"; - rev = "19c584e49a98c31e2138c82fd0108435cd80d182"; - sha256 = "1bqf1ifsfw5dwvnc9vl3dhp775qv5hgl34219lvnja0bj6pq5zks"; -}; -in buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-21-1"; + version = "2020-05-27"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "e0aea74abf090bc9dc499332b28bf03640c162f8"; - sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5"; + rev = "7cf19b0908dec6cb8239aebc3f79ee88dccbfc51"; + sha256 = "14cadqvbcjd9vp6dix3jzn0l071r3i9sz0lwpppgzpid8mg9zbx4"; }; - vendorSha256 = "0j397zyjs7v5q2jjd3l0wz4lh1fh45whgxjp7cwgc332ch9j2010"; + buildInputs = [ olm ]; - overrideModAttrs = (_: { - postBuild = '' - rm -r vendor/github.com/chai2010/webp - cp -r --reflink=auto ${webp} vendor/github.com/chai2010/webp - ''; - }); + vendorSha256 = "01psqvxkf13had7gkg1cbzf2flac4a6ivlb7vfzw7s50vhwkb95d"; + + overrideModAttrs = _: { + postBuild = '' + rm -r vendor/github.com/chai2010/webp + cp -r --reflink=auto ${fetchFromGitHub { + owner = "chai2010"; + repo = "webp"; + rev = "3da79ec3d682694d42bfd211db18fc1343c07cd7"; + sha256 = "0gh3g52vz8na153mjmxkl80g3dvrcjw77xpjs1c02vagpj9jyw46"; + }} vendor/github.com/chai2010/webp + ''; + }; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; @@ -34,4 +33,4 @@ buildGoModule { license = licenses.agpl3; maintainers = with maintainers; [ vskilet ma27 ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index fb284970af..58276ff863 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.5"; + version = "1.6.6"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1pr7igk7ic9wc2yax26wy3ar223vilf2qyzrknz36g61dxqa6k8z"; + sha256 = "1xrj7vy05nc6bky4wnrmrbxfibvk5vq4dp2fwk4jk4amzbn0x3wh"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index 43c4125097..8420f53aba 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -1,26 +1,29 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "miniflux"; - version = "2.0.19"; + version = "2.0.21"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "121qy1af1qbc09c3yfwhpk6r3hwmh3jg6gjx8ygfv3hfrss9yfll"; + sha256 = "0yhzmfs35jfc7vq26r9c14v4lnv8sxj3pv23r2cx2rfx47b1zmk7"; }; goPackagePath = "miniflux.app"; + nativeBuildInputs = [ installShellFiles ]; + doCheck = true; buildFlagsArray = '' - -ldflags=-X miniflux.app/version.Version=${version} + -ldflags=-s -w -X miniflux.app/version.Version=${version} ''; postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux + installManPage go/src/${goPackagePath}/miniflux.1 ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 7fdd9c70d9..aa1a31bf8c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomJsSupport ? false, phantomjs2 ? null }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "grafana"; - version = "6.7.3"; - - goPackagePath = "github.com/grafana/grafana"; + version = "7.0.1"; excludedPackages = [ "release_publisher" ]; @@ -12,27 +10,25 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "14yrfrn59r3mxbkhs7mg7nlhnvvrmq959r8w4aj6m7wgr32jj8wl"; + sha256 = "0b99lcffgd5yq2q9w38bc4qkljpm6k2z1vyix8qgpvnw50dxx2fz"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "17h70h6cz1bdhczjqa68kxzfm4vi95zdnqzah8hcjr7rwnx874kr"; + sha256 = "0vq4xy0050ajymlld1scg7lywmm6l6b619y4r7x5ql9jv1nx4apb"; }; + vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; + postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ --replace 'var version = "5.0.0"' 'var version = "${version}"' ''; - preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; - postInstall = '' tar -xvf $srcStatic mkdir -p $out/share/grafana mv grafana-*/{public,conf,tools} $out/share/grafana/ - '' + lib.optionalString phantomJsSupport '' - ln -sf ${phantomjs2}/bin/phantomjs $out/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index e8804702f0..668695aa8d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "0dz0icbkwpmysl5jyljmj783xdzrbbxbfxfkizw7gcs8jjxbqvfl"; + sha256 = "137lnd69p8qfg2z8l32dr1mrk2lhrxjx392xfij11sy5i9blfc3n"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix index 584382b47b..ba10cfa148 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "node_exporter"; - version = "0.18.1"; + version = "1.0.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "0s3sp1gj86p7npxl38hkgs6ymd3wjjmc5hydyg1b5wh0x3yvpx07"; + sha256 = "12v7vaknvll3g1n7730miwxiwz8nbjq8y18lzljq9d9s8apcy32f"; }; # FIXME: tests fail due to read-only nix store @@ -27,7 +27,7 @@ buildGoPackage rec { description = "Prometheus exporter for machine metrics"; homepage = "https://github.com/prometheus/node_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz globin ]; + maintainers = with maintainers; [ benley fpletz globin Frostman ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index ed2ed29ab8..a456cda86e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "snmp_exporter"; - version = "0.17.0"; + version = "0.18.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "0s2vgcpxannyl1zllc3ixww02832s53zijws64lhd8mxrylqvpcp"; + sha256 = "1zdkb036zy2sw1drlp2m2z1yb7857d2y3yn2y3l0a1kkd4zcqkk4"; }; buildInputs = [ net-snmp ]; @@ -21,7 +21,7 @@ buildGoPackage rec { description = "SNMP Exporter for Prometheus"; homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ oida willibutz ]; + maintainers = with maintainers; [ oida willibutz Frostman ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index d7a1296a7d..5f9f3b80f8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,7 +4,7 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.20.0"; + version = "5.20.1"; shortRev = "3a1ac58"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,7 +13,7 @@ let owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "0hnsgd6ryrl1y2prkavm7psqjnppkkfd891xkzbdfzblxsafs8cw"; + sha256 = "0wrcchz878sq7zhkb8p0s93k92xppihv5yyvkl363xs6519xzm7m"; }; inherit subPackages postInstall; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index b12ad4dd46..adc42173f8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.1"; + version = "1.14.3"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "17lzz0f9vzyfwr3kgwg6i6361hqzq54jnaaw9rdc132xppdx03nr"; + sha256 = "11rd54brdbxb5ari6zan7gyr0fa1m0rmwcn5a8h8dla3xprw30wp"; }; vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 3c82c1996e..9a7cc07750 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -28,12 +28,12 @@ let }; in { nextcloud17 = generic { - version = "17.0.4"; - sha256 = "0cj5mng0nmj3hz30pyz3g19kj3mkm5ca8si3sw3arv61dmw6c5g6"; + version = "17.0.6"; + sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx"; }; nextcloud18 = generic { - version = "18.0.3"; - sha256 = "0wpxa35zj81i541j3cjq6klsjwwc5slryzvjjl7zjc32004yfrvv"; + version = "18.0.4"; + sha256 = "0aa3f4xbkzacfw0h9aic0ywk5mqlwka83qaszizj8lmk68kf3n7s"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index 8e75ee4fbd..8089fa46f9 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lua, jemalloc, nixosTests }: +{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "5.0.8"; + version = "6.0.3"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1msfxr97aflk5zdgq8xvdbsgmzb906x0vdc1v6l2ccs35z2fmizk"; + sha256 = "0fmvbhbgkrw75kqzgpklasylzff4zd0sxy2cvsrgg4pyh776v95w"; }; # Cross-compiling fixes @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua ]; + buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]; + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] + ++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 4aecc851b8..d998784b3f 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc , kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: -with (import ./srcs.nix { inherit fetchurl; }); +with (import ./srcs.nix { + inherit fetchurl; +}); let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; @@ -16,6 +18,22 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; + patches = [ + # openafs 5.6 patches, included in the next release + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/34f1689b7288688550119638ee9959e453fde414.patch"; + sha256 = "0rxjqzr8c5ajlk8wrhgjc1qp1934qiriqdi0qxsnk4gj5ibbk4d5"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/355ea43f0d1b7feae1b3af58bc33af12838db7c3.patch"; + sha256 = "1f9xn8ql6vnxglpj3dvi30sj8vkncazjab2rc13hbw48nvsvcnhm"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/17d38e31e6f2e237a7fb4dfb46841060296310b6.patch"; + sha256 = "14dydxfm0f5fvnj0kmvgm3bgh0ajhh04i3l7l0hr9cpmwl7vrlcg"; + }) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix new file mode 100644 index 0000000000..37307eae40 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix @@ -0,0 +1,45 @@ +{ lib, python3, fetchFromGitHub }: + +let + python = python3.override { + packageOverrides = self: super: { + tornado = super.tornado.overridePythonAttrs (oldAttrs: rec { + version = "6.0.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1p5n7sw4580pkybywg93p8ddqdj9lhhy72rzswfa801vlidx9qhg"; + }; + }); + }; + }; +in with python.pkgs; buildPythonApplication rec { + pname = "pinnwand"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0j5fbdma9zahx8d4xdj167gqkshzn7c98587awrzxv7wwbmlazxd"; + }; + + propagatedBuildInputs = [ + click + docutils + tornado + pygments-better-html + toml + sqlalchemy + ]; + + # tests are only available when fetching from GitHub, where they in turn don't have a setup.py :( + checkPhase = '' + $out/bin/pinnwand --help > /dev/null + ''; + + meta = with lib; { + homepage = "https://supakeen.com/project/pinnwand/"; + license = licenses.mit; + description = "A Python pastebin that tries to keep it simple."; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index 300d341cf8..0aae779106 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -24,6 +24,7 @@ , libtasn1 , tdb , cmocka +, nixosTests , enableLDAP ? false, openldap , enablePrinting ? false, cups @@ -42,11 +43,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.2"; + version = "4.12.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "0l514s2xhsy1lspzgvibbzs80zi84zxr2wx4d40hq85yb2lg5434"; + sha256 = "09w7aap1cjc41ayhaksm1igc7p7gl40fad4a1l6q4ds9a2jbrb9z"; }; outputs = [ "out" "dev" "man" ]; @@ -148,6 +149,10 @@ stdenv.mkDerivation rec { find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \; ''; + passthru = { + tests.samba = nixosTests.samba; + }; + meta = with stdenv.lib; { homepage = "https://www.samba.org"; description = "The standard Windows interoperability suite of programs for Linux and Unix"; diff --git a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix index e18d96013e..bbfb0315d9 100644 --- a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub, gensio, libyaml, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.1.1"; + version = "4.1.8"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1zl68mmd7pp10cjv1jk8rs2dlbwvzskyb58qvc7ph7vc6957lfhc"; + sha256 = "0xxxxlfi4wln2l86ybdsc42qcj37mnac2s2baj6s7mqri8alaa14"; }; - buildInputs = [ autoreconfHook gensio libyaml ]; + buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; meta = with lib; { description = "Serial to network connection server"; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index 3bf72043ec..e67b7244a3 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/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.30"; + version = "0.21.33"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "19j0hm2d2q279kzmdjbjgfhjwcp7071a2mmvsnb0167wdyaq4bcf"; + sha256 = "0ilgjm21psfb0ix32qm560976wn84qg0y5cg7506ybwsynlmway2"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 314e9275c8..9a28991955 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.3.1"; + version = "4.4.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "12mfydlva05dczjhrw14xq9zr0hqqyszlwivvq2zj9h1p9agm7fn"; + sha256 = "0wr2nivp0b8vk355rnv4bygiashq98q9zhfgdbxzhm7bgxd01rk2"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 5f1b6b819e..76aa4c4ffe 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost, gmp, cgal, mpfr }: +{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }: stdenv.mkDerivation rec { pname = "pgrouting"; - version = "2.6.3"; + version = "3.0.0"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ postgresql boost gmp cgal mpfr ]; + buildInputs = [ postgresql boost ]; src = fetchFromGitHub { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "0jdjb8476vjgc7i26v2drcqjvhdbsk1wx243fddffg169nb664ml"; + sha256 = "101lyhhfcv3chrp2h5q04l155hr6wvx427cv1kgd4ryzk88wxx5i"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index cda9244e19..419bec6823 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.0"; + version = "1.7.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0n234ard9sldpbdqvbq2i48xyiyj8ljirsbspsax11f8yzy9ziac"; + sha256 = "11h1vvchnipcxvvbjb5y4bgkdzdsik5cq8k8yzkrqz8q33zmjvgg"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index 27a627dd48..ff2f993ecc 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.2.4"; pname = "Tautulli"; pythonPath = [ python.pkgs.setuptools ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0ni3dg5ly1xdyj1g931y2by3w17f0q031mpnrw2slhy6i792r5bp"; + sha256 = "0yg7r7yscx6jbs1lnl9nbax3v9r6ppvhr4igdm3gbvd2803j8fs7"; }; buildPhase = ":"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix new file mode 100644 index 0000000000..8ef6a9afa0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchzip, php, writeText, nixosTests }: + +let + phpExt = php.withExtensions + ({ enabled, all }: with all; [ json filter mysqlnd mysqli pdo pdo_mysql ]); +in stdenv.mkDerivation rec { + pname = "engelsystem"; + version = "3.1.0"; + + src = fetchzip { + url = + "https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; + sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; + # This is needed, because the zip contains a directory with world write access, which is not allowed in nix + extraPostFetch = "chmod -R a-w $out"; + }; + + buildInputs = [ phpExt ]; + + installPhase = '' + runHook preInstall + + # prepare + rm -r ./storage/ + rm -r ./docker/ + + ln -sf /etc/engelsystem/config.php ./config/config.php + ln -sf /var/lib/engelsystem/storage/ ./storage + + mkdir -p $out/share/engelsystem + mkdir -p $out/bin + cp -r . $out/share/engelsystem + + echo $(command -v php) + # The patchShebangAuto function always used the php without extensions, so path the shebang manually + sed -i -e "1 s|.*|#\!${phpExt}/bin/php|" "$out/share/engelsystem/bin/migrate" + ln -s "$out/share/engelsystem/bin/migrate" "$out/bin/migrate" + + runHook postInstall + ''; + + passthru.tests = nixosTests.engelsystem; + + meta = with stdenv.lib; { + description = + "Coordinate your helpers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; + license = licenses.gpl2; + homepage = "https://engelsystem.de"; + maintainers = with maintainers; [ kloenk ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index 98bd8e0027..62de7620c5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, writeText }: let - version = "3.8.2"; + version = "3.8.3"; 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 = "134vxsbslk7sfalmgcp744aygaxz2k080d14j8nkivk9zhplds53"; + sha256 = "1anjv4gvbb6833j04a1b4aaysnl4h0x96sr1hhm4nm5kq2fimjd1"; }; phpConfig = writeText "config.php" '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix new file mode 100644 index 0000000000..3e78b5d9d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix @@ -0,0 +1,76 @@ +{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir +, openssl_1_1, openldap, sope, libmemcached, curl }: with lib; gnustep.stdenv.mkDerivation rec { + pname = "SOGo"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "inverse-inc"; + repo = pname; + rev = "SOGo-${version}"; + sha256 = "1xxad23a8zy6w850x5nrrf54db0x73lc9drmc5kpfk870fk2lmr0"; + }; + + nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; + buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) ] + ++ optional (openldap != null) openldap; + + patches = [ + # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches + (fetchpatch { + url = "https://sources.debian.org/data/main/s/sogo/4.3.0-1/debian/patches/0005-Remove-build-date.patch"; + sha256 = "0lrh3bkfj3r0brahfkyb0g7zx7r2jjd5cxzjl43nqla0fs09wsh8"; + }) + ]; + + postPatch = '' + # Exclude NIX_ variables + sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure + + # Disable argument verification because $out is not a GNUStep prefix + sed -i 's/^validateArgs$//g' configure + + # Patch exception-generating python scripts + patchShebangs . + + # Move all GNUStep makefiles to a common directory + mkdir -p makefiles + cp -r {${gnustep.make},${sope}}/share/GNUstep/Makefiles/* makefiles + + # Modify the search path for GNUStep makefiles + find . -type f -name GNUmakefile -exec sed -i "s:\\$.GNUSTEP_MAKEFILES.:$PWD/makefiles:g" {} + + ''; + + configureFlags = [ "--disable-debug" "--with-ssl=ssl" ]; + + preFixup = '' + # Create gnustep.conf + mkdir -p $out/share/GNUstep + cp ${gnustep.make}/etc/GNUstep/GNUstep.conf $out/share/GNUstep/ + sed -i "s:${gnustep.make}:$out:g" $out/share/GNUstep/GNUstep.conf + + # Link in GNUstep base + ${lndir}/bin/lndir ${gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/ + + # Link in sope + ${lndir}/bin/lndir ${sope}/ $out/ + + # sbin fixup + mkdir -p $out/bin + mv $out/sbin/* $out/bin + rmdir $out/sbin + + # Make sogo find its files + for bin in $out/bin/*; do + wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf + done + ''; + + meta = { + description = "SOGo is a very fast and scalable modern collaboration suite (groupware)"; + license = with licenses; [ gpl2 lgpl21 ]; + homepage = "https://sogo.nu/"; + platforms = platforms.linux; + maintainers = with maintainers; [ ajs124 das_j ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 702da004b4..05e276f0b9 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop +, nixosTests , withLibevent ? true, luaevent ? null , withDBI ? true, luadbi ? null # use withExtraLibs to add additional dependencies of community modules @@ -71,7 +72,13 @@ stdenv.mkDerivation rec { --prefix LUA_CPATH ';' "$LUA_CPATH" ''; - passthru.communityModules = withCommunityModules; + passthru = { + communityModules = withCommunityModules; + tests = { + main = nixosTests.prosody; + mysql = nixosTests.prosodyMysql; + }; + }; meta = { description = "Open-source XMPP application server written in Lua"; diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix index 978893d28f..8dcbe36850 100644 --- a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix @@ -1,7 +1,7 @@ { 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 }: +, coreutils, procps, psmisc, nixosTests }: # NOTES: # @@ -172,7 +172,10 @@ in stdenv.mkDerivation rec { "-DZM_WEB_GROUP=${user}" ]; - passthru = { inherit dirName; }; + passthru = { + inherit dirName; + tests = nixosTests.zoneminder; + }; postInstall = '' PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$out/${perl.libPrefix}" diff --git a/third_party/nixpkgs/pkgs/shells/mksh/default.nix b/third_party/nixpkgs/pkgs/shells/mksh/default.nix index 682d88dbfb..7abf75c70f 100644 --- a/third_party/nixpkgs/pkgs/shells/mksh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "59"; + version = "59b"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1flhsdfksvv9gmfkgjwgdia1irv53g9abmq3y22s5a5ycyx2hajr"; + sha256 = "1rp0farbylypyiaald2hw5avg5w3m8x7cjnxxyyihzvfb2lx2zlh"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index a5c22d125a..58c18fb695 100644 --- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/powershell/default.nix @@ -5,7 +5,7 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; platformSha = if stdenv.isDarwin then "0c71w6z6sc86si07i6vy4w3069jal7476wyiizyr7qjm9m22963f" - else if stdenv.isLinux then "0m13y66a6w64s31qbi3j5x8jll6dfrin890jah8kyncsvlyisqg3" + else if stdenv.isLinux then "14d6nhv525pa8pi4p1r2mn180isfzgshqrbmql3qd55aksjpq1v0" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.0.0"; + version = "7.0.1"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix index 385fb97b91..c0e87cd602 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "antibody"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "0m7c879b3f402av20jsybq2dhhckbknlvn2n1csp7xmcz4zcyn1n"; + sha256 = "0ix2liy8h48s3n7ykr85ik03kwj45iqwhwn79ap8y21bar00gybs"; }; vendorSha256 = "072kxr68p9f58w2q98fjcn4wzd5szy5l5sz8sh4ssapljvic2lam"; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index e76ca68421..3a34be6304 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1dmhwgs5v4f1yanbi6dg1lbpzmvq1l3dq7sra811ycsf4f6g0d7f"; + sha256 = "08a63cdjpbvgnja0637zbm8qif4qn8ydgkwcfq3145bxfh5rq8wz"; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 27add8e1d7..60287b99ab 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-05-11"; + version = "2020-05-26"; pname = "oh-my-zsh"; - rev = "fd786291bab7468c7cdd5066ac436218a1fba9e2"; + rev = "93cc3964e2d265ab0571298d69d2eed0a65d13f2"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "197478z13m2ian2qfwn0bjz5nhv233w74vw4271a2r0kihbp6pp5"; + sha256 = "1g5v7zg22xf338qgymdfybs4m3wpy38s6b3jvw40lc7bw680ldsp"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix new file mode 100644 index 0000000000..5696ed61b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + pname = "pure-prompt"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "sindresorhus"; + repo = "pure"; + rev = "v${version}"; + sha256 = "1h04z7rxmca75sxdfjgmiyf1b5z2byfn6k4srls211l0wnva2r5y"; + }; + + installPhase = '' + OUTDIR="$out/share/zsh/site-functions" + mkdir -p "$OUTDIR" + cp pure.zsh "$OUTDIR/prompt_pure_setup" + cp async.zsh "$OUTDIR/async" + ''; + + meta = { + description = "Pretty, minimal and fast ZSH prompt"; + homepage = https://github.com/sindresorhus/pure; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pacien pablovsky ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix index ec6288a6e6..9f7a7f1870 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "zsh-prezto-2019-03-18"; - src = fetchgit { - url = "https://github.com/sorin-ionescu/prezto"; - rev = "1f4601e44c989b90dc7314b151891fa60a101251"; - sha256 = "1dcd5r7pc4biiplm0lh7yca0h6hs0xpaq9dwaarmfsh9wrd68350"; +stdenv.mkDerivation rec { + pname = "zsh-prezto"; + version = "2020-05-20"; + src = fetchFromGitHub { + owner = "sorin-ionescu"; + repo = "prezto"; + rev = "793f239a5e38ef2c4b76a4955bb734520303e8c4"; + sha256 = "0xhdl1g0rvlikq6qxh6cwp6wsrgmw4l1rmmq5xpc7wl6dyh35yri"; fetchSubmodules = true; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix b/third_party/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix index 1472e39c83..d5c2232dce 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/ksuperkey/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }: +{ stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: -stdenv.mkDerivation { - name = "ksuperkey-git-2015-07-21"; +stdenv.mkDerivation rec { + pname = "ksuperkey"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "hanschen"; + repo = "ksuperkey"; + rev = "v${version}"; + sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a"; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libX11 libXtst xorgproto libXi - ]; + buildInputs = [ libX11 libXtst xorgproto libXi ]; - src = fetchgit { - url = "https://github.com/hanschen/ksuperkey"; - rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639"; - sha256 = "0y4wkak9dvcm14g54ll1ln9aks2az63hx8fv7b8d3nscxjbkxl6g"; - }; - - preConfigure = '' - makeFlags="$makeFlags PREFIX=$out" - ''; - - meta = { + meta = with stdenv.lib; { description = "A tool to be able to bind the super key as a key rather than a modifier"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.vozz ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/hanschen/ksuperkey"; + license = licenses.gpl3; + maintainers = [ maintainers.vozz ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index b33ca52146..0d989fccb0 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -42,6 +42,7 @@ in buildPythonApplication rec { src = ./fix-paths.patch; inherit (xorg) xkeyboardconfig; }) + ./fix-41106.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch b/third_party/nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch new file mode 100644 index 0000000000..06387c8715 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/fix-41106.patch @@ -0,0 +1,15 @@ +diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py +index 2ff2c0c..513201a 100644 +--- a/xpra/server/server_util.py ++++ b/xpra/server/server_util.py +@@ -17,6 +17,10 @@ if PYTHON3: + return b"'" + s.replace(b"'", b"'\\''") + b"'" + + def xpra_runner_shell_script(xpra_file, starting_dir, socket_dir): ++ # Nixpkgs contortion: ++ # xpra_file points to a shell wrapper, not to the python script. ++ dirname, basename = os.path.split(xpra_file) ++ xpra_file = os.path.join(dirname, "."+basename+"-wrapped") + script = [] + script.append(b"#!/bin/sh\n") + for var, value in os.environb.items(): diff --git a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix index d0cb07197c..174aef7c4b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -1,37 +1,27 @@ { python3Packages, fetchurl }: rec { - ansible = ansible_2_8; + ansible = ansible_2_9; ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.11"; + version = "2.8.12"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; + sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a"; }; })); ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.17"; + version = "2.7.18"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; - }; - })); - - ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.6.20"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn"; + sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); } diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 3163ab4dfc..0216660e1e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,13 +1,13 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "aws-vault"; - version = "5.3.2"; + version = "5.4.4"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg"; + sha256 = "0qmxq2jd7dg5fp9giw6xd96q2l2df3sxksc0rwmrgx2rjx6iyivn"; }; vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index f226a04242..942346bc1a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "1j0h75cxrxa5yrijr7jfip7q5qrddaaqapd90f0qp2r4k9qb0y41"; + sha256 = "129v01da0whayqi9nvrfnlrq10mn5j096k43xl72214nk7iliwfy"; }; # put packages that needs to be overriden in the py package scope diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index b43b9bd2cb..61633c1bbd 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -61,6 +61,8 @@ let humanfriendly jmespath knack + msal + msal-extensions msrest msrestazure paramiko @@ -119,6 +121,9 @@ let azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.1.0" "zip" "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "7.0.0" "zip" + "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; @@ -149,8 +154,11 @@ let azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.12.0" "zip" - "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; + azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.0.0" "zip" + "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.13.0" "zip" + "160cn4arl4dy6ax1zb64bzw0ygmpg8jc942m1zlh4nwx5x322gg8"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -176,8 +184,8 @@ let azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.2.0" "zip" - "11kx4ck58nhhn9zf5vq0rqh7lfh2yj758s6ainrqyqadxvq5ycf7"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.5.0" "zip" + "0k91zdlzx6nfly1v2i7qmzqrdiygdx8rmgar3iz8nwgafvvc9x0n"; azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "10.1.0" "zip" "0fmsdwzyn167lwh87yyadq1bdc4q6rfz3gj5bh1mgavi9ghhxb75"; @@ -312,12 +320,22 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.7.0rc3"; + version = "0.7.0rc4"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "1mazy5a3505wqa68fxq7h55m0vbmjygv2wbgmxmrrrgw3w84q5r7"; + sha256 = "10v6qjpr7sbq5irq3kz24jiivpfm0f7jbj9iyx4dm8fgkrhgzlb6"; + }; + }); + + msal = super.msal.overridePythonAttrs(oldAttrs: rec { + version = "1.0.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc"; }; }); diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index 2562dc45fa..22e490979b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clair"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "14dh9iv2g138rivvfk135m3l90kk6c1ln1iqxhbi7s99h1jixbqw"; + sha256 = "0wkljfq9lnadzkg1ki3wkimlqd6j405nxcl35npzrxjglkvsdjym"; }; vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix b/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix index 88ae57251b..60a7e0586f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -9,6 +9,8 @@ py = python.override { inherit version; sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; }; + doCheck = false; + postPatch = ""; }); }; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock index c8c7a0117e..1bfce86065 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,48 +1,65 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + CFPropertyList (3.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) atomos (0.1.3) - babosa (1.0.2) - claide (1.0.2) + aws-eventstream (1.1.0) + aws-partitions (1.320.0) + aws-sdk-core (3.96.1) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.31.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.66.0) + aws-sdk-core (~> 3, >= 3.96.1) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.3) + aws-eventstream (~> 1.0, >= 1.0.2) + babosa (1.0.3) + claide (1.0.3) colored (1.2) colored2 (3.1.2) commander-fastlane (4.4.6) highline (~> 1.7.2) declarative (0.0.10) declarative-option (0.1.0) - digest-crc (0.4.1) + digest-crc (0.5.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.4) + dotenv (2.7.5) emoji_regex (1.0.1) - excon (0.65.0) - faraday (0.15.4) + excon (0.73.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.13.1) - faraday (>= 0.7.4, < 1.0) - fastimage (2.1.5) - fastlane (2.128.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fastimage (2.1.7) + fastlane (2.148.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) + aws-sdk-s3 (~> 1.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 2.0) - excon (>= 0.45.0, < 1.0.0) - faraday (~> 0.9) + excon (>= 0.71.0, < 1.0.0) + faraday (>= 0.17, < 2.0) faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.9) + faraday_middleware (>= 0.13.1, < 2.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.21.2, < 0.24.0) + google-api-client (>= 0.37.0, < 0.39.0) google-cloud-storage (>= 1.15.0, < 2.0.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) @@ -52,7 +69,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.2.2, < 2.0.0) + rubyzip (>= 1.3.0, < 2.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -61,51 +78,54 @@ GEM tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.8.1, < 2.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-api-client (0.23.9) + google-api-client (0.38.0) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) + googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) + mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - signet (~> 0.9) - google-cloud-core (1.3.0) + signet (~> 0.12) + google-cloud-core (1.5.0) google-cloud-env (~> 1.0) - google-cloud-env (1.2.0) - faraday (~> 0.11) - google-cloud-storage (1.16.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.3.1) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.0) + google-cloud-storage (1.26.1) + addressable (~> 2.5) digest-crc (~> 0.4) - google-api-client (~> 0.23) + google-api-client (~> 0.33) google-cloud-core (~> 1.2) - googleauth (>= 0.6.2, < 0.10.0) - googleauth (0.6.7) - faraday (~> 0.12) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.12.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.7) + signet (~> 0.14) highline (1.7.10) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - json (2.2.0) + jmespath (1.4.0) + json (2.3.0) jwt (2.1.0) - memoist (0.16.0) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mini_magick (4.9.5) - multi_json (1.13.1) + memoist (0.16.2) + mini_magick (4.10.1) + mini_mime (1.0.2) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.6) naturally (2.2.0) - os (1.0.1) + os (1.1.0) plist (3.5.0) public_suffix (2.0.5) representable (3.0.4) @@ -114,31 +134,31 @@ GEM uber (< 0.2.0) retriable (3.1.2) rouge (2.0.7) - rubyzip (1.2.3) + rubyzip (1.3.0) security (0.1.3) - signet (0.11.0) + signet (0.14.0) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.5) + simctl (1.6.8) CFPropertyList naturally slack-notifier (2.3.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.7.0) - tty-screen (0.7.0) - tty-spinner (0.9.1) + tty-cursor (0.7.1) + tty-screen (0.7.1) + tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) - unicode-display_width (1.6.0) + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) word_wrap (1.0.0) - xcodeproj (1.11.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -156,4 +176,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.1.4 + 2.1.4 \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/admin/fastlane/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fastlane/default.nix index 01f2d23740..1093ab9df0 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fastlane/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fastlane/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterromfeldhk nicknovitski + shahrukh330 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix b/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix index 2511822a9f..e289bc6f17 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix @@ -5,12 +5,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; atomos = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx"; @@ -18,31 +20,103 @@ }; version = "0.1.3"; }; - babosa = { + aws-eventstream = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f"; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "011ch85shkb3i3w16jymjx19dmxcgb6jrl6dzwqr4bx16ikdyclc"; + type = "gem"; + }; + version = "1.320.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jdnzynjrpp2jyg8vrbfbaad16k8ni1520xah1z2ckl5779x9fi6"; + type = "gem"; + }; + version = "3.96.1"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czxr6yi8p9gma4dwgygp1jn0i289hwa2vw69kzfscgbn118c3mm"; + type = "gem"; + }; + version = "1.31.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x1d1azxwanvm0d7qppw41x5nx2zv0bcz41yk9vqi5lvr7apaq13"; + type = "gem"; + }; + version = "1.66.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kysxyw1zkvggbmcj4xnscdh15kxli8mx07hv447h74g9x02drsd"; + type = "gem"; + }; + version = "1.1.3"; + }; + babosa = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10nn9bw63i4awpzn5vrx6kmpx1sg7z8r3fhw9r8bvg9pz2wh489g"; + type = "gem"; + }; + version = "1.0.3"; }; CFPropertyList = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; + sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.2"; }; claide = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; colored = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; @@ -51,6 +125,8 @@ version = "1.2"; }; colored2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; @@ -60,6 +136,8 @@ }; commander-fastlane = { dependencies = ["highline"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; @@ -68,6 +146,8 @@ version = "4.4.6"; }; declarative = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; @@ -76,6 +156,8 @@ version = "0.0.10"; }; declarative-option = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; @@ -88,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l"; + sha256 = "10f10yhz7rn31pq859jx47dypsfsxcmx8h482xn7aijfr6vn8yv9"; type = "gem"; }; - version = "0.4.1"; + version = "0.5.1"; }; domain_name = { dependencies = ["unf"]; @@ -109,10 +191,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1375dyawvcp81d94jkjwjjkj3j23gsp06cfwh15g695l4g3ssswc"; + sha256 = "17hkd62ig9b0czv192kqdfq7gw0a8hgq07yclri6myc8y5lmfin5"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.5"; }; emoji_regex = { groups = ["default"]; @@ -129,10 +211,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mc6y6n7i0hhk7i8wwi4qjnpkm013p7z3xr994s696hk74f91a7j"; + sha256 = "1zvphy60fwycl6z2h7dpsy9lgyfrh27fj16987p7bl1n4xlqkvmw"; type = "gem"; }; - version = "0.65.0"; + version = "0.73.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -140,13 +222,15 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "0.15.4"; + version = "1.0.1"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6"; @@ -160,33 +244,35 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr"; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; type = "gem"; }; - version = "0.13.1"; + version = "1.0.0"; }; fastimage = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iy9jm13r2r4yz41xaivhxs8mvqn57fjwihxvazbip002mq6rxfz"; + sha256 = "06lgsy1zdkhhgd9w1c0nb7v9d38mljwz13n6gi3acbzkhz1sf642"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.7"; }; fastlane = { - dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + dependencies = ["CFPropertyList" "addressable" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h3k6rzy9p9s7ajk96jarg7sqs9npdnj7acr4v2gs8bpf31hqgpc"; + sha256 = "1jss8cpcngwrmpck6ncijksrfcj5csgljwn2rmqv9gx1azj4mlgv"; type = "gem"; }; - version = "2.128.1"; + version = "2.148.1"; }; gh_inspector = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04"; @@ -195,24 +281,26 @@ version = "1.1.3"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable" "signet"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z925kbqyaxdi6ld3gvaqc9527xfi8k3rr6snq5mvx5kibdi072a"; - type = "gem"; - }; - version = "0.23.9"; - }; - google-cloud-core = { - dependencies = ["google-cloud-env"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gqn523gqj6dwbj9ddcb8rjw0sai4x138pk3l3qzmq8jxz67qqj5"; + sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1"; type = "gem"; }; - version = "1.3.0"; + version = "0.38.0"; + }; + google-cloud-core = { + dependencies = ["google-cloud-env" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1"; + type = "gem"; + }; + version = "1.5.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -220,32 +308,46 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j25sy2qhybqfwsyh8j4m10z2x7dn2jmf1gwr1w2b90cmya4yrbd"; + sha256 = "0rbascsddvwsq827fj4m2daqh0l3ghmdlbbhy48clgaysapaz685"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; }; - google-cloud-storage = { - dependencies = ["digest-crc" "google-api-client" "google-cloud-core" "googleauth"]; + google-cloud-errors = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lslrlrrhjj8imbpzvbbwflrvq06r0x5h74mlq726yvkr7akyqlq"; + sha256 = "0nl08lhgjvz3g7nsarn9nnsck0k3dg8mwg4awcnklnzpvs62b4ih"; type = "gem"; }; - version = "1.16.0"; + version = "1.0.0"; + }; + google-cloud-storage = { + dependencies = ["addressable" "digest-crc" "google-api-client" "google-cloud-core" "googleauth" "mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wdnd5wisbrlivapdr7bcg8v59hayqz3q5qiqs0628g371lwx30k"; + type = "gem"; + }; + version = "1.26.1"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj7j1rnyamxpn5ybgdgbiw89v9bq2r0h85s2y2jzvqanvm7iflq"; + sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh"; type = "gem"; }; - version = "0.6.7"; + version = "0.12.0"; }; highline = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; @@ -255,6 +357,8 @@ }; http-cookie = { dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; @@ -263,6 +367,8 @@ version = "1.0.3"; }; httpclient = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; @@ -270,17 +376,29 @@ }; version = "2.8.3"; }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; jwt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; @@ -289,51 +407,48 @@ version = "2.1.0"; }; memoist = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; - type = "gem"; - }; - version = "0.16.0"; - }; - mime-types = { - dependencies = ["mime-types-data"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; - type = "gem"; - }; - version = "3.2.2"; - }; - mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; type = "gem"; }; - version = "3.2019.0331"; + version = "0.16.2"; }; mini_magick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; + sha256 = "0lpq12z70n10c1qshcddd5nib2pkcbkwzvmiqqzj60l01k3x4fg9"; type = "gem"; }; - version = "4.9.5"; + version = "4.10.1"; }; - multi_json = { + mini_mime = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; type = "gem"; }; - version = "1.13.1"; + version = "1.0.2"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + type = "gem"; + }; + version = "1.14.1"; }; multi_xml = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; @@ -342,6 +457,8 @@ version = "0.6.0"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; @@ -350,6 +467,8 @@ version = "2.0.0"; }; nanaimo = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6"; @@ -358,6 +477,8 @@ version = "0.2.6"; }; naturally = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0dzqdawqr4agx7zr1fr5zxdwl8vb5rhpz57l1lk7d2y46ha6l4l7"; @@ -370,10 +491,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06r55k01g32lvz4wf2s6hpjlxbbag113jsvff3w64jllfr315a73"; + sha256 = "0xnynckvrn9ailkmkrmkldnpv8hmmbdwxr7c7iz27cl1cpcdd49n"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; plist = { groups = ["default"]; @@ -386,6 +507,8 @@ version = "3.5.0"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; @@ -395,6 +518,8 @@ }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; @@ -403,6 +528,8 @@ version = "3.0.4"; }; retriable = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; @@ -411,6 +538,8 @@ version = "3.1.2"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; @@ -423,12 +552,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; + sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.0"; }; security = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; @@ -438,23 +569,29 @@ }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4"; + sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp"; type = "gem"; }; - version = "0.11.0"; + version = "0.14.0"; }; simctl = { dependencies = ["CFPropertyList" "naturally"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bbvbpdk955q1g797md960fdznw6p6hmj2pc62yrbpvb1ymag1sf"; + sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x"; type = "gem"; }; - version = "1.6.5"; + version = "1.6.8"; }; slack-notifier = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; @@ -474,6 +611,8 @@ }; terminal-table = { dependencies = ["unicode-display_width"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; @@ -486,20 +625,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0prcxdy6qhqba4cv7hsy503b3bjciqk3j3hhzvcbij1kj2gh31c9"; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; tty-screen = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1143g05fs28ssgimaph6sdnsndd1wrpax9kjypvd2ripa1adm4kx"; + sha256 = "1jwgr2i3wilng3mx851xczmkzllbirmsmr42ik4amqyyvry1yzyf"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; tty-spinner = { dependencies = ["tty-cursor"]; @@ -507,12 +646,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "089qiqzjs1m727kalz8vn2wzgwzdn8mg5gyag901pmimxl64lnvc"; + sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; type = "gem"; }; - version = "0.9.1"; + version = "0.9.3"; }; uber = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; @@ -522,6 +663,8 @@ }; unf = { dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -534,22 +677,24 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.6"; + version = "0.0.7.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; word_wrap = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm"; @@ -563,13 +708,15 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.11.0"; + version = "1.16.0"; }; xcpretty = { dependencies = ["rouge"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; @@ -579,6 +726,8 @@ }; xcpretty-travis-formatter = { dependencies = ["xcpretty"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15b5c0lxz2blmichfdlabzlbyw5nlh1ci898pxwb661m9bahz3ml"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 8a8888b2aa..cad7b97fd3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,50 +1,50 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "1.12.0"; + version = "2.1.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-linux-x64.tar.gz"; - sha256 = "14j8f43h920k62h8bhywapphhfbj7whb9l6pjmyigld6x2jpr4mc"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-linux-x64.tar.gz"; + sha256 = "0d9bmljgf62dhj1z8h71c2pj2cbvf4ghhlbbbh2jcg55i33ks8ih"; } { - 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-random-v2.1.0-linux-amd64.tar.gz"; + sha256 = "1kf43j1b4wp39sny92dnsy1myn6wb2msli1ydds3yza81srgcfnh"; } { - 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-gcp-v3.3.0-linux-amd64.tar.gz"; + sha256 = "17anj9pc90hhiknyf2yab7dzvcfbjn1803bl6ld26r701w3h1jqx"; } { - 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-kubernetes-v2.0.0-linux-amd64.tar.gz"; + sha256 = "0526a4ll1q9v566i313223pnx2pa3qkcjp01l49h5jmgn8qpw1fn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-linux-amd64.tar.gz"; - sha256 = "1fwnad5p1v4bigcr2icgzmxdn1b3x0j8c361546pqzk67vskn9fg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-linux-amd64.tar.gz"; + sha256 = "14ya2sax2yyza3zbxp5a638y81pcbi26hv8k9y8agnjn82bgx8dy"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-darwin-x64.tar.gz"; - sha256 = "1bg6vnxic8fzycgv8q7m1bf8pk2bxvcn0b6lwy7aa2f3kzw70q46"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-darwin-x64.tar.gz"; + sha256 = "1d7w32wac2sc0z5i893h66fgyivf4x3mqki649vxkxc3081kpzi9"; } { - 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-random-v2.1.0-darwin-amd64.tar.gz"; + sha256 = "1smy1y2pnxnvw8zcs31q9xs80hyqhzawfzcwkkfnyamdrgasxqsi"; } { - 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-gcp-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "03idn1livy9w3izi7qrdgnigx3ayrp8qp2q3m5ik9ffvv2g11962"; } { - 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-kubernetes-v2.0.0-darwin-amd64.tar.gz"; + sha256 = "06m6ldqa82w82kjz7pxi0pbk9x02pzsy4x0in8fcq9gsh1p0gka9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-darwin-amd64.tar.gz"; - sha256 = "17qq7w2wk0803y0if7dn3gnxxnfqnb4n2gcil3zgbc4yhqz4py0y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0mymvn2355bq9ykvnww0si0imikzxp7mp1yh2scn8kjn2gs4nhgk"; } ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index 35494235d3..26a4846984 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash -VERSION="1.12.0" +VERSION="2.1.0" declare -A plugins plugins=( - ["aws"]="1.24.0" - ["gcp"]="2.8.0" - ["random"]="1.5.0" - ["kubernetes"]="1.5.6" + ["aws"]="2.2.0" + ["gcp"]="3.3.0" + ["random"]="2.1.0" + ["kubernetes"]="2.0.0" ) function genMainSrc() { diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix index 9fdbada9ab..6e75ee720e 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do substituteInPlace $f \ --replace "= gcc" "=cc" \ - --replace "= g++" "=c++" + --replace "= g++" "=c++" \ + --replace "-DGNU_RUNTIME=1" "" \ + --replace "-fgnu-runtime" "-fobjc-nonfragile-abi" done # we need to build inside this directory as well, so we have to make it writeable diff --git a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix index 182e37283d..57ab854a33 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.30"; in +let version = "0.30.1"; in with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0kzi9mzgmx1kjv3aldawapz7bk73f02bysiwh8rngqnirmm0vxdp"; + sha256 = "0z9rpmmi6mbm48ynd6izr0f8l3cklfyar6gjy0c8z9zal1ac9r55"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 8e4014eea9..6d6da3c987 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.12.1612"; + version = "0.8.13"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "06n58pwqg6kfigckjlslz2kx1lsykz1kn9a0r1cl8r3kn93zhk07"; + sha256 = "0lflg1ay4q4w9qzpmh6y2hza4fc3ig12q44qkd80ks17hj21bxa6"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix index f3bcf82e54..261267b809 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/monolith/default.nix @@ -3,25 +3,27 @@ , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "0w19szxzhwxbgnv4k618p8v29dhbar1fn433bsz1cr1apnrahmkn"; + sha256 = "0ifv1h16xrs40gw5wx7kwj7hirnzpgfrznskz2igsslk7ycjlbr1"; }; - cargoSha256 = "06gc3cpx1m2f6fwrm8brw5nidg1v02q1qwqfxvv3xzmmczbw4345"; + cargoSha256 = "1plx9p265jcc6wg3bhcdk1f77md8ann08kkv3g2706d82kxy2c1i"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - checkPhase = "cargo test -- --skip tests::cli"; + checkFlagsArray = [ "--skip=tests::cli" ]; meta = with stdenv.lib; { description = "Bundle any web page into a single HTML file"; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix index 326366f4f0..09f5471de4 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ++ optional aacSupport fdk_aac; configureFlags = [ - "--with-alsaplugindir=\$out/lib/alsa-lib" - "--with-dbusconfdir=\$out/etc/dbus-1" + "--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib" + "--with-dbusconfdir=${placeholder "out"}/share/dbus-1/system.d" "--enable-rfcomm" "--enable-hcitop" ] diff --git a/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix index 81a446066d..edca969a1e 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix @@ -1,15 +1,18 @@ {stdenv, lib, fetchurl, pythonPackages -, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield +, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, cabextract, unrar, unshield , bzip2, xz, lzip -# unzip is handled by p7zip -, unzipSupport ? false +# unsafe: +# ,p7zip +# unzip is no longer handled by p7zip, since it's unsafe +, unzipSupport ? true , unrarSupport ? false }: let - archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ] - ++ lib.optional (unzipSupport) unzip - ++ lib.optional (unrarSupport) unrar - ++ [ bzip2 xz lzip ]); + # p7zip + archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip cabextract unshield ] + ++ lib.optional (unzipSupport) unzip + ++ lib.optional (unrarSupport) unrar + ++ [ bzip2 xz lzip ]); in pythonPackages.buildPythonApplication rec { pname = "dtrx"; diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index 50cbc73136..2f89331f92 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -6,26 +6,26 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { - sha256 = "0zn7r8d4m8w2lblnjalqpz18na0spzkdiw3fwq2fzb7drhb32v54"; - rev = "v${version}"; - repo = "zstd"; owner = "facebook"; + repo = "zstd"; + rev = "v${version}"; + sha256 = "0ay3qlk4sffnmcl3b34q4zd7mkcmjds023icmib1mdli97qcp38l"; }; nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; patches = [ - # From https://github.com/facebook/zstd/pull/1883 + ./playtests-darwin.patch (fetchpatch { - url = "https://github.com/facebook/zstd/commit/106278e7e5fafaea3b7deb4147bdc8071562d2f0.diff"; - sha256 = "13z7id1qbc05cv1rmak7c8xrchp7jh1i623bq5pwcihg57wzcyr8"; + url = "https://github.com/facebook/zstd/pull/2163.patch"; + sha256 = "07mfjc5f9wy0w2xlj36hyf7g5ax9r2rf6ixhkffhnwc6rwy0q54p"; }) ] # This I didn't upstream because if you use posix threads with MinGW it will - # work find, and I'm not sure how to write the condition. + # work fine, and I'm not sure how to write the condition. ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; cmakeFlags = [ @@ -41,12 +41,13 @@ stdenv.mkDerivation rec { checkInputs = [ file ]; doCheck = true; - preCheck = '' - substituteInPlace ../tests/playTests.sh \ - --replace 'MD5SUM="md5 -r"' 'MD5SUM="md5sum"' + checkPhase = '' + runHook preCheck + ctest -R playTests # The only relatively fast test. + runHook postCheck ''; - preInstall = stdenv.lib.optionalString enableShared '' + preInstall = '' substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-zstdcat" ":-$out/bin/zstdcat" diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/playtests-darwin.patch b/third_party/nixpkgs/pkgs/tools/compression/zstd/playtests-darwin.patch new file mode 100644 index 0000000000..a98365eec3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/playtests-darwin.patch @@ -0,0 +1,18 @@ +--- a/tests/playTests.sh ++++ b/tests/playTests.sh +@@ -109,5 +109,2 @@ esac + case "$UNAME" in +- Darwin) MD5SUM="md5 -r" ;; +- FreeBSD) MD5SUM="gmd5sum" ;; +- OpenBSD) MD5SUM="md5" ;; + *) MD5SUM="md5sum" ;; +@@ -116,5 +113,2 @@ esac + MTIME="stat -c %Y" +-case "$UNAME" in +- Darwin | FreeBSD | OpenBSD) MTIME="stat -f %m" ;; +-esac + +@@ -752,3 +746,2 @@ zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by de + case "$UNAME" in +- Darwin) println "md5sum -c not supported on OS-X : test skipped" ;; # not compatible with OS-X's md5 + *) $MD5SUM -c tmph1 ;; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix index 18bde25267..d1d4ba6adf 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.8.12"; + name = "archivemount-0.9.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; + sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index bf6c68072a..f8968260ce 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.5"; + version = "1.14.7"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "173c5fcnfbnlw5a437r2x899ax77j3wp8gg8gffhryahcgyn1abq"; + sha256 = "1lbqyc9vpgck05n0q3qsvsr34142iv721z6iwxhc5j98370ff9i8"; }; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index c3b694c855..f21f19eb72 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3, nixosTests }: stdenv.mkDerivation rec { pname = "fuse-overlayfs"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 ]; + passthru.tests.podman = nixosTests.podman; + meta = with stdenv.lib; { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index f02fec85a5..44880638e6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.5"; + version = "7.6"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "1zahld2v1y920i0p25zcn15a593g3bl5sgnmhkdmn7kvk7mx4p93"; + sha256 = "0zdcv2jk8dp67id8ic30mkn97ccp07jf20g7v09a5k31pw9aqyih"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index 4a912d3b42..af09cafe1d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.112"; + version = "3.0.113"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04ymwg9r9x9gqjwy9jbjv7zzfgwal0xlfy6z5bwl27m2ys6l5k4a"; + sha256 = "0h3dhj6lznbkvmkr21w58avl9fa4pgj73fv0lkzcagksyyh5l0n9"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix index db9afedad9..de6d25e128 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "snapraid"; - version = "11.3"; + version = "11.5"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "08rwz55njkr1w794y3hs8nxc11vzbv4drds9wgxpf6ps8qf9q49f"; + sha256 = "0dlhdsmq5l208zldfr9z9g0p67wry81dr0r23lpybb5c9fm2f2rm"; }; VERSION = version; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix index f4be95556c..42b0e5afef 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -2,7 +2,7 @@ , fetchurl , cmake , ninja -, pkgconfig +, pkg-config , opencv3 , openexr , graphicsmagick @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.7.5"; + version = "2.9.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "008lpjm3w5hzfccam6qf0rizdg3a9cqrizhr7vrpskmbr1j451d6"; + sha256 = "YjNpX5snmZ3MfMOqdICw8ZK9RN6FIJCRo7S4plroxLU="; }; nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config ]; buildInputs = [ @@ -43,12 +43,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_LIB_STATIC=OFF" + "-DENABLE_CURL=OFF" "-DENABLE_DYNAMIC_LINKING=ON" ]; meta = with stdenv.lib; { description = "Open and full-featured framework for image processing"; - homepage = "http://gmic.eu/"; + homepage = "https://gmic.eu/"; license = licenses.cecill20; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix index 14761e7763..ea3b1ed9b0 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgurbash2"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; rev = version; - sha256 = "1hqghlk8c6svfszhmp02bhkc791lqhqffgiypf05giqmr5d8b9a9"; + sha256 = "10zs6p17psl1vq5vpkfkf9nrlmibk6v1ds3yxbf1rip1zaqlwxg6"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index be29136c70..4135eb966a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "2.3.0"; + version = "3.0.0"; pname = "oxipng"; src = fetchFromGitHub { owner = "shssoichiro"; repo = pname; rev = "v${version}"; - sha256 = "1cx026g1gdvk4qmnrbsmg46y2lizx0wqny25hhdjnh9pwzjc77mh"; + sha256 = "1k6q5xdfbw4vv4mvms32fhih7k1gpjj98nzrd171ig1vv3gpwwpg"; }; - cargoSha256 = "17wgsj2fcxhpsib3ps20sninbf236f9ihf4lnnfrawknmqfvq4s9"; + cargoSha256 = "19h3fwc5s2yblah5lnsm0f4m618p2bkdz2qz47kfi6jdvk89j8z7"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix index 57b447b1ad..3ca698f1c5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-cross"; - version = "2020-04-03"; + version = "2020-05-19"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = version; - sha256 = "0489s29kqgq20clxqg22y299yxz23p0yjh87yhka705hm9skx4sa"; + sha256 = "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix index 960e7fd3ba..9226809c5c 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/transfig/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation { buildInputs = [ zlib libjpeg libpng ]; patches = [ - ./patch-fig2dev-dev-Imakefile - ./patch-fig2dev-Imakefile - ./patch-transfig-Imakefile - ./patch-fig2dev-fig2dev.h - ./patch-fig2dev-dev-gensvg.c + ./patch-fig2dev-dev-Imakefile.patch + ./patch-fig2dev-Imakefile.patch + ./patch-transfig-Imakefile.patch + ./patch-fig2dev-fig2dev.h.patch + ./patch-fig2dev-dev-gensvg.c.patch ]; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile b/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile rename to third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch diff --git a/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile b/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile rename to third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-Imakefile.patch diff --git a/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c b/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c rename to third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-dev-gensvg.c.patch diff --git a/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h b/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h rename to third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-fig2dev-fig2dev.h.patch diff --git a/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-transfig-Imakefile b/third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-transfig-Imakefile.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-transfig-Imakefile rename to third_party/nixpkgs/pkgs/tools/graphics/transfig/patch-transfig-Imakefile.patch diff --git a/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix index be8b20fd05..8e15cd0d32 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "yafaray-core"; - version = "3.4.1"; + version = "3.4.4"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; rev = "v${version}"; - sha256 = "0ipkrgn5siad6y8naw1pgxkxas70l09g97vabyfbx1k67xrr4ldp"; + sha256 = "140vnaihz09rdvp0mqgrs26b3a2fv5wm49ar6817p4qklfx71l0g"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix index dc10944027..229d3f3cdb 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/zbar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zbar"; - version = "0.23"; + version = "0.23.1"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "mchehab"; repo = "zbar"; rev = version; - sha256 = "0hlxakpyjg4q9hp7yp3har1n78341b4knwyll28hn48vykg28pza"; + sha256 = "0l4nxha8k18iqzrbqpgca49lrf1gigy3kpbzl3ldw2lw8alwy8x2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix index 9588d0ae94..b2bbb161f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.10"; + version = "1.10.1"; in stdenv.mkDerivation { pname = "autorandr"; @@ -34,7 +34,7 @@ in SYSTEMD_UNIT_DIR=/lib/systemd/system \ UDEV_RULES_DIR=/etc/udev/rules.d substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin/systemctl "${systemd}/bin/systemctl" + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" '' else '' make install TARGETS='pmutils' DESTDIR=$out \ PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "0rcgs1n09p0p16lr5y239s0yrw7bch0x2cqwgc2dyh7rz7d9qmwn"; + sha256 = "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix new file mode 100644 index 0000000000..ecaabb43c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "bashcards"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "rpearce"; + repo = pname; + rev = "v${version}"; + sha256 = "1zbijbcm9lrqwiax37li0jjqcaxf469wh5d423frain56z1qknxl"; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/bin $out/share/man/man8 + cp bashcards.8 $out/share/man/man8/ + cp bashcards $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Practice flashcards in bash"; + homepage = "https://github.com/rpearce/bashcards/"; + license = licenses.bsd3; + maintainers = with maintainers; [ rpearce ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index 95bc44dcce..e961a5b069 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -1,32 +1,25 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, less +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, less , Security, libiconv, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.15.1"; + version = "0.15.4"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "10cs94ja1dmn0f24gqkcy8rf68b3b43k6qpbb5njbg0hcx3x6cyj"; + sha256 = "1pjdvhldmjpy8ymb7r91y18hj5dx1iygszsfwkd66v9rncjigd07"; fetchSubmodules = true; }; - cargoSha256 = "13cphi08bp6lg054acgliir8dx2jajll4m3c4xxy04skmx555zr8"; + cargoSha256 = "0myz06hjv4hwzmyqa9l36i9j9d213a0mnq8rvx6wyff7mr9zk99i"; - # Disable test that's broken on macOS. - # This should probably be removed on the next release. - # https://github.com/sharkdp/bat/issues/983 - patches = [ ./macos.patch ]; - - nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; + nativeBuildInputs = [ pkgconfig installShellFiles makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/macos.patch b/third_party/nixpkgs/pkgs/tools/misc/bat/macos.patch deleted file mode 100644 index 549782f0c9..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/macos.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/assets.rs b/src/assets.rs -index 4f8556f..222abc2 100644 ---- a/src/assets.rs -+++ b/src/assets.rs -@@ -336,7 +336,7 @@ mod tests { - assert_eq!(test.syntax_for_file("Makefile"), "Makefile"); - } - -- #[cfg(unix)] -+ #[cfg(all(unix,not(target_os = "macos")))] - #[test] - fn syntax_detection_invalid_utf8() { - use std::os::unix::ffi::OsStrExt; diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix index a0e133ec50..bdf68d708a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "19i7wzngi695dp4w0235wmfcnagdw3i40mzf89sddr1mqzvipfrz"; + sha256 = "18z3qbrsbfpn00c4xq3ck1mnmvrnqgl9g1s7m4dgc1871fi6sv8w"; }; nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix index 0e598d78a5..e35d528325 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.84"; + version = "1.86"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = version; - sha256 = "14xikdwcr6pcnkk2i43zrsj88z8b3mrv0svbnbvxvarw1id83pnn"; + sha256 = "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w"; }; setSourceRoot = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/dasht/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dasht/default.nix index e128682079..7c2ff35483 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dasht/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dasht/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , makeWrapper +, installShellFiles , coreutils , gnused , gnugrep @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dasht"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "sunaku"; repo = pname; rev = "v${version}"; - sha256 = "0d0pcjalba58nvxdgn39m4b6n9ifajf3ygyjaqgvzwxzgpzw0a60"; + sha256 = "08wssmifxi7pnvn9gqrvpzpkc2qpkfbzbhxh0dk1gff2y2211qqk"; }; deps = lib.makeBinPath [ @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { (placeholder "out") ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' runHook preInstall @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp bin/* $out/bin/ - mkdir -p $out/share/man/man1 - cp man/man1/* $out/share/man/man1/ + installManPage man/man1/* + installShellCompletion --zsh etc/zsh/completions/* for i in $out/bin/*; do echo "Wrapping $i" diff --git a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix index f9643fbde7..445dfd6f08 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.9.1"; + version = "4.10"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "14a0fqdpwdw72790jjm01g5n7lwwaf9d6k78fflbysn5v62nd0mg"; + sha256 = "1mj2hrwm8zr3814yig1f78hzflgih93hmy3dsyx6k0fdcfjkjvmx"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 39a137d3c0..a9b014be35 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "143"; + version = "144"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "09vvhzsxxgjvdnd48hdfz50i2svacdnwc2idirj4b27czi7c3czb"; + sha256 = "1n916k6z35c8ffksjjglkbl52jjhjv3899w230sg7k4ayzylj6zi"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index e261b95fde..1b6b87984c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash }: +{ stdenv, fetchFromGitHub, buildGoModule, bash }: -buildGoPackage rec { +buildGoModule rec { pname = "direnv"; version = "2.21.3"; - goPackagePath = "github.com/direnv/direnv"; + + vendorSha256 = null; src = fetchFromGitHub { owner = "direnv"; @@ -12,17 +13,12 @@ buildGoPackage rec { sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; }; - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - # we have no bash at the moment for windows makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [ "BASH_PATH=${bash}/bin/bash" ]; installPhase = '' - mkdir -p $out make install DESTDIR=$out mkdir -p $out/share/fish/vendor_conf.d echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish diff --git a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix index ab94a8aa6b..4fd4c5428d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.0.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0l18xavkj99cydp1dqrph00yq2px339zs6jcim59iq3zln1yn0n7"; + sha256 = "0qzqnsjkq8i4gzn9273algx33kr1hzgxid8lnqp4awy2zxm4ksiq"; }; - cargoSha256 = "1sdwbnncs1d45x1iqk3jv3r69fpkzrsxm4kjn89jmvd5nk8blvs2"; + cargoSha256 = "1d7hfgl9l4b9bnq2qcpvdq5rh7lpz33r19hw3wwgnqh142q67m7r"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix new file mode 100644 index 0000000000..6e0cb66749 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix @@ -0,0 +1,78 @@ +{ stdenv, lib, fetchurl, skawarePackages }: + +let + pname = "fdtools"; + version = "2020.05.04"; + sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla"; + +in stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://code.dogmap.org/${pname}/releases/${pname}-${version}.tar.bz2"; + inherit sha256; + }; + + outputs = [ "bin" "lib" "dev" "doc" "out" ]; + + buildInputs = [ skawarePackages.skalibs ]; + + configurePhase = '' + cd ${pname}-${version} + sed -e 's|gcc|$CC|' \ + conf-compile/defaults/host_link.sh \ + > conf-compile/host_link.sh + + echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \ + > conf-compile/depend_skalibs_sysdeps + ''; + + buildPhase = '' + bash package/build + ''; + + installPhase = '' + mkdir -p $bin/bin + tools=( grabconsole multitee pipecycle recvfd seek0 sendfd setblock setstate statfile vc-get vc-lock vc-switch ) + + for t in "''${tools[@]}"; do + mv "command/$t" "$bin/bin/$t" + done + + mkdir -p $lib/lib + mkdir -p $dev/include + docdir=$doc/share/doc/${pname} + mkdir -p $docdir + + mv library/fdtools.a $lib/lib/fdtools.a + mv include/fdtools.h $dev/include/fdtools.h + + ${skawarePackages.cleanPackaging.commonFileActions { + noiseFiles = [ + "conf-compile/**/*" + "src/**/*" + "src/.**/*" + "compile/**/*" + "package/{build,check,compile,elsewhere,install,install_commands,own,run,sharing,upgrade,upgrade_version,url_src,url_src_latest,versions}" + ]; + docFiles = [ + "package/INSTALL" + "package/LICENSE" + "package/README" + ]; + }} $docdir + + ${skawarePackages.cleanPackaging.checkForRemainingFiles} + + # we don’t use this, but nixpkgs requires it + touch $out + ''; + + meta = { + homepage = "https://code.dogmap.org./fdtools/"; + description = "A set of utilities for working with file descriptors"; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.Profpatsch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix index fc4c44e01c..264afc68b6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -16,21 +16,21 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.61"; + version = "0.2.64"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "1d0rx5gcp9z06kxjknqa1r2b4m5c4vrhp4a9spkawvgiky5a9x07"; + sha256 = "1fgzcw0955vjypwwx3ja8sil0vxwvhsnspn1bjl869ccbnx2x4hs"; }; - cargoSha256 = "1bmyhg1y4gz719nsfdfjf4y73f9l6aag17dx9iazfzwnwwaq46m9"; + cargoSha256 = "0svmbay9waaq9fpc8lg1nys6l35xsjvkri5v1frlgxida5dzghpq"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; - buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) - ; + buildInputs = + if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) + else [ openssl ]; preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 38f2145df4..439979068f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1x5izsm0b3514i2vl1b3x40chjlzidr5zssn5cpgrw9a8w4jpv6h"; + sha256 = "0kxbq174a5fdcdh1hvnrlk79cg7lyily7iskfxhyz9l26qana9jp"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix index b9fdac6cba..1906c9d566 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.3"; + version = "1.4"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; + sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix index 49ca39c7d0..df645789c5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0m3g68ycb0yvdpiyd6qysgz0ygz9s0kb98g79cdx9rqpb7x0rmd0"; + sha256 = "1sbws735w0qww3nj8ai105a743nyrf1iprmcl89w5h8yirq2z1r9"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix index b953dd290f..12d3e7ecc7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.19"; + version = "4.20"; pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "028y2bw0bs0bx58gnxzbrg2c14a2pgkni2carf5i7kb6dg4wnkaq"; + sha256 = "19siipj1svcj7rxgxmm3aaj4d43jx13fr7bghab8wak2dk1x0igb"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix index a5b7b81d77..5e2b654f4f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb"; + sha256 = "0389lmyipmm4irrl39zw2748f2sdddfzwms4i4763xdykdvi8b57"; }; - cargoSha256 = "0n0hizldhr026mrzzz1wlw4g0b1z6ybxarybq3fzchs722iqpsis"; + cargoSha256 = "06scvp7x1yixdadarsm461hbc256spx4aqhmjjn72x7hxn22h9cg"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix index 8a2412f86e..2ebaf7cf25 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "05wjzx1ibd7cyl5lgmmn5y8dhsk71wz2bnimbmq7z51ds6cbyw5i"; + sha256 = "1farcijm5s1836vi7h36yh0i9v48q4l98s4wprmr28z37c3l3n0b"; }; - cargoSha256 = "04xqk1mmbrz8bjn36nxabwla3y62wfdly5bckkya6y2dhf1vkdjq"; + cargoSha256 = "1kvrra5i1g1inxpmn4shd8kgkljrk3ymfnpnhwrsnfxrqidi0h2z"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix index 2898cfb679..ae0b32d212 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "18hn25f7cdz1li0vvx74al7a8z2220xhzjp9j6idhldsmjnscgq8"; + sha256 = "05q2ys7ii6mqiddl9ixzqhbvk4xy5ckh3yfz26vycxiyh9cp7yls"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix new file mode 100644 index 0000000000..32c45b31a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "jugglinglab"; + src = fetchFromGitHub { + owner = "jkboyce"; + repo = "jugglinglab"; + rev = "1908012682d8c39a9b92248a20f285455104c510"; # v1.2.1 does not have a tag on Github + sha256 = "0dvcyjwynvapqbjchrln59vdskrm3w6kh0knxcn4bx61vcz3171z"; + }; + buildInputs = [ jre ]; + nativeBuildInputs = [ ant jdk makeWrapper ]; + buildPhase = "ant"; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + cp bin/JugglingLab.jar $out/lib/ + + makeWrapper ${jre}/bin/java $out/bin/jugglinglab \ + --add-flags "-jar $out/lib/JugglingLab.jar" + ''; + + meta = with stdenv.lib; { + description = "A program to visualize different juggling pattens"; + license = licenses.gpl2; + maintainers = with maintainers; [ wnklmnn ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix new file mode 100644 index 0000000000..4d9324af18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/lnch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + pname = "lnch"; + version = "2017-02-16"; + + goPackagePath = "github.com/oem/${pname}"; + + src = fetchFromGitHub { + owner = "oem"; + repo = pname; + rev = "f24eed5392f01d2c8a9cfe9cdf70dcfbbf4b6b36"; + sha256 = "0skzrjnbxq1yj7y64cq7angp4wqnrgw1xp9v8vw9zp8f8zwmpy0y"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/oem/lnch"; + description = "A small go app that launches a process and moves it out of the process group"; + platforms = platforms.all; + license = licenses.publicDomain; # really I don't know + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix index 7edfb280e4..8b1cb938fb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20191016"; + version = "20200505"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "05xyvmbs2x5gbj2njgg7hsj3alb5dh96xhab0w0qkhb58x2i1hld"; + sha256 = "02qzy3appah0llg6aa71isl2a5nc93bkzy5r4d682lcy2j1n216c"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix index c44934ef45..cf90e93929 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, zlib, libibmad }: +{ stdenv, autoreconfHook, fetchFromGitHub, zlib, libibmad, openssl }: stdenv.mkDerivation rec { - name = "mstflint-4.4.0-1.12.gd1edd58"; + pname = "mstflint"; + version = "4.14.0-1"; - src = fetchurl { - url = "https://www.openfabrics.org/downloads/mstflint/${name}.tar.gz"; - sha256 = "0kg33i5s5zdc7kigww62r0b824zfw06r757fl6jwrq7lj91j0380"; + src = fetchFromGitHub { + owner = "Mellanox"; + repo = pname; + rev = "v${version}"; + sha256 = "0xrwx623vl17cqzpacil74m2fi4xrshgvvzxiplz1wq47gq7wp1i"; }; - buildInputs = [ zlib libibmad ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib libibmad openssl ]; + + hardeningDisable = [ "format" ]; + + dontDisableStatic = true; # the build fails without this. should probably be reported upstream meta = with stdenv.lib; { - homepage = "https://www.openfabrics.org/"; - license = licenses.gpl2; + homepage = "https://github.com/Mellanox/mstflint"; + license = with licenses; [ gpl2 bsd2 ]; platforms = platforms.linux; - broken = true; # 2018-04-11 }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix index d1716d95ca..50f8ffc25d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mutagen"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "0ykzrxlllip4wvhd9rja5bcr2m72695fjj2q1scwn8ri6jcgfa19"; + sha256 = "15bknyk6mkrwlm18ypncsf9az8l1nv67n0lf0zav867z0r46cc6x"; }; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index 3e678b1d37..a93ec0ab57 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, libxml2, perl +{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 , libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz"; - sha256 = "0x155d4hqz7mabgqvgydqjm9d8aabc78vr0v0pnsp9vkdlcv3mfh"; + url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; + sha256 = "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab"; }; - nativeBuildInputs = [ pkgconfig gettext perl ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index 0720ca76f2..059b43baec 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200422"; + name = "parallel-20200522"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb"; + sha256 = "10is46v5dpccxibby0zikg1q68mdwpmgdpxk796zka93idd6id29"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index edcc2cfc2b..89f1e606e6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "0p8ck4s5jj53nc638darhwbylcsslfmfz72bwy6wxby9iqi9kq6b"; + sha256 = "03n1gn944z6rz5g643y68hvfxpxp65mip32w1zx43xr60x1vpf2v"; }; vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index df76ddf266..09dba27a1e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.8"; + version = "1.2020.10"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0xkv8d31dc0dchr40zzgmjw2wyh4i5vxwdk3fhqpw0pk2frxwc1w"; + sha256 = "00azasannh77ns3wpy6yrlw77pgq89frx0f4c7gk1gqiqjavsvdy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix index b00f309915..b8a747d422 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { - version = "2.37"; + version = "2.41"; pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-cleaner"; rev = "v${version}"; - sha256 = "1fbsn2xvcjkqhhkhidn04iwc0zha68cpkyc9vs5yly38qr1q238a"; + sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix index 790bf73a44..7d68ada2c1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { - version = "6.38"; + version = "6.40"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0mhjgd2b3grdaad64b72m8i5rm9k58yx7kpiqmhmd3kl5qlgxagy"; + sha256 = "1z1n7dqbkk0x9w2pq71nf93wp4hrzin4a0hcvfynj1khf12z369h"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 1bb7f9582c..63acdbfc13 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "3.0.7"; + version = "3.1.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "10w47hbi6y92imzh1rlwkh5bfj1pnlkfxhbi8lhmy6ggxa62xmf7"; + sha256 = "1x4x93c8qqalrhaah1rmrspr4gjcgf1sg6kplf9rg1c42mk672f8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix index d9439863dc..6c52aa217d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; - sha256 = "0gbjl1jfxjwiiwf9rz38yp6rb1mgzhawcyg0g9byl6m4kgivf0cx"; + sha256 = "11irlbbhlzkg6y621smk351jl8ay3yjhl2j9hila0xa72hs4n7gz"; }; buildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix index a59a14d4b9..3fa6551534 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "1avdzs3v6k4jhkadm8i8dlwg0iffqd99xqpi53smd0zgwks744l5"; + sha256 = "1ga632c86l30n6wjj8rc3gz43v93mb7kcl9f8vhig16ycgiw8v09"; }; - cargoSha256 = "0bdb4nadrms5jq3s8pby2qfky7112ynd7vd6mw720mshqklk5zyb"; + cargoSha256 = "0bgm29v9vmd1xcdazg1psrx6hb1z3zfzr1c4iy8j1r28csbmm6kq"; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix index 06e7980167..6e41eba735 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux-xpanes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-xpanes"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "greymd"; repo = pname; rev = "v${version}"; - sha256 = "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi"; + sha256 = "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0"; }; buildInputs = [ openssl perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix index ea2c07ec97..23fdc2f713 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "02mliqz2lry779ba6vmyaa13nxcmj91f8pyhzim9wvcnjq8vc5cj"; + sha256 = "0cb1n0skanwwkwgzlswwhvfb4iji1bw9iqskmczlhakpw3j1yaqa"; }; buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uhubctl/default.nix index 0ed5d97ad7..49da81d609 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uhubctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uhubctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; rev = "refs/tags/v${version}"; - sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq"; + sha256 = "0pimhw2a2wfg7nh1ahsxmzkb0j6bbncwdqsvyp8l23zhs5kx7wm9"; }; buildInputs = [ libusb1 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix index d2abd143ce..ee15786d40 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -1,27 +1,28 @@ -{ lib +{ stdenv , fetchFromGitHub , rustPlatform -, fzf +, withFzf ? true, fzf }: rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1qkvmjrkcivfzbm6swl5lgvpqz9av9jxcn9i8ms3wz4vfsibmlxv"; + sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6"; }; - buildInputs = [ - fzf - ]; + postPatch = stdenv.lib.optionalString withFzf '' + substituteInPlace src/fzf.rs \ + --replace '"fzf"' '"${fzf}/bin/fzf"' + ''; - cargoSha256 = "1w921f7b6kzc1mjzff1bcs3mg4cp9h48698w2zlv5jzjs7nwgb8n"; + cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd"; - meta = with lib; { + meta = with stdenv.lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index 1a2cf50265..ebe67b27e7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "amass"; - version = "3.6.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "05rh61dx4f9kv5p8sahhwwiyivwq438fl30j9d97i4sagvb5jvvm"; + sha256 = "1ih681790sp0lqfbsl153dpr5vzxp1jjza28pajrqjzs7zyjmkgs"; }; vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 1a52a7f898..5f7c862371 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "09lyl9cpb5li7kyh0y78lhgvvb24ssfjmkz65xzbgm5jyrz8rmr4"; + sha256 = "09qr8s136ilqa9r5yjys2mnyyprhancn5n4maqmlfbjrz590g6nb"; }; - cargoSha256 = "0m57cdbghzzjyxr6c0diyrfsjqip1dnqsh0zlapv8myizxy4rrzy"; + cargoSha256 = "0awm79gbip3p2k3qr08n0p9lmmbnibnhvz06qzcj27gvmdxs8xvz"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix index eef345c8db..a4eb50d0c7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/corerad/default.nix @@ -2,25 +2,23 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1r9kvz1ylrnfc7y5c4knqhx6xngh1p8j1axb8bd7h7p51c4i7jz2"; + sha256 = "0fi9wgv5aj3ds3r5qjyi4pxnd56psrpdy2sz84jd0sz2w48x4k4p"; }; - vendorSha256 = "0ncwf197dx6mqzg69mnyp0iyad585izmydm0yj8ikd0y8ngpx7a3"; + vendorSha256 = "11r3vpimhik7y09gwb3p6pl0yf53hpaw24ry4a833fw8060rqp3q"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1589133047 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1590182656 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; - deleteVendor = true; - meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index ba31e13c89..8fe208c98b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,21 +2,22 @@ buildGoModule rec { pname = "croc"; - version = "8.0.9"; + version = "8.0.11"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0kwpn1nv93f8swzc70j8srddqz7qb33pxc9nhqrd92jhcl4cc7iv"; + sha256 = "09yx7xjhvpyvzwsf859b9yfrxzg01ak3dfavfhmx3h97lrdxprgi"; }; - vendorSha256 = "1vl5yz3z5z30rxnnxy74g2m5025vbisqyv31nc21kxdfrdqrwp6c"; + vendorSha256 = "1lqlrsd90475b1wp1krfppi635q5gw1ka8x4d8haanmnlnxkniqf"; subPackages = [ "." ]; meta = with stdenv.lib; { - description = "Easily and securely send things from one computer to another"; + description = + "Easily and securely send things from one computer to another"; homepage = "https://github.com/schollz/croc"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves equirosa ]; @@ -34,4 +35,4 @@ buildGoModule rec { - Does not require a server or port-forwarding ''; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index a2b4f40f5a..b868f075b9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.27.1"; + version = "0.28.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "0nsj75aw5dym1pzn18p6fzh17vcryz1xs4xly6ga79dkpyijr9j8"; + sha256 = "1pa4skrhdcblqs8r1kik5g8h9p6pcin5pd7b1dh7xk2n86xs8j22"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix index 2bf1d8e5d2..8c9a877b8f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fastd/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchgit, cmake, bison, pkgconfig -, libuecc, libsodium, libcap, json_c }: +{ stdenv, fetchFromGitHub, cmake, bison, pkgconfig +, libuecc, libsodium, libcap, json_c, openssl }: stdenv.mkDerivation rec { - version = "18"; pname = "fastd"; + version = "19"; - src = fetchgit { - url = "git://git.universe-factory.net/fastd"; - rev = "refs/tags/v${version}"; - sha256 = "0c9v3igv3812b3jr7jk75a2np658yy00b3i4kpbpdjgvqzc1jrq8"; + src = fetchFromGitHub { + owner = "Neoraider"; + repo = "fastd"; + rev = "v${version}"; + sha256 = "1h3whjvy2n2cyvbkbg4y1z9vlrn790spzbdhj4glwp93xcykhz5i"; }; postPatch = '' @@ -17,7 +18,11 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig bison cmake ]; - buildInputs = [ libuecc libsodium libcap json_c ]; + buildInputs = [ libuecc libsodium libcap json_c openssl ]; + + cmakeFlags = [ + "-DENABLE_OPENSSL=true" + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix index 83a6ea4b24..1d4a6a5545 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ip2unix"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17"; + sha256 = "1ci0k3zy3hjkg65ah5h75mfvrd578xf2z1449xmgjm3iz3d6kqs2"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index 98dec71f45..430607a0c3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "18y672cqaicp30zymxr88spmzcn0x7rcv14nbdmd8hzp52rscpj7"; + sha256 = "0inn720prhgxxc1napzd3xyzqgsvv70gqddsyzaa84h6946iz6v5"; }; postPatch = stdenv.lib.optionalString (batchSize != null) '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix index a1c6962d3f..028d852f13 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "1x6hivr1v76fxy1dn82xrj9rj8k3r097kf4yiblqq16y631hxzy4"; + sha256 = "0sc1yzlxjfvl58hjjw99bchqc4061i3apw254z61v22k4sajnif8"; }; buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/third_party/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch index eb97209a69..c1174e1093 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch +++ b/third_party/nixpkgs/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch @@ -98,7 +98,7 @@ index 924a45ec..f05055c3 100644 + + plugin_path = g_getenv ("OFONO_PLUGIN_PATH"); + -+ if (!plugin_path) { ++ if (plugin_path) { + gchar **plugin_path_list; + gsize i; + diff --git a/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix index 101346d31b..11f9fdc0fd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix @@ -4,19 +4,19 @@ assert (openssl != null) == (gnutls == null); let vpnc = fetchgit { url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git"; - rev = "c84fb8e5a523a647a01a1229a9104db934e19f00"; - sha256 = "01xdclx0y3x66mpbdr77n4ilapwzjz475h32q88ml9gnq6phjxrs"; + rev = "c0122e891f7e033f35f047dad963702199d5cb9e"; + sha256 = "11b1ls012mb704jphqxjmqrfbbhkdjb64j2q4k8wb5jmja8jnd14"; }; in stdenv.mkDerivation rec { pname = "openconnect"; - version = "8.05"; + version = "8.10"; src = fetchurl { urls = [ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k"; + sha256 = "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index b0be2ab5e6..bd1c02f9b5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.13.3"; + version = "1.14.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1y3b3zwzig520nyky7xnr0l0zf68i4w698bysyngpkada14d8dv3"; + sha256 = "1qn48sp3ydbik7nc9x5l22gvvnr99f89jy1lvnf64bdg218kr0z7"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix index 09ad8db46e..c5a15c2f87 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchurl, fetchpatch, pkgconfig, makeWrapper , iproute, lzo, openssl, pam , useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null , pkcs11Support ? false, pkcs11helper ? null, @@ -10,11 +10,10 @@ assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; let - # There is some fairly brittle string substitutions going on to replace paths, - # so please verify this script in case you are upgrading it + # Check if the script needs to have other binaries wrapped when changing this. update-resolved = fetchurl { - url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.2.7/update-systemd-resolved"; - sha256 = "12zfzh42apwbj7ks5kfxf3far7kaghlby4yapbhn00q8pbdlw7pq"; + url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.3.0/update-systemd-resolved"; + sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc"; }; in stdenv.mkDerivation rec { @@ -26,7 +25,7 @@ in stdenv.mkDerivation rec { sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ lzo openssl ] ++ optionals stdenv.isLinux [ pam iproute ] @@ -45,16 +44,10 @@ in stdenv.mkDerivation rec { cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples cp -r sample/sample-keys/ $out/share/doc/openvpn/examples cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples - - ${optionalString useSystemd '' - install -Dm755 ${update-resolved} $out/libexec/update-systemd-resolved - - substituteInPlace $out/libexec/update-systemd-resolved \ - --replace '/usr/bin/env bash' '${stdenv.shell} -e' \ - --replace 'busctl call' '${getBin systemd}/bin/busctl call' \ - --replace '(ip ' '(${getBin iproute}/bin/ip ' \ - --replace 'logger ' '${getBin utillinux}/bin/logger ' - ''} + '' + optionalString useSystemd '' + install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved + wrapProgram $out/libexec/update-systemd-resolved \ + --prefix PATH : ${makeBinPath [ stdenv.shell iproute systemd utillinux ]} ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pirate-get/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pirate-get/default.nix index bacea66349..b89ab8164c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pirate-get/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pirate-get/default.nix @@ -4,16 +4,14 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.3.5"; - - doCheck = false; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "01jr9c04ic4bfalfdijavzvqzmpkw3hq1glqyc86z3v6zwl8dlp2"; + sha256 = "07s5ss9dxccx1mip7pyga1fagywkqchxmzz55ng47ac9053ffxkq"; }; - propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; + propagatedBuildInputs = [ colorama veryprettytable pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 36f6b58495..ba90a7cacb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,24 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.7.2"; + version = "1.8.11"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng"; + sha256 = "0imnvx3v0msk9qf72zy1qg5q52dmc8xfs9iwdwa2q13scjslgmwn"; }; - cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h"; + cargoSha256 = "1aqqx0pdq3vp5c06pjwsrbrqfkz5dhxnpvv3vnr3pqfm62xrffgg"; + + SODIUM_USE_PKG_CONFIG = 1; buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkgconfig ]; - # tries to read /etc/resolv.conf, hence fails in sandbox - doCheck = false; - meta = with stdenv.lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 6b9279a819..5aa3219e5b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -6,6 +6,7 @@ , libcap , libseccomp , libslirp +, nixosTests }: stdenv.mkDerivation rec { @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.podman = nixosTests.podman; + meta = with stdenv.lib; { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix index 2c008cbb36..b492b5a226 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ssldump"; - version = "0.9b3"; + version = "1.1"; src = fetchFromGitHub { owner = "adulau"; repo = "ssldump"; - rev = "4529d03a50d39d3697c3e39a3d6f6c9b29448aa0"; - sha256 = "0wwsamzxabfxcil5y2g4v2261vdspxlp12wz4xhji8607jbyjwr1"; + rev = "7491b9851505acff95b2c68097e9b9f630d418dc"; + sha256 = "1j3rln86khdnc98v50hclvqaq83a24c1rfzbcbajkbfpr4yxpnpd"; }; buildInputs = [ libpcap openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 97f9b14176..93b0b69f22 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tendermint"; - version = "0.32.11"; + version = "0.32.12"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "17p7khfiv5aflpl4imbqp8v7gignd6v6a7g80xlnzgix5ismh84l"; + sha256 = "1d3q5d49pzh86brrwp4kfsxs0n9zdmcnkminarg3wl9w97qrjsr6"; }; vendorSha256 = "1vhd3s6yxfhirgipxcy0rh8sk55cdzirr8n8r31sijgyak92mq0l"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix index bca0fcb81c..c2ea4ee62d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "0f4agsh0gqpyhl3nysv4x9f74hlnch27gp3l8bpl645kbbfkg0di"; + sha256 = "1myqhhjilj9sjvvw64f2931jqgvwv60ajqngw790ygcs4vr7gmfk"; }; sourceRoot = "source/native"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wormhole/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/tools/networking/wormhole/default.nix rename to third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix index 2b826224f4..c61da53c6a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wormhole/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tunnelto/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "wormhole"; - version = "0.1.5"; + pname = "tunnelto"; + version = "0.1.6"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; + sha256 = "0yigjg8kjl8v0636hjr3sg33p4v963vzq7wbfi986ymxfx47jqp7"; }; - cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; + cargoSha256 = "0603b0hn84shl9wdg7zg7kf9050gh33d8ghscwsby1vqanakms9j"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix index 41946b8847..2913a31e16 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-go/default.nix @@ -17,6 +17,10 @@ buildGoPackage rec { passthru.updateScript = ./update.sh; + postInstall = '' + mv $out/bin/wireguard $out/bin/wireguard-go + ''; + meta = with stdenv.lib; { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 4b6e2aa9f1..6cd3682c3f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200510"; + version = "1.0.20200513"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "0xqchidfn1j3jq5w7ck570aib12q9z0mfvwhmnyzqxx7d3qh76j6"; + sha256 = "1rvnr4hk17xa2sp48icbhdnd3l69fiwwlxnn3587p1slrlms808l"; }; outputs = [ "out" "man" ]; @@ -49,9 +49,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - tests = { - inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces; - }; + tests = nixosTests.wireguard; }; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix index 03f6bc2b11..2db9ee6d9b 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: -let +let blake3-src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; - rev = "0.3.1"; - sha256 = "0wkxx2w56hsng28p8zpndsy288ix4s5qg6xqjzgjz53fbyk46hda"; + rev = "0.3.3"; + sha256 = "0av41ld0gqf3g60gcllpz59nqlr7r62v99mgfq9gs0p8diw5gi7x"; }; in rustPlatform.buildRustPackage rec { pname = "cached-nix-shell"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "xzfc"; repo = pname; rev = "v${version}"; - sha256 = "0pzwknpc4qrh9pv5z0xvldql2dkj9ddksvaci86a4f8cnd86p2l6"; + sha256 = "1ni671wr2lrvyz6myaz3v4llrjvq4jc1ygw1m7rvnadzyf3va3lw"; }; - cargoSha256 = "1n88gcnrfdrk025hb54igc83cn5vlv8n6ndyx1ydmzhd95vhbznf"; + cargoSha256 = "19i39b1yqdf81ql4psr3nfah6ci2mw3ljkv740clqmz088j2av8g"; # The BLAKE3 C library is intended to be built by the project depending on it # rather than as a standalone library. diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix index 82da6b7b93..84bea234c2 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = "${version}"; - sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; + sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd"; }; - cargoSha256 = "1ynalwaqa70ihgras3frp5l3xniz58hwp108wkxn6zj8lwxbxfgx"; + cargoSha256 = "1wmw7knkx79fbwizaj9qkcnw0ld1lsfhca8mfpn5f0daxa5v5y97"; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix index 4c59177769..0ccad30131 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0wg8wavbs063dnpjia7wd60nf97v7pl4lm6s9xndpai1r1c99c2d"; + sha256 = "0zw7lbm6ly2c607ha9gbriknzqbgh3hkqb83507hah1hanzp7zq9"; }; - cargoSha256 = "0igq8aml22c26w43zgk2gii8yl8mhs8ikfh0bn32ajwigqfk4vaq"; + cargoSha256 = "166nsk3v3w5ji7k8hflvjylz8hkgbxqrdwb03m7l8ak8wgkycxzx"; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix index 130bf2bb2e..5ae4f5731b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "morph"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "1y6clzi8sfnrv4an26b44r24nnxds1kj9aw3lmjbgxl9yrxxsj1k"; + sha256 = "064ccvvq4yk17jy5jvi1nxfp5ajvnvn2k4zvh9v0n3ragcl3rd20"; }; goPackagePath = "github.com/dbcdk/morph"; @@ -22,13 +22,13 @@ buildGoPackage rec { main.version=${version} ''; - prePatch = '' + postPatch = '' go-bindata -pkg assets -o assets/assets.go data/ ''; postInstall = '' mkdir -p $lib - cp -v $src/data/*.nix $lib + cp -v go/src/$goPackagePath/data/*.nix $lib wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix b/third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix index fdae5ef39e..4da6f0278b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix @@ -63,4 +63,4 @@ sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq"; }; } -] +] \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index b1a44d7458..c7ad0c30e4 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nfpm"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s"; + sha256 = "0q0472kfsm7h9p1g7yvd9k62myv5db3shpmjv39cx9rkfn6z8482"; }; vendorSha256 = "07xg8cm7pqpnb96drcmzk7rj2dhfn4pd8vr2a7nxqizd3qk6d5bf"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix index 352d1e68b5..41ce0967b2 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-bundle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-bundle"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "matthewbauer"; repo = pname; rev = "v${version}"; - sha256 = "084m9hqm1nhwln2sbg8ck2v2dprvpldxxqmd1r8fcj3dmn4bysz0"; + sha256 = "0hdvdjm467w37clkhbifn54hbdmnxlbk66cj88lwaz26j4s2ik5g"; }; # coreutils, gnutar is actually needed by nix for bootstrap diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 2c5781a95b..bab12ca8e8 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, buildEnv, - bazaar, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion + breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion }: let mkPrefetchScript = tool: src: deps: @@ -26,7 +26,7 @@ let mkPrefetchScript = tool: src: deps: }; }; in rec { - nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ]; + nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ breezy ]; nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ coreutils findutils gawk git ]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix new file mode 100644 index 0000000000..bd4ff86c99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, nix +, nix-prefetch +}: + +buildPythonApplication rec { + pname = "nix-update"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = pname; + rev = version; + sha256 = "0mw31n7kqfr7fskkxp58b0wprxj1pj6n1zs6ymvvl548gs5rgn2s"; + }; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch ]) + ]; + + checkPhase = '' + $out/bin/nix-update --help + ''; + + meta = with lib; { + description = "Swiss-knife for updating nix packages"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ mic92 zowoq ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index c44c7d4c96..4337705db2 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -178,10 +178,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.4"; + name = "nix-2.3.5"; src = fetchurl { url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; + sha256 = "25445353c27d7c2703cd74216bce6458a02068965055d111765ac4186ed678c1"; }; inherit storeDir stateDir confDir boehmgc; @@ -210,13 +210,13 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200501_941f952"; + suffix = "pre20200521_00b562c"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "941f95284ab57e9baa317791327cf1715d8564b5"; - sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs"; + rev = "00b562c87ec4c3bbe514f5dc1f4d1c41f66f66bf"; + hash = "sha256-GqTFh4wBfkKapixKyd3gA9C1tF0PSzZDD5LN+5nQEWk="; }; crates = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix index 8acb5fb9f8..d3cc3c7cad 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "bettercap"; - version = "2.27"; + version = "2.27.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "18hwz9m16pxlb7wp78iqmdi0kimrx3h05fs0zhzm8qhzancq8alf"; + sha256 = "0jb78c3s6p210mj28qg4aacd8ly6d6k5h9c48y88vmcyllzjvbhl"; }; vendorSha256 = "1j272w0zdndcz4fmh9fzbk2q8wmyfi70vn0p6d8cg0r0l231sbyx"; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix index 0c60ab6210..256bf458b3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.13.2b"; + version = "2.14.0"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1pba3d04gfnviv8r98anpv7m8r9r417s352r5fz8qzg8lr070540"; + sha256 = "16620md9lsxw6s0qzv5vj9kfkgxnlaxfrax6s2h3h39skza80x2c"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix index e1ea241c7f..9b58aa97dd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.102.2"; + version = "0.102.3"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49"; + sha256 = "14q6vi178ih60yz4ja33b6181va1dcj8fyscnmxfx2crav250c7d"; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix b/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix index 4acec7c8a5..daeb5e0d39 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "12"; + version = "13"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "1dbyl3c21h841w9lrrq6gd5y6dhamr0z5ixd87jz86cn02lznp5m"; + sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch new file mode 100644 index 0000000000..d1a1997ba1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch @@ -0,0 +1,24 @@ +From 9218347b8f833ab05d016dfba5617dcdeb59eb7b Mon Sep 17 00:00:00 2001 +From: Cole Helbling +Date: Wed, 27 May 2020 08:02:57 -0700 +Subject: [PATCH] add NixOS-specific dirs to safe PATH + +--- + doas.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/doas.c b/doas.c +index e253905..2fdb20f 100644 +--- a/doas.c ++++ b/doas.c +@@ -234,6 +234,7 @@ int + main(int argc, char **argv) + { + const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:" ++ "/run/current-system/sw/bin:/run/current-system/sw/sbin:/run/wrappers/bin:" + "/usr/local/bin:/usr/local/sbin"; + const char *confpath = NULL; + char *shargv[] = { NULL, NULL }; +-- +2.26.2 + diff --git a/third_party/nixpkgs/pkgs/tools/security/doas/default.nix b/third_party/nixpkgs/pkgs/tools/security/doas/default.nix index 58ada1086b..baa2fc301a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doas/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doas/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , bison , pam + +, withTimestamp ? true }: stdenv.mkDerivation rec { @@ -19,6 +21,17 @@ stdenv.mkDerivation rec { # otherwise confuses ./configure dontDisableStatic = true; + configureFlags = [ + (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting + "--pamdir=${placeholder "out"}/etc/pam.d" + ]; + + patches = [ + # Allow doas to discover binaries in /run/current-system/sw/{s,}bin and + # /run/wrappers/bin + ./0001-add-NixOS-specific-dirs-to-safe-PATH.patch + ]; + postPatch = '' sed -i '/\(chown\|chmod\)/d' bsd.prog.mk ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix b/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix index 2cf9b92745..2c3a7a441a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.11.3"; + version = "1.11.4"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "097i2dsnbndpnyc4nx1j76qkx1bxwwlxnzmp1h3j4raghddgiq0g"; + sha256 = "1hqklf6jzrxn5hgh69bbl6962hwwgf06dlrb0ry7n5iy8w8imnsg"; }; buildInputs = [ pam openssl zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ecryptfs/default.nix b/third_party/nixpkgs/pkgs/tools/security/ecryptfs/default.nix index 9fd8c3ac7a..e4caa9c4e1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ecryptfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ecryptfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam +{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam, enablePython ? false , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { @@ -33,8 +33,15 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl nss nspr python2 pam intltool makeWrapper ]; + configureFlags = stdenv.lib.optionals (!enablePython) [ "--disable-pywrap" ]; + + nativeBuildInputs = [ pkgconfig ] + # if python2 support is requested, it is needed at builtime as well as runtime. + ++ stdenv.lib.optionals (enablePython) [ python2 ] + ; + buildInputs = [ perl nss nspr pam intltool makeWrapper ] + ++ stdenv.lib.optionals (enablePython) [ python2 ] + ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix index b119a6ed29..62f5dda17f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix @@ -1,42 +1,70 @@ -{ thinkpad ? false -, stdenv -, fetchurl +{ stdenv +, fetchFromGitLab , fetchpatch , pkgconfig -, intltool -, libfprint-thinkpad ? null -, libfprint ? null +, meson +, ninja +, perl +, gettext +, cairo +, gtk-doc +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_412 , glib +, dbus , dbus-glib , polkit , nss , pam , systemd -, autoreconfHook -, gtk-doc +, libfprint +, python3 }: stdenv.mkDerivation rec { - pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; - version = "0.9.0"; + pname = "fprintd"; + version = "1.90.1"; + outputs = [ "out" "devdoc" ]; - src = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/9dec4b63d1f00e637070be1477ce63c0/fprintd-${version}.tar.xz"; - sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = pname; + rev = version; + sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg"; }; patches = [ + # Fixes issue with ":" when there is multiple paths (might be the case on NixOS) + # https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50 (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/16.patch"; - sha256 = "1y39zsmxjll9hip8464qwhq5qg06c13pnafyafgxdph75lvhdll7"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch"; + sha256 = "QNN05WF4YZ0XiTwm5NkfqZDuQpyXlnrh+RJF9SNsCDk="; + }) + + # Fix locating libpam_wrapper for tests + (fetchpatch { + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch"; + sha256 = "43uPihK6HhygHw1Qplwci80Wseq/S77VUp+OdEECHmM="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch"; + sha256 = "Pga+/QEkln8DOwGZfKM1r2urJX4Y3X0bozWWxKZ5ia0="; }) ]; nativeBuildInputs = [ - intltool pkgconfig - autoreconfHook # Drop with above patch - gtk-doc # Drop with above patch + meson + ninja + perl + gettext + gtk-doc + libxslt + dbus + docbook-xsl-nons + docbook_xml_dtd_412 ]; buildInputs = [ @@ -46,23 +74,43 @@ stdenv.mkDerivation rec { nss pam systemd - ] - ++ stdenv.lib.optional thinkpad libfprint-thinkpad - ++ stdenv.lib.optional (!thinkpad) libfprint - ; - - configureFlags = [ - # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target - "--localstatedir=${placeholder "out"}/var" - "--sysconfdir=${placeholder "out"}/etc" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + libfprint ]; + checkInputs = with python3.pkgs; [ + python-dbusmock + dbus-python + pygobject3 + pycairo + pypamtest + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dpam_modules_dir=${placeholder "out"}/lib/security" + "-Dsysconfdir=${placeholder "out"}/etc" + "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services" + "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" + ]; + + PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; + + # FIXME: Ugly hack for tests to find libpam_wrapper.so + LIBRARY_PATH = stdenv.lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + + doCheck = true; + + postPatch = '' + patchShebangs po/check-translations.sh + ''; + meta = with stdenv.lib; { homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar elyhaka ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix index 6a2eee4714..c7a5a99855 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "0rh19lblz8wp8q2x123nlwvxq1pjq9zw12w18z83v2l2knjbc524"; + sha256 = "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix index 642b7d8030..80634b7d1a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; - sha256 = "1dbralnbi5q5v6a5nbs64ihvs20fkm3cddsbakck5fbqdm5by7k7"; + sha256 = "1l6l3nb1yq0f09ia3k9k1dcpzp9g1hxnf547pqmiyiqvd27n7shs"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 3924e6919d..457c6249ca 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.74" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.90" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 17d160c8dc..7142983f98 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 22104a154544b3ee57d3ce98a490c4b42a4a8776 - ref: refs/tags/5.0.74 + revision: 592eedc5584953fb94b01a9aae48ec04d2cf153a + ref: refs/tags/5.0.90 specs: - metasploit-framework (5.0.74) + metasploit-framework (5.0.90) actionpack (~> 4.2.6) activerecord (~> 4.2.6) activesupport (~> 4.2.6) @@ -13,27 +13,30 @@ GIT bcrypt (= 3.1.12) bcrypt_pbkdf bit-struct + bson concurrent-ruby (= 1.0.5) dnsruby ed25519 em-http-request eventmachine faker - faraday (<= 0.17.0) + faraday faye-websocket filesize + hrr_rb_ssh (= 0.3.0.pre2) jsobfu json metasm metasploit-concern (~> 2.0.0) metasploit-credential (~> 3.0.0) metasploit-model (~> 2.0.4) - metasploit-payloads (= 1.3.84) + metasploit-payloads (= 1.4.2) metasploit_data_models (~> 3.0.10) - metasploit_payloads-mettle (= 0.5.16) + metasploit_payloads-mettle (= 0.5.21) mqtt msgpack nessus_rest + net-ldap net-ssh network_interface nexpose @@ -87,27 +90,27 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.3) - actionpack (4.2.11.1) - actionview (= 4.2.11.1) - activesupport (= 4.2.11.1) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.1) - activesupport (= 4.2.11.1) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (4.2.11.1) - activesupport (= 4.2.11.1) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.11.1) - activemodel (= 4.2.11.1) - activesupport (= 4.2.11.1) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -118,32 +121,33 @@ GEM arel (6.0.4) arel-helpers (2.11.0) activerecord (>= 3.1.0, < 7) - aws-eventstream (1.0.3) - aws-partitions (1.274.0) - aws-sdk-core (3.90.1) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-eventstream (1.1.0) + aws-partitions (1.319.0) + aws-sdk-core (3.96.1) + aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.144.0) + aws-sdk-ec2 (1.162.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.33.0) + aws-sdk-iam (1.37.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.29.0) + aws-sdk-kms (1.31.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.60.2) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-s3 (1.66.0) + aws-sdk-core (~> 3, >= 3.96.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) + aws-sigv4 (1.1.3) aws-eventstream (~> 1.0, >= 1.0.2) bcrypt (3.1.12) bcrypt_pbkdf (1.0.1) - bindata (2.4.4) + bindata (2.4.7) bit-struct (0.16) + bson (4.8.2) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) @@ -164,13 +168,15 @@ GEM eventmachine (1.2.7) faker (2.2.1) i18n (>= 0.8) - faraday (0.17.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) faye-websocket (0.10.9) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) filesize (0.2.0) hashery (2.1.2) + hrr_rb_ssh (0.3.0.pre2) + ed25519 (~> 1.2) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -178,7 +184,7 @@ GEM jsobfu (0.4.2) rkelly-remix json (2.3.0) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) @@ -200,7 +206,7 @@ GEM activemodel (~> 4.2.6) activesupport (~> 4.2.6) railties (~> 4.2.6) - metasploit-payloads (1.3.84) + metasploit-payloads (1.4.2) metasploit_data_models (3.0.10) activerecord (~> 4.2.6) activesupport (~> 4.2.6) @@ -211,19 +217,20 @@ GEM postgres_ext railties (~> 4.2.6) recog (~> 2.0) - metasploit_payloads-mettle (0.5.16) + metasploit_payloads-mettle (0.5.21) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) mqtt (0.5.0) msgpack (1.3.3) multipart-post (2.1.1) nessus_rest (0.1.6) - net-ssh (5.2.0) + net-ldap (0.16.2) + net-ssh (6.0.2) network_interface (0.0.2) nexpose (7.2.1) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - octokit (4.16.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) @@ -244,7 +251,7 @@ GEM activerecord (~> 4.0) arel (>= 4.0.1) pg_array_parser (~> 0.0.9) - public_suffix (4.0.3) + public_suffix (4.0.5) rack (1.6.13) rack-protection (1.5.5) rack @@ -258,14 +265,14 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (4.2.11.1) - actionpack (= 4.2.11.1) - activesupport (= 4.2.11.1) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.0.1) rb-readline (0.5.5) - recog (2.3.6) + recog (2.3.7) nokogiri redcarpet (3.5.0) rex-arch (0.1.13) @@ -281,7 +288,7 @@ GEM metasm rex-arch rex-text - rex-exploitation (0.1.22) + rex-exploitation (0.1.24) jsobfu metasm rex-arch @@ -294,9 +301,10 @@ GEM rex-arch rex-ole (0.1.6) rex-text - rex-powershell (0.1.86) + rex-powershell (0.1.87) rex-random_identifier rex-text + ruby-rc4 rex-random_identifier (0.1.4) rex-text rex-registry (0.1.3) @@ -304,14 +312,14 @@ GEM metasm rex-core rex-text - rex-socket (0.1.21) + rex-socket (0.1.23) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text rex-struct2 (0.1.2) - rex-text (0.2.24) + rex-text (0.2.26) rex-zip (0.1.3) rex-text rkelly-remix (0.0.7) @@ -322,7 +330,7 @@ GEM rubyntlm windows_error rubyntlm (0.6.2) - rubyzip (2.2.0) + rubyzip (2.3.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -340,9 +348,9 @@ GEM thread_safe (0.3.6) tilt (2.0.10) ttfunk (1.6.2.1) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - tzinfo-data (1.2019.3) + tzinfo-data (1.2020.1) tzinfo (>= 1.0.0) warden (1.2.7) rack (>= 1.0) diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index 54da89a99b..cc3d26fbee 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -17,13 +17,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "5.0.74"; + version = "5.0.90"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp"; + sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index a35aa958a1..cd3b2a336b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh"; + sha256 = "1955wx9m2g776sinamanzlk1jx2dzd34ci3sk22xicp0rmglps37"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p"; + sha256 = "0glnaq3jx4m9q6vn55xqlsg8dbflqzm99fgsl9fl267mc2mz3qrv"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33"; + sha256 = "1z3777xsm82i7ggkg74mg21sqz8m5dfl8ykjm7xcrhd2nj843fcp"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p"; + sha256 = "1fpw9vyf2frkxkc6jbq9g78lhhflwz04j89qxj4krvmlq12q8v6d"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; addressable = { groups = ["default"]; @@ -104,80 +104,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k2dpn0xznksh5y9bq9gbvbych06pzyswsdak7bz8nlkbsgf38x3"; + sha256 = "11gr3pkd0cq034jdmvmi32sb99hkh91qjrpvc6jchi4lsaiaiqgc"; type = "gem"; }; - version = "1.274.0"; + version = "1.319.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i"; + sha256 = "0jdnzynjrpp2jyg8vrbfbaad16k8ni1520xah1z2ckl5779x9fi6"; type = "gem"; }; - version = "3.90.1"; + version = "3.96.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5"; + sha256 = "0xp9kp90ixk1ywd0d8ssbk8dl5kxqnz942yr2qq00m7fd60pihh7"; type = "gem"; }; - version = "1.144.0"; + version = "1.162.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz"; + sha256 = "09l3g5a2r7gnc6pwln409b9ahwcs6xpnjx2qaj70cbllanyxbw0c"; type = "gem"; }; - version = "1.33.0"; + version = "1.37.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw"; + sha256 = "1czxr6yi8p9gma4dwgygp1jn0i289hwa2vw69kzfscgbn118c3mm"; type = "gem"; }; - version = "1.29.0"; + version = "1.31.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz"; + sha256 = "1x1d1azxwanvm0d7qppw41x5nx2zv0bcz41yk9vqi5lvr7apaq13"; type = "gem"; }; - version = "1.60.2"; + version = "1.66.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + sha256 = "0kysxyw1zkvggbmcj4xnscdh15kxli8mx07hv447h74g9x02drsd"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.3"; }; bcrypt = { groups = ["default"]; @@ -204,10 +204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kz42nvxnk1j9cj0i8lcnhprcgdqsqska92g6l19ziadydfk2gqy"; + sha256 = "033vd169q751qn3zrsv8j5f80k6wg5yhsy8z3clds6py4vqm6xl8"; type = "gem"; }; - version = "2.4.4"; + version = "2.4.7"; }; bit-struct = { groups = ["default"]; @@ -219,6 +219,16 @@ }; version = "0.16"; }; + bson = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06h8sk2wl7pgrwl15xb1bd6l9ws8sz006rf9cy6n6q7g0iwdalkh"; + type = "gem"; + }; + version = "4.8.2"; + }; builder = { groups = ["default"]; platforms = []; @@ -344,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "0.17.0"; + version = "1.0.1"; }; faye-websocket = { groups = ["default"]; @@ -379,6 +389,16 @@ }; version = "2.1.2"; }; + hrr_rb_ssh = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066dj9sw5p8aa54vqc1bw7a8nfpf5rggrjyxqw2ccyxp10964qkz"; + type = "gem"; + }; + version = "0.3.0.pre2"; + }; "http_parser.rb" = { groups = ["default"]; platforms = []; @@ -434,10 +454,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; + sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; metasm = { groups = ["default"]; @@ -474,12 +494,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "22104a154544b3ee57d3ce98a490c4b42a4a8776"; - sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp"; + rev = "592eedc5584953fb94b01a9aae48ec04d2cf153a"; + sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "5.0.74"; + version = "5.0.90"; }; metasploit-model = { groups = ["default"]; @@ -496,10 +516,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wz72w5a34r6jcgbl97ha3zhl8d28r974clcp99qj5sg71k280c0"; + sha256 = "1kddir54jnzl64nsawnvkzdabnmqncq9vav49i1cfschnf4cxc4g"; type = "gem"; }; - version = "1.3.84"; + version = "1.4.2"; }; metasploit_data_models = { groups = ["default"]; @@ -516,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2rgs2r16m8z87j5z78vp49xvr2sr4dxjgbi6d0nxrlr52pd8yf"; + sha256 = "1419z6z0j69zdlkfx3kqgqygsm0ysigwccgn82z5lz82i16krhca"; type = "gem"; }; - version = "0.5.16"; + version = "0.5.21"; }; mini_portile2 = { groups = ["default"]; @@ -536,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.1"; }; mqtt = { groups = ["default"]; @@ -581,15 +601,25 @@ }; version = "0.1.6"; }; + net-ldap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + type = "gem"; + }; + version = "0.16.2"; + }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; + sha256 = "0kf4am0mz8mwqhif4iqh5yz9pcbbmja5w707j00sfsgrq19nxqld"; type = "gem"; }; - version = "5.2.0"; + version = "6.0.2"; }; network_interface = { groups = ["default"]; @@ -616,20 +646,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; octokit = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; + sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; type = "gem"; }; - version = "4.16.0"; + version = "4.18.0"; }; openssl-ccm = { groups = ["default"]; @@ -726,10 +756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.5"; }; rack = { groups = ["default"]; @@ -796,10 +826,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m"; + sha256 = "12f7g5iw1gqjwl2rvfmbgxipds5c475ggalw6qskzzrx9vyc2fpk"; type = "gem"; }; - version = "4.2.11.1"; + version = "4.2.11.3"; }; rake = { groups = ["default"]; @@ -826,10 +856,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kw753vq5m5m8pzn1avafzz757gdzzsv7ck94y6d8n4jzqa50isv"; + sha256 = "1j65iary8qkgyrjc3vnjd7dbyjs2bsz2hcg7ndibjk623faxb1wk"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.7"; }; redcarpet = { groups = ["default"]; @@ -886,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16anprj4pc4pi2yb1y6b7c8nrqgpk49g40wy1384snmii24jiwyx"; + sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3"; type = "gem"; }; - version = "0.1.22"; + version = "0.1.24"; }; rex-java = { groups = ["default"]; @@ -936,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "150nmpgrvpd6hyx9cghah8dxpcfb1h7inpcwmz7ijpir60zxxfdj"; + sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl"; type = "gem"; }; - version = "0.1.86"; + version = "0.1.87"; }; rex-random_identifier = { groups = ["default"]; @@ -976,10 +1006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jkmff92ga9qd9gg13cd6s99qcdmr5n354l9br70j784mpyl9apb"; + sha256 = "07vm17w791vdpr23aqp45kqsjbqgwpqj92a535h6n4fckxgzhg94"; type = "gem"; }; - version = "0.1.21"; + version = "0.1.23"; }; rex-sslscan = { groups = ["default"]; @@ -1006,10 +1036,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjrp4n7j2ifdgqc6z8z4jbz9gr7g5m5h35b7vx4k9cbaq9b5zxw"; + sha256 = "17m5zwca15qsd7mqqhi2q530iwsrb7wkqh8qff7pxjxwlxbvsrxx"; type = "gem"; }; - version = "0.2.24"; + version = "0.2.26"; }; rex-zip = { groups = ["default"]; @@ -1076,10 +1106,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13b15icwx0c8zzjfzf7bmqq9ynilw0dy8ydgjb199nqzp93p6wqv"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; sawyer = { groups = ["default"]; @@ -1176,20 +1206,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; tzinfo-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fbf05qhcxp8anmp7k5wnafw3ypy607h5ybnqg92dqgh4b1c3yi"; + sha256 = "1kjywciambyhlkc8ijp3kkx4r24pi9zs7plmxw003mxr6mrhah1w"; type = "gem"; }; - version = "1.2019.3"; + version = "1.2020.1"; }; warden = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/shell.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/shell.nix index cd7a01214c..e4bae57b68 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/shell.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/shell.nix @@ -3,14 +3,15 @@ with import {}; stdenv.mkDerivation { name = "env"; buildInputs = [ - ruby.devEnv + bundix git - sqlite + libiconv libpcap - postgresql libxml2 libxslt - pkgconfig - bundix + pkg-config + postgresql + ruby.devEnv + sqlite ]; } diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix index 06826173e3..282b1df299 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1cd74nd57wmms2yrnzs64xki29rf4kx61kd30fyd56wlicyjdfa0"; + sha256 = "0di97zmxdh04m2ibyshcgvillwxx6rnd0543scm7q10y7nv74m0p"; }; nativeBuildInputs = [ pandoc pkgconfig makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 515b588499..e1b6ef8086 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0fbbvihvlzh95rrk65bwxfcam6y57q0yffq8dzvcbm3i0ap7ndar"; + sha256 = "0aschysngs6f50plqkqbnhgl6zryd0bpypr50zd45cgww7jvvqd4"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/third_party/nixpkgs/pkgs/tools/security/yara/default.nix b/third_party/nixpkgs/pkgs/tools/security/yara/default.nix index a470ad11ca..8a11953502 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yara/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yara/default.nix @@ -1,30 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pcre +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pcre +, pkg-config +, protobufc , withCrypto ? true, openssl , enableMagic ? true, file , enableCuckoo ? true, jansson }: stdenv.mkDerivation rec { - version = "3.11.0"; + version = "4.0.1"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "0mx3xm2a70fx8vlynkavq8gfd9w5yjcix5rx85444i2s1h6kcd0j"; + sha256 = "0dy8jf0pdn0wilxy1pj6pqjxg7icxkwax09w54np87gl9p00f5rk"; }; - # See: https://github.com/VirusTotal/yara/issues/1036 - # TODO: This patch should not be necessary in the next release - patches = [ - (fetchpatch { - url = "https://github.com/VirusTotal/yara/commit/04df811fa61fa54390b274bfcf56d7403c184404.patch"; - sha256 = "0hsbc2k7nmk2kskll971draz0an4rmcs5v0iql47mz596vqvkzmb"; - }) - ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ autoconf automake libtool pcre ] + buildInputs = [ pcre protobufc ] ++ stdenv.lib.optionals withCrypto [ openssl ] ++ stdenv.lib.optionals enableMagic [ file ] ++ stdenv.lib.optionals enableCuckoo [ jansson ] @@ -40,8 +38,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The pattern matching swiss knife for malware researchers"; - homepage = "http://Virustotal.github.io/yara/"; - license = licenses.asl20; - platforms = stdenv.lib.platforms.all; + homepage = "http://Virustotal.github.io/yara/"; + license = licenses.asl20; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/disk-filltest/default.nix b/third_party/nixpkgs/pkgs/tools/system/disk-filltest/default.nix new file mode 100644 index 0000000000..074b06aa4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/disk-filltest/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "disk-filltest"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "bingmann"; + repo = "disk-filltest"; + rev = "v${version}"; + sha256 = "1vcb43hdln7xlklz1n0fsfp5x1j9pn829wbad4b110hrc7nwrnvm"; + }; + + preBuild = '' + substituteInPlace Makefile --replace 'prefix = /usr/local' 'prefix = $(out)' + ''; + + postInstall = '' + install -D -m0644 -t $out/share/doc COPYING README + mkdir -p $out/share/man; mv $out/man1 $out/share/man + ''; + + meta = with stdenv.lib; { + description = "Simple program to detect bad disks by filling them with random data"; + longDescription = '' + disk-filltest is a tool to check storage disks for coming + failures by write files with pseudo-random data to the current + directory until the disk is full, read the files again + and verify the sequence written. It also can measure + read/write speed while filling the disk. + ''; + homepage = "https://panthema.net/2013/disk-filltest"; + license = licenses.gpl3; + maintainers = with maintainers; [ caadar ]; + platforms = platforms.all; + }; + +} diff --git a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix index 3cf9e97639..8b9f1085a9 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.19"; + version = "3.20"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "1gr62mzv5rk6mbhll2c0fxgb46anx375cm2ym10mj2rvabcrhnqq"; + sha256 = "1ahdcyrj7jgm4qx5s0q7gvbpqr2w57psazsf0wswp1v3mb9w4zg4"; }; buildInputs = [ python zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix index e51f554ea0..35fb630d23 100644 --- a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.4"; + version = "1.6.5"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5"; + sha256 = "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1"; }; buildInputs = [ libgcrypt readline libgpgerror ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix index 2964efd067..893e3e7e98 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotop"; - version = "3.5.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; + sha256 = "0d08pi213nzvj4vhd2sbri39qlxa7iazc8bcrikhmmr0pghjfwhn"; }; vendorSha256 = "1ais548gii4q7xzysnw2ykjxyzb7azszsqdlp9hgiwp0bax9nj2n"; diff --git a/third_party/nixpkgs/pkgs/tools/system/ior/default.nix b/third_party/nixpkgs/pkgs/tools/system/ior/default.nix index 6015e60afb..eff85589a1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ior/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ior/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, openmpi, automake, autoconf, perl }: +{ stdenv, fetchFromGitHub, openmpi, perl, autoreconfHook }: -let - version = "3.0.1"; - sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ior"; - inherit version; + version = "3.2.1"; - src = fetchurl { - url = "https://github.com/LLNL/ior/archive/${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "hpc"; + repo = pname; + rev = version; + sha256 = "036cg75c5vq6kijfv8f918vpm9sf1h7lyg6xr9fba7n0dwbbmycv"; }; - buildInputs = [ openmpi automake autoconf perl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openmpi perl ]; enableParallelBuilding = true; - preConfigure = "./bootstrap"; - meta = with stdenv.lib; { - homepage = "https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/"; + homepage = "https://ior.readthedocs.io/en/latest/"; description = "Parallel file system I/O performance test"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index 102858bece..5d856e7953 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.21.1"; + version = "1.22.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "0i0k64r8j1g02s2bi2gm0j47y52l3xli63w686ncpgmlhwmdfz65"; + sha256 = "1hliv4d3pa8c3inz0bcl6nngfmp8vwnvh7smbwqiq7isfjijbpr6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 883305b1d5..5e50c3c875 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.08"; + version = "0.11.10"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1xy5m5r4icc10h957ank0amnh46v2v47z4n1z43d9s7lmvahw287"; + sha256 = "0x46shnwllv5knpbxj1vj2aqmxgnfhz582crlacwsinc22n1j18i"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix b/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix index 08e227d245..64c3bf93aa 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ytop/default.nix @@ -4,18 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1p746v9xrfm6avc6v9dvcnpckhvdizzf53pcg9bpcp0lw5sh85da"; + sha256 = "02cpn5257yrmbakx3mlqs97kfambbn9ljb60jbqr1b9w24kd6zgf"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "15cpi0b5yqjwi1liry2q17sn9hpc4xf9gn33ri3rs6ls5qs7j7pa"; + cargoSha256 = "0alqzy9gbj9m4l7xj1jsrnl09pv6z7c73gq787cqwn0gj93aaj19"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/system/zenith/cargo-lock.patch b/third_party/nixpkgs/pkgs/tools/system/zenith/cargo-lock.patch deleted file mode 100644 index 023480767b..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/zenith/cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3f4eec6..64b1a6a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1297,7 +1297,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "zenith" --version = "0.8.0" -+version = "0.8.2" - dependencies = [ - "battery", - "bincode", diff --git a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix index cdaf3a0f8e..b7912f44cd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "1s1l4nq4bsvi54i603faann8cp1409qa2ka7id0m38b3li8z2984"; + sha256 = "1yfbr8zmcy7zp9s9cqv7qypj2vvhpq09r0398gr7ckjk6v70hhfg"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0h6k7yf4hpfxnad46iv8gp3v3zc4x4p9yab40gr8xv8r1syf9f6g"; + cargoSha256 = "1l4cjcpfghis983y31s54fzjppdnh3wa4anwi7bdsbyvqz3n3ywj"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix index afd1a2990f..38ef6561ac 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "10svzq7656lynfcgnbyaibfvv48i4289ymxfc0bn0212biyrl1zb"; + sha256 = "0kkpacb31d0rg4774a63x3njifn3813d8r8vc8skzv4ki7gvhxkr"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "05nh3dfr7mdw21sdavyyjhr8sa4jcfqzwizbgg92ib7r834ir3m0"; + cargoSha256 = "1pljgnckardy3j81im6k5dssz794c7vjx1dfr7950ndhrzwv7p22"; checkInputs = [ ansi2html ]; checkPhase = '' @@ -22,6 +22,8 @@ rustPlatform.buildRustPackage rec { cargo test -- --skip terminal::iterm2 \ --skip magic::tests::detect_mimetype_of_svg_image \ --skip magic::tests::detect_mimetype_of_png_image \ + --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \ + --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \ --skip resources::tests::read_url_with_http_url_fails_when_status_404 \ --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 ''; diff --git a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix index 767569e42c..ccd99a272b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "2.3"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "0smvdpvb4hdhqc327pcj29bzjqbzgad6mr7r5pg81461fi2r2myw"; + sha256 = "04f9za35rwyr7mabk8f8izc0fgvc3sfx45v8dml1xmi634n174ds"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix index dcce9bf329..44eacacd0e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "phiresky"; repo = pname; rev = "v${version}"; - sha256 = "1nl03i36ilhxn5xbcry6pcr7vbl5667m43flpxaa0lf1wijzn5c2"; + sha256 = "1wjpgi7m3lxybllkr3r60zaphp02ykq2syq72q9ail2760cjcir6"; }; - cargoSha256 = "0ndyd8qrvljkk6yvpsp0w17iizxb529sh5q2bj790m32x0gz2w8l"; + cargoSha256 = "0arwxqrpxdws4q1pnqzqkp1yv5aas08lkzh1vcgmf26j58sycniy"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index d2116ced5e..863e4764b6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "0cnx7snw3h7p77fhihvqxb6bgg4s2ffvjr8nbymb4bnqlg2a7v97"; + sha256 = "0jhc47g5x34c36y4d32lcn32bpw4axxf1sydawgy4886hmkvb6kf"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix b/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix index 30cc825c66..6c8e5520d7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xurls/default.nix @@ -1,14 +1,14 @@ { buildGoPackage, stdenv, fetchFromGitHub }: buildGoPackage rec { - version = "2.0.0"; + version = "2.2.0"; pname = "xurls"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "1jdjwlp19r8cb7vycyrjmpwf8dz2fzrqphq4lkvy9x2v7x0kksx8"; + sha256 = "0w7i1yfl5q24wvmsfb3fz1zcqsdh4c6qikjnmswxbjc7wva8rngg"; }; goPackagePath = "mvdan.cc/xurls/v2"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index bb6432fc3e..29c07408e7 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -175,7 +175,7 @@ in description = "TeX Live environment for ${pname}"; platforms = lib.platforms.all; hydraPlatforms = lib.optionals - (lib.elem pname ["scheme-small" "scheme-basic"]) platforms; + (!lib.elem pname ["scheme-infraonly"]) platforms; maintainers = with lib.maintainers; [ veprbl ]; } (combine { diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 2c2444de4e..ea58eb4c6b 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -1,21 +1,22 @@ { stdenv , lib -, fetchFromGitHub -, curl -, json_c -, pam , bashInteractive +, curl +, fetchFromGitHub +, json_c +, nixosTests +, pam }: stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "20200325.00"; + version = "20200507.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "03hk95pgzcgy6ginp8zdy0fbk88m6n65qq22jq490z1xwbjffm8r"; + sha256 = "1np8c96sm29pwnxykc0id8kkgalhw576g43fgi1y936sr2hfvx3v"; }; postPatch = '' @@ -42,10 +43,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) google-oslogin; + }; + meta = with stdenv.lib; { homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine"; license = licenses.asl20; - maintainers = with maintainers; [ adisbladis flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix index 48255ca68a..34f2bc9e19 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { postPatch = '' for file in $(find google_compute_engine -type f); do substituteInPlace "$file" \ - --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \ + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \ --replace /bin/bash "${bashInteractive}/bin/bash" \ --replace /sbin/hwclock "${utillinux}/bin/hwclock" # SELinux tool ??? /sbin/restorecon diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix index 1595af8477..e3329ea13f 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.21.0"; + version = "0.22.1"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130"; + sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix new file mode 100644 index 0000000000..0c6d7e7b9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix @@ -0,0 +1,30 @@ +{ stdenv, nix, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "nixos-shell"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nixos-shell"; + rev = version; + sha256 = "1qk5a01vh6wbbkib8xr57w1j4l3n6xdjd46nsw9bsa444fzlc0wr"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/nixos-shell \ + --prefix PATH : ${stdenv.lib.makeBinPath [ nix ]} + ''; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Spawns lightweight nixos vms in a shell"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/agda-packages.nix b/third_party/nixpkgs/pkgs/top-level/agda-packages.nix index 3f4d7db0c7..5b5b2d1918 100644 --- a/third_party/nixpkgs/pkgs/top-level/agda-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/agda-packages.nix @@ -22,5 +22,7 @@ let agda-prelude = callPackage ../development/libraries/agda/agda-prelude { }; agda-categories = callPackage ../development/libraries/agda/agda-categories { }; + + cubical = callPackage ../development/libraries/agda/cubical { }; }; in mkAgdaPackages Agda diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 5767878dc6..ff40513107 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -50,6 +50,8 @@ mapAliases ({ bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 + bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 + bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 beegfs = throw "beegfs has been removed."; # added 2019-11-24 bluezFull = bluez; # Added 2019-12-03 bridge_utils = bridge-utils; # added 2015-02-20 @@ -149,6 +151,7 @@ mapAliases ({ fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 + fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 @@ -265,6 +268,7 @@ mapAliases ({ linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 @@ -279,6 +283,7 @@ mapAliases ({ matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 + mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 mysql-client = hiPrio mariadb.client; @@ -301,6 +306,7 @@ mapAliases ({ msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 mssys = ms-sys; # added 2015-12-13 + mpv-with-scripts = throw "Use wrapMpv for editing the environment of mpv"; # added 2012-05-22 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 @@ -453,6 +459,7 @@ mapAliases ({ recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby"; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index e87f34a028..3e84f95243 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -173,6 +173,8 @@ in colorz = callPackage ../tools/misc/colorz { }; + comedilib = callPackage ../development/libraries/comedilib { }; + cpu-x = callPackage ../applications/misc/cpu-x { }; dhallToNix = callPackage ../build-support/dhall-to-nix.nix { @@ -183,7 +185,7 @@ in glade = callPackage ../development/tools/glade { }; - hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. + hobbes = callPackage ../development/tools/hobbes { }; proto-contrib = callPackage ../development/tools/proto-contrib {}; @@ -302,6 +304,8 @@ in pet = callPackage ../development/tools/pet { }; + pkger = callPackage ../development/libraries/pkger { }; + run = callPackage ../development/tools/run { }; mod = callPackage ../development/tools/mod { }; @@ -597,6 +601,8 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; + agda-pkg = callPackage ../development/tools/agda-pkg { }; + agrep = callPackage ../tools/text/agrep { }; aha = callPackage ../tools/text/aha { }; @@ -671,6 +677,8 @@ in aptly = callPackage ../tools/misc/aptly { }; + ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; @@ -810,6 +818,10 @@ in bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; + bashcards = callPackage ../tools/misc/bashcards { }; + + bazarr = callPackage ../servers/bazarr { }; + bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; bitwarden = callPackage ../tools/security/bitwarden { }; @@ -1359,7 +1371,8 @@ in btfs = callPackage ../os-specific/linux/btfs { }; - buildah = callPackage ../development/tools/buildah { }; + buildah = callPackage ../development/tools/buildah/wrapper.nix { }; + buildah-unwrapped = callPackage ../development/tools/buildah { }; buildkit = callPackage ../development/tools/buildkit { }; @@ -1665,6 +1678,8 @@ in discount = callPackage ../tools/text/discount { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; + diskscan = callPackage ../tools/misc/diskscan { }; disorderfs = callPackage ../tools/filesystems/disorderfs { @@ -1840,6 +1855,8 @@ in go-dependency-manager = callPackage ../development/tools/gdm { }; + go-neb = callPackage ../applications/networking/instant-messengers/go-neb { }; + geckodriver = callPackage ../development/tools/geckodriver { }; geekbench = callPackage ../tools/misc/geekbench { }; @@ -1860,6 +1877,8 @@ in gixy = callPackage ../tools/admin/gixy { }; + glpaper = callPackage ../development/tools/glpaper { }; + gllvm = callPackage ../development/tools/gllvm { }; glide = callPackage ../development/tools/glide { }; @@ -2142,6 +2161,8 @@ in psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -2833,6 +2854,10 @@ in deer = callPackage ../shells/zsh/zsh-deer { }; + deno = callPackage ../development/web/deno { + inherit (darwin.apple_sdk.frameworks) Security CoreServices; + }; + detox = callPackage ../tools/misc/detox { }; devilspie2 = callPackage ../applications/misc/devilspie2 { @@ -3357,6 +3382,8 @@ in fdm = callPackage ../tools/networking/fdm {}; + fdtools = callPackage ../tools/misc/fdtools { }; + featherpad = callPackage ../applications/editors/featherpad {}; feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; @@ -3387,8 +3414,6 @@ in stdenv = gccStdenv; }; - fluidasserts = with python37Packages; toPythonApplication fluidasserts; - flux = callPackage ../development/compilers/flux { }; fido2luks = callPackage ../tools/security/fido2luks {}; @@ -3512,9 +3537,6 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; - fprintd-thinkpad = fprintd.override { - thinkpad = true; - }; franz = callPackage ../applications/networking/instant-messengers/franz { }; @@ -3817,6 +3839,12 @@ in # rename to upower-notify? go-upower-notify = callPackage ../tools/misc/upower-notify { }; + goattracker = callPackage ../applications/audio/goattracker { }; + + goattracker-stereo = callPackage ../applications/audio/goattracker { + isStereo = true; + }; + google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { }; google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; @@ -4470,6 +4498,8 @@ in jucipp = callPackage ../applications/editors/jucipp { }; + jugglinglab = callPackage ../tools/misc/jugglinglab { }; + jupp = callPackage ../applications/editors/jupp { }; jupyter = callPackage ../applications/editors/jupyter { }; @@ -4626,6 +4656,8 @@ in lnav = callPackage ../tools/misc/lnav { }; + lnch = callPackage ../tools/misc/lnch { }; + loadlibrary = callPackage ../tools/misc/loadlibrary { }; loc = callPackage ../development/misc/loc { }; @@ -5240,7 +5272,9 @@ in monit = callPackage ../tools/system/monit { }; - monolith = callPackage ../tools/backup/monolith { }; + monolith = callPackage ../tools/backup/monolith { + inherit (darwin.apple_sdk.frameworks) Security; + }; moreutils = callPackage ../tools/misc/moreutils { docbook-xsl = docbook_xsl; @@ -5876,6 +5910,8 @@ in fmodex = callPackage ../games/zandronum/fmod.nix { }; + pdfminer = with python3Packages; toPythonApplication pdfminer; + pdfmod = callPackage ../applications/misc/pdfmod { }; pdf-quench = callPackage ../applications/misc/pdf-quench { }; @@ -5942,6 +5978,8 @@ in pingtcp = callPackage ../tools/networking/pingtcp { }; + pinnwand = callPackage ../servers/pinnwand { }; + pirate-get = callPackage ../tools/networking/pirate-get { }; pipreqs = callPackage ../tools/misc/pipreqs { }; @@ -6100,6 +6138,8 @@ in pubs = callPackage ../tools/misc/pubs {}; + pure-prompt = callPackage ../shells/zsh/pure-prompt { }; + pv = callPackage ../tools/misc/pv { }; pwgen = callPackage ../tools/security/pwgen { }; @@ -6630,7 +6670,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = callPackage ../applications/misc/sleepyhead {}; + sleepyhead = libsForQt5.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -6877,6 +6917,8 @@ in libxml2 = libxml2Python; }; + systembus-notify = callPackage ../applications/misc/systembus-notify { }; + stricat = callPackage ../tools/security/stricat { }; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; @@ -6943,6 +6985,8 @@ in pythonPackages = python3Packages; }; + termius = callPackage ../applications/networking/termius { }; + termplay = callPackage ../tools/misc/termplay { }; tewisay = callPackage ../tools/misc/tewisay { }; @@ -7154,6 +7198,10 @@ in tuir = callPackage ../applications/misc/tuir { }; + tunnelto = callPackage ../tools/networking/tunnelto { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tuptime = callPackage ../tools/system/tuptime { }; turses = callPackage ../applications/networking/instant-messengers/turses { }; @@ -7407,10 +7455,6 @@ in wootility = callPackage ../tools/misc/wootility { }; - wormhole = callPackage ../tools/networking/wormhole { - inherit (darwin.apple_sdk.frameworks) Security; - }; - wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; @@ -8044,6 +8088,8 @@ in bluespec = callPackage ../development/compilers/bluespec { }; + ciao = callPackage ../development/compilers/ciao { }; + colm = callPackage ../development/compilers/colm { }; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; @@ -8196,10 +8242,13 @@ in fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; - gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; + gambit = callPackage ../development/compilers/gambit { }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; + gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; + gerbil = callPackage ../development/compilers/gerbil { }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; + gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9); gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9; @@ -8534,6 +8583,15 @@ in gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; gcc-arm-embedded = gcc-arm-embedded-9; + gdc = gdc9; + gdc9 = wrapCC (gcc9.cc.override { + name = "gdc"; + langCC = false; + langC = false; + langD = true; + profiledCompiler = false; + }); + gforth = callPackage ../development/compilers/gforth {}; gleam = callPackage ../development/compilers/gleam { @@ -8674,6 +8732,8 @@ in idris = idrisPackages.with-packages [ idrisPackages.base ] ; + idris2 = callPackage ../development/compilers/idris2 { }; + intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { }; intercal = callPackage ../development/compilers/intercal { }; @@ -9313,7 +9373,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc extraPackages; + inherit cc bintools libc extraPackages zlib; } // extraArgs; in self); wrapCC = cc: wrapCCWith { @@ -9884,7 +9944,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_6 ansible_2_7 ansible_2_8 ansible_2_9; @@ -10169,6 +10228,8 @@ in cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; + cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { }; + # Does not actually depend on Qt 5 inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools; @@ -10563,7 +10624,9 @@ in kubicorn = callPackage ../development/tools/kubicorn { }; - kubie = callPackage ../development/tools/kubie { }; + kubie = callPackage ../development/tools/kubie { + inherit (darwin.apple_sdk.frameworks) Security; + }; kustomize = callPackage ../development/tools/kustomize { }; @@ -10666,6 +10729,8 @@ in pythonPackages = python3Packages; }; + nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; + nexus = callPackage ../development/tools/repository-managers/nexus { }; nwjs = callPackage ../development/tools/nwjs { @@ -11042,6 +11107,8 @@ in vultr = callPackage ../development/tools/vultr { }; + vultr-cli = callPackage ../development/tools/vultr-cli { }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -11528,6 +11595,8 @@ in dssi = callPackage ../development/libraries/dssi {}; + duckdb = callPackage ../development/libraries/duckdb {}; + dxflib = callPackage ../development/libraries/dxflib {}; easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; @@ -11809,6 +11878,16 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + }); + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; glbinding = callPackage ../development/libraries/glbinding { }; @@ -12772,9 +12851,6 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-thinkpad = libfprint.override { - thinkpad = true; - }; libfpx = callPackage ../development/libraries/libfpx { }; @@ -13260,6 +13336,8 @@ in libp11 = callPackage ../development/libraries/libp11 { }; + libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { }; + libpar2 = callPackage ../development/libraries/libpar2 { }; libpcap = callPackage ../development/libraries/libpcap { }; @@ -13549,6 +13627,8 @@ in python = if stdenv.isDarwin then python2 else python3; }; + libxsmm = callPackage ../development/libraries/libxsmm { }; + libixp_hg = callPackage ../development/libraries/libixp-hg { }; libyaml = callPackage ../development/libraries/libyaml { }; @@ -14073,6 +14153,7 @@ in protobuf = protobuf3_8; + protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { }; @@ -14589,6 +14670,8 @@ in sonic = callPackage ../development/libraries/sonic { }; + sope = callPackage ../development/libraries/sope { }; + soprano = callPackage ../development/libraries/soprano { }; soqt = callPackage ../development/libraries/soqt { }; @@ -14933,6 +15016,14 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + IOKit CFNetwork Security ApplicationServices + CoreText IOSurface ImageIO OpenGL GLUT; + }; + + vtk_7 = callPackage ../development/libraries/vtk/7.x.nix { stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -14972,7 +15063,7 @@ in }); }; - vtkWithQt4 = vtk.override { qtLib = qt4; }; + vtkWithQt5 = vtk.override { qtLib = qt5; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; @@ -15498,6 +15589,8 @@ in dex-oidc = callPackage ../servers/dex { }; + dex2jar = callPackage ../development/tools/java/dex2jar { }; + doh-proxy = callPackage ../servers/dns/doh-proxy { python3Packages = python36Packages; }; @@ -15527,7 +15620,10 @@ in dspam = callPackage ../servers/mail/dspam { }; + engelsystem = callPackage ../servers/web-apps/engelsystem { }; + etcd = callPackage ../servers/etcd { }; + etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; @@ -15638,6 +15734,8 @@ in jetty = callPackage ../servers/http/jetty { }; + kapow = callPackage ../servers/kapow { }; + keycloak = callPackage ../servers/keycloak { }; knot-dns = callPackage ../servers/dns/knot-dns { }; @@ -15934,6 +16032,8 @@ in mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; + azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; + miniflux = callPackage ../servers/miniflux { }; nagios = callPackage ../servers/monitoring/nagios { }; @@ -16196,6 +16296,8 @@ in smcroute = callPackage ../servers/smcroute { }; + sogo = callPackage ../servers/web-apps/sogo { }; + spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; @@ -16510,8 +16612,6 @@ in fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; - fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { }; - fwts = callPackage ../os-specific/linux/fwts { }; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; @@ -16800,14 +16900,6 @@ in ]; }; - linux_5_5 = callPackage ../os-specific/linux/kernel/linux-5.5.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" - ]; - }; - linux_5_6 = callPackage ../os-specific/linux/kernel/linux-5.6.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -16942,6 +17034,8 @@ in rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack { }; + rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { }; @@ -17038,7 +17132,6 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_5); linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6); # When adding to this list: @@ -18214,6 +18307,8 @@ in sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; + scheme-manpages = callPackage ../data/documentation/scheme-manpages { }; + scowl = callPackage ../data/misc/scowl { }; seshat = callPackage ../data/fonts/seshat { }; @@ -18328,6 +18423,8 @@ in tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; + tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; }; @@ -18669,11 +18766,6 @@ in baudline = callPackage ../applications/audio/baudline { }; - - bazaar = callPackage ../applications/version-management/bazaar { }; - - bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; - bb = callPackage ../applications/misc/bb { }; berry = callPackage ../applications/window-managers/berry { }; @@ -18761,6 +18853,8 @@ in bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bjumblr = callPackage ../applications/audio/bjumblr { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; bslizr = callPackage ../applications/audio/bslizr { }; @@ -19325,6 +19419,8 @@ in fasttext = callPackage ../applications/science/machine-learning/fasttext { }; + fbmenugen = callPackage ../applications/misc/fbmenugen { }; + fbpanel = callPackage ../applications/window-managers/fbpanel { }; fbreader = callPackage ../applications/misc/fbreader { @@ -20522,7 +20618,9 @@ in linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = ocamlPackages.callPackage ../applications/misc/llpp { }; + llpp = callPackage ../applications/misc/llpp { + inherit (ocaml-ng.ocamlPackages_4_09) ocaml; + }; lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; @@ -20768,7 +20866,22 @@ in python = python3; }; - inherit (mopidyPackages) mopidy mopidy-gmusic mopidy-local-images mopidy-local-sqlite mopidy-spotify mopidy-moped mopidy-mopify mopidy-spotify-tunigo mopidy-youtube mopidy-soundcloud mopidy-musicbox-webclient mopidy-iris mopidy-mpd; + inherit (mopidyPackages) + mopidy + mopidy-gmusic + mopidy-iris + mopidy-local-images + mopidy-local-sqlite + mopidy-moped + mopidy-mopify + mopidy-mpd + mopidy-mpris + mopidy-musicbox-webclient + mopidy-somafm + mopidy-soundcloud + mopidy-spotify + mopidy-spotify-tunigo + mopidy-youtube; motif = callPackage ../development/libraries/motif { }; @@ -20828,12 +20941,14 @@ in libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); - mpv = callPackage ../applications/video/mpv { + mpv-unwrapped = callPackage ../applications/video/mpv { inherit lua; inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; }; - mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; + # Wraps without trigerring a rebuild + wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; + mpv = wrapMpv mpv-unwrapped {}; mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; @@ -20906,6 +21021,8 @@ in geoip = geoipWithDatabase; }; + nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; + node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; ninjas2 = callPackage ../applications/audio/ninjas2 {}; @@ -20970,6 +21087,10 @@ in polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + portfolio = callPackage ../applications/office/portfolio { + jre = openjdk11; + }; + ptex = callPackage ../development/libraries/ptex {}; qbec = callPackage ../applications/networking/cluster/qbec { }; @@ -21691,8 +21812,6 @@ in ripser = callPackage ../applications/science/math/ripser { }; - rkt = callPackage ../applications/virtualization/rkt { }; - rkdeveloptool = callPackage ../misc/rkdeveloptool { }; rofi-unwrapped = callPackage ../applications/misc/rofi { }; @@ -22281,6 +22400,7 @@ in transmission = callPackage ../applications/networking/p2p/transmission { }; transmission-gtk = transmission.override { enableGTK3 = true; }; + transmission-qt = transmission.override { enableQt = true; }; transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; @@ -22339,6 +22459,7 @@ in unigine-valley = callPackage ../applications/graphics/unigine-valley { }; unison = callPackage ../applications/networking/sync/unison { + ocamlPackages = ocaml-ng.ocamlPackages_4_09; enableX11 = config.unison.enableX11 or true; }; @@ -22366,11 +22487,9 @@ in vcv-rack = callPackage ../applications/audio/vcv-rack { }; - vdirsyncer = callPackage ../tools/misc/vdirsyncer { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; + vdirsyncerStable = with python3Packages; toPythonApplication vdirsyncerStable; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; @@ -22587,6 +22706,8 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; + webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -23187,6 +23308,8 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + ergo = callPackage ../applications/blockchains/ergo { }; + exodus = callPackage ../applications/blockchains/exodus { }; freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; @@ -23372,7 +23495,8 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o { }; + cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; + cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; ckan = callPackage ../games/ckan { }; @@ -23718,6 +23842,8 @@ in newtonwars = callPackage ../games/newtonwars { }; + nottetris2 = callPackage ../games/nottetris2 { }; + nudoku = callPackage ../games/nudoku { }; nxengine-evo = callPackage ../games/nxengine-evo { }; @@ -23742,13 +23868,7 @@ in openmw = libsForQt5.callPackage ../games/openmw { }; - openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { - openmw = openmw.override { - stdenv = gcc8Stdenv; - openscenegraph = openscenegraph.override { stdenv = gcc8Stdenv; }; - mygui = mygui.override { stdenv = gcc8Stdenv; }; - }; - }; + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openraPackages = import ../games/openra pkgs; @@ -23873,6 +23993,8 @@ in sauerbraten = callPackage ../games/sauerbraten {}; + scaleft = callPackage ../applications/networking/scaleft { }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; scid = callPackage ../games/scid { @@ -23949,10 +24071,6 @@ in steamcmd = steamPackages.steamcmd; - linux-steam-integration = callPackage ../games/linux-steam-integration { - gtk = pkgs.gtk3; - }; - protontricks = callPackage ../tools/package-management/protontricks { inherit (python3Packages) buildPythonApplication pytest setuptools_scm vdf; inherit (gnome3) zenity; @@ -23985,6 +24103,8 @@ in t4kcommon = callPackage ../games/t4kcommon { }; + taisei = callPackage ../games/taisei { }; + tcl2048 = callPackage ../games/tcl2048 { }; the-powder-toy = callPackage ../games/the-powder-toy { @@ -24011,6 +24131,8 @@ in tinyfugue = callPackage ../games/tinyfugue { }; + tockloader = callPackage ../development/tools/misc/tockloader { }; + tome2 = callPackage ../games/tome2 { }; tome4 = callPackage ../games/tome4 { }; @@ -24268,8 +24390,6 @@ in pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - maxx = callPackage ../desktops/maxx { }; - plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; inherit (callPackages ../applications/misc/redshift { @@ -24394,6 +24514,16 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + bpp-core = callPackage ../development/libraries/science/biology/bpp-core { }; + + bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { }; + + bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { }; + + bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { }; + + bppsuite = callPackage ../applications/science/biology/bppsuite { }; + cd-hit = callPackage ../applications/science/biology/cd-hit { }; cmtk = callPackage ../applications/science/biology/cmtk { }; @@ -24743,6 +24873,8 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; + xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; + ### SCIENCE/PROGRAMMING dafny = dotnetPackages.Dafny; @@ -24776,7 +24908,7 @@ in cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05; + inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 @@ -25110,7 +25242,9 @@ in inherit (pkgs.gnome2) gtkglext; }; - cytoscape = callPackage ../applications/science/misc/cytoscape { }; + cytoscape = callPackage ../applications/science/misc/cytoscape { + jre = openjdk11; + }; fityk = callPackage ../applications/science/misc/fityk { }; @@ -25199,8 +25333,6 @@ in lhapdf = callPackage ../development/libraries/physics/lhapdf { }; - mcgrid = callPackage ../development/libraries/physics/mcgrid { }; - mela = callPackage ../development/libraries/physics/mela { }; nlojet = callPackage ../development/libraries/physics/nlojet { }; @@ -25208,13 +25340,14 @@ in pythia = callPackage ../development/libraries/physics/pythia { }; rivet = callPackage ../development/libraries/physics/rivet { + hepmc = hepmc2; imagemagick = graphicsmagick-imagemagick-compat; }; thepeg = callPackage ../development/libraries/physics/thepeg { }; yoda = callPackage ../development/libraries/physics/yoda { - python = python2; + python = python3; }; yoda-with-root = lowPrio (yoda.override { withRootSupport = true; @@ -25738,6 +25871,8 @@ in nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { }; + nix-update = python3Packages.callPackage ../tools/package-management/nix-update { }; + nix-update-source = callPackage ../tools/package-management/nix-update-source {}; nix-script = callPackage ../tools/nix/nix-script {}; @@ -25778,7 +25913,7 @@ in nut = callPackage ../applications/misc/nut { }; - solfege = callPackage ../misc/solfege { }; + solfege = python3Packages.callPackage ../misc/solfege { }; disnix = callPackage ../tools/package-management/disnix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 0621f2ed17..dedef12e38 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05 }: +{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 }: let mkCoqPackages' = self: coq: @@ -100,19 +100,23 @@ in rec { version = "8.6.1"; }; coq_8_7 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.7.2"; }; coq_8_8 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.8.2"; }; coq_8_9 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.9.1"; }; coq_8_10 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.10.2"; }; coq_8_11 = callPackage ../applications/science/logic/coq { - version = "8.11.1"; + version = "8.11.2"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 80d49ca1f5..821166fca9 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -16,6 +16,8 @@ let buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; + afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { }; + alcotest = callPackage ../development/ocaml-modules/alcotest {}; alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; @@ -36,12 +38,6 @@ let astring = callPackage ../development/ocaml-modules/astring { }; - async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - - async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; - atd = callPackage ../development/ocaml-modules/atd { }; atdgen = callPackage ../development/ocaml-modules/atdgen { }; @@ -189,6 +185,10 @@ let csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { }; + curly = callPackage ../development/ocaml-modules/curly { + inherit (pkgs) curl; + }; + curses = callPackage ../development/ocaml-modules/curses { }; custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; @@ -219,7 +219,12 @@ let dune = callPackage ../development/tools/ocaml/dune { }; - dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; + dune_2 = + if lib.versionAtLeast ocaml.version "4.07" + then callPackage ../development/tools/ocaml/dune/2.nix { } + else if lib.versionAtLeast ocaml.version "4.02" + then pkgs.dune_2 + else throw "dune_2 is not available for OCaml ${ocaml.version}"; dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; @@ -287,6 +292,8 @@ let functoria = callPackage ../development/ocaml-modules/functoria { }; + functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { }; + functory = callPackage ../development/ocaml-modules/functory { }; gen = callPackage ../development/ocaml-modules/gen { }; @@ -317,6 +324,8 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; + io-page-unix = callPackage ../development/ocaml-modules/io-page/unix.nix { }; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; @@ -410,9 +419,7 @@ 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 { - ppxlib = ppxlib.override { version = "0.12.0"; }; - }; + js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { }; js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; @@ -542,12 +549,16 @@ let mirage-random = callPackage ../development/ocaml-modules/mirage-random { }; + mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { }; + mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; mirage-time = callPackage ../development/ocaml-modules/mirage-time { }; mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; @@ -580,8 +591,6 @@ let core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; - core_p4 = callPackage ../development/ocaml-modules/core { }; - ocamlbuild = if lib.versionOlder "4.03" ocaml.version then callPackage ../development/tools/ocaml/ocamlbuild { } @@ -747,10 +756,12 @@ let ulex = callPackage ../development/ocaml-modules/ulex { }; - textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; - tls = callPackage ../development/ocaml-modules/tls { }; + torch = callPackage ../development/ocaml-modules/torch { + inherit (pkgs.python3Packages) pytorch; + }; + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; @@ -812,7 +823,9 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {}; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { + ppxlib = ppxlib.override { legacy = true; }; + }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; @@ -821,7 +834,6 @@ let ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { - ppxlib = ppxlib.override { version = "0.12.0"; }; }; ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; @@ -962,20 +974,21 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes janePackage num octavius re; + inherit ctypes janePackage num octavius ppxlib re; inherit (pkgs) openssl; - ppxlib = ppxlib.override { version = "0.12.0"; }; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { - inherit ctypes janePackage num octavius ppxlib re; + inherit ctypes janePackage num octavius re; inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; } else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re ppxlib; + inherit ppx_deriving re; inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { @@ -1154,46 +1167,11 @@ let then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {} else core_kernel_p4; - core = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.core - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core.nix {} - else core_p4; - - textutils = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.textutils - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} - else textutils_p4; - - async_kernel = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_kernel - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} - else async_kernel_p4; - async_rpc_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_rpc_kernel else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; - async_unix = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_unix - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} - else async_unix_p4; - - async_extra = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_extra - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} - else async_extra_p4; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; @@ -1231,7 +1209,9 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_10 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.10.nix { }); + ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); + ocamlPackages_latest = ocamlPackages_4_10; - ocamlPackages = ocamlPackages_4_09; + ocamlPackages = ocamlPackages_4_10; } diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 0fecf30e73..82c68c2127 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -57,12 +57,12 @@ in }; composer = mkDerivation rec { - version = "1.10.5"; + version = "1.10.6"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0a9iwhd7ijm8gkp3zadxza0xb6xwa5ps0d16pz4mz2p21gfzvwym"; + sha256 = "0yzfzgg9qlc388g91bdg7y7rp1q8vqb5hkwykwmr1n1lv8dsrg99"; }; dontUnpack = true; @@ -202,7 +202,7 @@ in maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; - + phpmd = mkDerivation rec { version = "2.8.2"; pname = "phpmd"; @@ -230,14 +230,14 @@ in broken = !isPhp74; }; }; - + phpstan = mkDerivation rec { - version = "0.12.19"; + version = "0.12.25"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "15fz7rixi9s46qqxpj26349aky7wxqnzmfsnwlh1f2p4jsfd85ki"; + sha256 = "1a864v7fxpv5kp24nkvczrir3ldl6wxvaq85rd391ppa8ahdhvdd"; }; phases = [ "installPhase" ]; @@ -709,6 +709,26 @@ in meta.broken = isPhp74; }; + rdkafka = buildPecl { + version = "4.0.3"; + pname = "rdkafka"; + + sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; + + buildInputs = with pkgs; [ rdkafka pcre' ]; + + postPhpize = '' + substituteInPlace configure \ + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' + ''; + + meta = { + description = "Kafka client based on librdkafka"; + homepage = "https://github.com/arnaud-lb/php-rdkafka"; + maintainers = lib.teams.php.members; + }; + }; + redis = buildPecl { version = "5.1.1"; pname = "redis"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 513b5876bf..b73a227190 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -738,8 +738,6 @@ in { flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - fluidasserts = callPackage ../development/python-modules/fluidasserts { }; - foxdot = callPackage ../development/python-modules/foxdot { }; fsspec = callPackage ../development/python-modules/fsspec { }; @@ -801,6 +799,8 @@ in { hdf5 = pkgs.hdf5-mpi; }; + h5netcdf = callPackage ../development/python-modules/h5netcdf { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; habanero = callPackage ../development/python-modules/habanero { }; @@ -813,6 +813,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; holidays = callPackage ../development/python-modules/holidays { }; @@ -891,6 +893,8 @@ in { limitlessled = callPackage ../development/python-modules/limitlessled { }; + livelossplot = callPackage ../development/python-modules/livelossplot { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; logster = callPackage ../development/python-modules/logster { }; @@ -1505,6 +1509,8 @@ in { sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + skorch = callPackage ../development/python-modules/skorch { }; + slackclient = callPackage ../development/python-modules/slackclient { }; slicedimage = callPackage ../development/python-modules/slicedimage { }; @@ -1607,6 +1613,13 @@ in { vdf = callPackage ../development/python-modules/vdf { }; + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; + + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + vidstab = callPackage ../development/python-modules/vidstab { }; webapp2 = callPackage ../development/python-modules/webapp2 { }; @@ -2095,6 +2108,8 @@ in { bleach = callPackage ../development/python-modules/bleach { }; + bleak = callPackage ../development/python-modules/bleak { }; + blinker = callPackage ../development/python-modules/blinker { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; @@ -2469,6 +2484,8 @@ in { pytest-cram = callPackage ../development/python-modules/pytest-cram { }; + pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; + pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; @@ -3029,6 +3046,10 @@ in { jsonwatch = callPackage ../development/python-modules/jsonwatch { }; + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { + python3 = python; + }).src); + latexcodec = callPackage ../development/python-modules/latexcodec {}; libmodulemd = pipe pkgs.libmodulemd [ @@ -3261,7 +3282,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit_7_5; + cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; }; @@ -3269,6 +3290,8 @@ in { pyfxa = callPackage ../development/python-modules/pyfxa { }; + pygls = callPackage ../development/python-modules/pygls {}; + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; pylama = callPackage ../development/python-modules/pylama { }; @@ -3602,6 +3625,10 @@ in { SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + duckdb = callPackage ../development/python-modules/duckdb { + duckdb = pkgs.duckdb; + }; + dulwich = callPackage ../development/python-modules/dulwich { inherit (pkgs) git glibcLocales; }; @@ -3795,6 +3822,8 @@ in { cudaSupport = false; }; + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pythondialog = callPackage ../development/python-modules/pythondialog { }; python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; @@ -4254,6 +4283,8 @@ in { inherit (pkgs) kerberos; }; + lazy_import = callPackage ../development/python-modules/lazy_import { }; + lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; ldaptor = callPackage ../development/python-modules/ldaptor { }; @@ -5048,6 +5079,8 @@ in { polib = callPackage ../development/python-modules/polib {}; + ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; + posix_ipc = callPackage ../development/python-modules/posix_ipc { }; portend = callPackage ../development/python-modules/portend { }; @@ -5461,21 +5494,6 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; - pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec { - version = "3.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; - }; - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - patches = singleton (pkgs.fetchpatch { - url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; - sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; - }); - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - doCheck = false; - }); - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; rasterio = callPackage ../development/python-modules/rasterio { @@ -5572,8 +5590,8 @@ in { retworkx = callPackage ../development/python-modules/retworkx { }; - rivet = disabledIf isPy3k (toPythonModule (pkgs.rivet.override { - python2 = python; + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { + python3 = python; })); ripser = callPackage ../development/python-modules/ripser { }; @@ -5945,6 +5963,8 @@ in { txtorcon = callPackage ../development/python-modules/txtorcon { }; + txdbus = callPackage ../development/python-modules/txdbus { }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; @@ -6961,6 +6981,8 @@ in { ansi = callPackage ../development/python-modules/ansi { }; + pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; + pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; telegram = callPackage ../development/python-modules/telegram { }; @@ -7042,6 +7064,11 @@ in { pytoml = callPackage ../development/python-modules/pytoml { }; + pypamtest = pkgs.libpam-wrapper.override { + enablePython = true; + inherit python; + }; + pypandoc = callPackage ../development/python-modules/pypandoc { }; yamllint = callPackage ../development/python-modules/yamllint { }; @@ -7078,7 +7105,7 @@ in { visitor = callPackage ../development/python-modules/visitor { }; - vtk = toPythonModule (pkgs.vtk.override { + vtk = toPythonModule (pkgs.vtk_7.override { inherit (self) python; enablePython = true; }); diff --git a/third_party/nixpkgs/pkgs/top-level/static.nix b/third_party/nixpkgs/pkgs/top-level/static.nix index c7db64b99f..6f331b20d3 100644 --- a/third_party/nixpkgs/pkgs/top-level/static.nix +++ b/third_party/nixpkgs/pkgs/top-level/static.nix @@ -166,7 +166,6 @@ in { }); arrow-cpp = super.arrow-cpp.override { enableShared = false; - python = { pkgs = { python = null; numpy = null; }; }; }; boost = super.boost.override { enableStatic = true;