diff options
1213 files changed, 45701 insertions, 20514 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index ec4222a0d4fb..a64b6918c499 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -19,7 +19,7 @@ # Libraries /lib @edolstra @nbp @infinisil -/lib/systems @nbp @ericson2314 @matthewbauer +/lib/systems @alyssais @nbp @ericson2314 @matthewbauer /lib/generators.nix @edolstra @nbp @Profpatsch /lib/cli.nix @edolstra @nbp @Profpatsch /lib/debug.nix @edolstra @nbp @Profpatsch @@ -42,6 +42,12 @@ # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch +# Nixpkgs documentation +/maintainers/scripts/db-to-md.sh @jtojnar @ryantm +/maintainers/scripts/doc @jtojnar @ryantm +/doc/build-aux/pandoc-filters @jtojnar +/doc/contributing/contributing-to-documentation.chapter.md @jtojnar + # NixOS Internals /nixos/default.nix @nbp @infinisil /nixos/lib/from-env.nix @nbp @infinisil @@ -104,7 +110,7 @@ # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq -/pkgs/build-support/rust @andir @danieldk @zowoq +/pkgs/build-support/rust @andir @zowoq # Darwin-related /pkgs/stdenv/darwin @NixOS/darwin-maintainers diff --git a/nixpkgs/.github/workflows/basic-eval.yml b/nixpkgs/.github/workflows/basic-eval.yml index 3d12eda314f1..b7bbbd40b451 100644 --- a/nixpkgs/.github/workflows/basic-eval.yml +++ b/nixpkgs/.github/workflows/basic-eval.yml @@ -15,6 +15,6 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/nixpkgs/.github/workflows/editorconfig.yml b/nixpkgs/.github/workflows/editorconfig.yml index 4960e9fd3d23..1934a24c65af 100644 --- a/nixpkgs/.github/workflows/editorconfig.yml +++ b/nixpkgs/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge if: env.PR_DIFF - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break diff --git a/nixpkgs/.github/workflows/manual-nixos.yml b/nixpkgs/.github/workflows/manual-nixos.yml index edd2755302a1..01bbe1b12bf2 100644 --- a/nixpkgs/.github/workflows/manual-nixos.yml +++ b/nixpkgs/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/nixpkgs/.github/workflows/manual-nixpkgs.yml b/nixpkgs/.github/workflows/manual-nixpkgs.yml index e27a281a9332..d0c3f5959157 100644 --- a/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/nixpkgs/.github/workflows/nixos-manual.yml b/nixpkgs/.github/workflows/nixos-manual.yml index 2a1c1c29738e..70f61a1a3a88 100644 --- a/nixpkgs/.github/workflows/nixos-manual.yml +++ b/nixpkgs/.github/workflows/nixos-manual.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v12 + - uses: cachix/install-nix-action@v14 - name: Check DocBook files generated from Markdown are consistent run: | nixos/doc/manual/md-to-db.sh diff --git a/nixpkgs/.gitignore b/nixpkgs/.gitignore index b166a78d7d70..1a41704c9be3 100644 --- a/nixpkgs/.gitignore +++ b/nixpkgs/.gitignore @@ -2,6 +2,7 @@ ,* .*.swp .*.swo +.idea/ result result-* /doc/NEWS.html diff --git a/nixpkgs/doc/Makefile b/nixpkgs/doc/Makefile index 1d3a0e7ccbdf..f8d2d7248fab 100644 --- a/nixpkgs/doc/Makefile +++ b/nixpkgs/doc/Makefile @@ -3,12 +3,17 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' PANDOC ?= pandoc pandoc_media_dir = media -# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh). +# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh) and conversion script (/maintainers/scripts/db-to-md.sh). # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute +# Not needed: +# - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST) pandoc_flags = --extract-media=$(pandoc_media_dir) \ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ - --lua-filter=labelless-link-is-xref.lua \ + --lua-filter=build-aux/pandoc-filters/myst-reader/roles.lua \ + --lua-filter=build-aux/pandoc-filters/link-unix-man-references.lua \ + --lua-filter=build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ + --lua-filter=build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua \ -f commonmark$(pandoc_commonmark_enabled_extensions)+smart .PHONY: all diff --git a/nixpkgs/doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua b/nixpkgs/doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua new file mode 100644 index 000000000000..281e85af2717 --- /dev/null +++ b/nixpkgs/doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua @@ -0,0 +1,23 @@ +--[[ +Converts Code AST nodes produced by pandoc’s DocBook reader +from citerefentry elements into AST for corresponding role +for reStructuredText. + +We use subset of MyST syntax (CommonMark with features from rST) +so let’s use the rST AST for rST features. + +Reference: https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage +]] + +function Code(elem) + elem.classes = elem.classes:map(function (x) + if x == 'citerefentry' then + elem.attributes['role'] = 'manpage' + return 'interpreted-text' + else + return x + end + end) + + return elem +end diff --git a/nixpkgs/doc/labelless-link-is-xref.lua b/nixpkgs/doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua index 67569b020916..fa97729a28bc 100644 --- a/nixpkgs/doc/labelless-link-is-xref.lua +++ b/nixpkgs/doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua @@ -1,3 +1,13 @@ +--[[ +Converts Link AST nodes with empty label to DocBook xref elements. + +This is a temporary script to be able use cross-references conveniently +using syntax taken from MyST, while we still use docbook-xsl +for generating the documentation. + +Reference: https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing +]] + local function starts_with(start, str) return str:sub(1, #start) == start end diff --git a/nixpkgs/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua b/nixpkgs/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua new file mode 100644 index 000000000000..92dc6895750f --- /dev/null +++ b/nixpkgs/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua @@ -0,0 +1,36 @@ +--[[ +Converts AST for reStructuredText roles into corresponding +DocBook elements. + +Currently, only a subset of roles is supported. + +Reference: + List of roles: + https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html + manpage: + https://tdg.docbook.org/tdg/5.1/citerefentry.html + file: + https://tdg.docbook.org/tdg/5.1/filename.html +]] + +function Code(elem) + if elem.classes:includes('interpreted-text') then + local tag = nil + local content = elem.text + if elem.attributes['role'] == 'manpage' then + tag = 'citerefentry' + local title, volnum = content:match('^(.+)%((%w+)%)$') + if title == nil then + -- No volnum in parentheses. + title = content + end + content = '<refentrytitle>' .. title .. '</refentrytitle>' .. (volnum ~= nil and ('<manvolnum>' .. volnum .. '</manvolnum>') or '') + elseif elem.attributes['role'] == 'file' then + tag = 'filename' + end + + if tag ~= nil then + return pandoc.RawInline('docbook', '<' .. tag .. '>' .. content .. '</' .. tag .. '>') + end + end +end diff --git a/nixpkgs/doc/build-aux/pandoc-filters/link-unix-man-references.lua b/nixpkgs/doc/build-aux/pandoc-filters/link-unix-man-references.lua new file mode 100644 index 000000000000..12431f140fed --- /dev/null +++ b/nixpkgs/doc/build-aux/pandoc-filters/link-unix-man-references.lua @@ -0,0 +1,18 @@ +--[[ +Turns a manpage reference into a link, when a mapping is defined +in the unix-man-urls.lua file. +]] + +local man_urls = { + ["tmpfiles.d(5)"] = "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html", + ["nix.conf(5)"] = "https://nixos.org/manual/nix/stable/#sec-conf-file", + ["systemd.time(7)"] = "https://www.freedesktop.org/software/systemd/man/systemd.time.html", + ["systemd.timer(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.timer.html", +} + +function Code(elem) + local is_man_role = elem.classes:includes('interpreted-text') and elem.attributes['role'] == 'manpage' + if is_man_role and man_urls[elem.text] ~= nil then + return pandoc.Link(elem, man_urls[elem.text]) + end +end diff --git a/nixpkgs/doc/build-aux/pandoc-filters/myst-reader/roles.lua b/nixpkgs/doc/build-aux/pandoc-filters/myst-reader/roles.lua new file mode 100644 index 000000000000..c33a688eeba7 --- /dev/null +++ b/nixpkgs/doc/build-aux/pandoc-filters/myst-reader/roles.lua @@ -0,0 +1,29 @@ +--[[ +Replaces Str AST nodes containing {role}, followed by a Code node +by a Code node with attrs that would be produced by rST reader +from the role syntax. + +This is to emulate MyST syntax in Pandoc. +(MyST is a CommonMark flavour with rST features mixed in.) + +Reference: https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point +]] + +function Inlines(inlines) + for i = #inlines-1,1,-1 do + local first = inlines[i] + local second = inlines[i+1] + local correct_tags = first.tag == 'Str' and second.tag == 'Code' + if correct_tags then + -- docutils supports alphanumeric strings separated by [-._:] + -- We are slightly more liberal for simplicity. + local role = first.text:match('^{([-._+:%w]+)}$') + if role ~= nil then + inlines:remove(i) + second.attributes['role'] = role + second.classes:insert('interpreted-text') + end + end + end + return inlines +end diff --git a/nixpkgs/doc/build-aux/pandoc-filters/myst-writer/roles.lua b/nixpkgs/doc/build-aux/pandoc-filters/myst-writer/roles.lua new file mode 100644 index 000000000000..0136bc550652 --- /dev/null +++ b/nixpkgs/doc/build-aux/pandoc-filters/myst-writer/roles.lua @@ -0,0 +1,25 @@ +--[[ +Replaces Code nodes with attrs that would be produced by rST reader +from the role syntax by a Str AST node containing {role}, followed by a Code node. + +This is to emulate MyST syntax in Pandoc. +(MyST is a CommonMark flavour with rST features mixed in.) + +Reference: https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point +]] + +function Code(elem) + local role = elem.attributes['role'] + + if elem.classes:includes('interpreted-text') and role ~= nil then + elem.classes = elem.classes:filter(function (c) + return c ~= 'interpreted-text' + end) + elem.attributes['role'] = nil + + return { + pandoc.Str('{' .. role .. '}'), + elem, + } + end +end diff --git a/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md b/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md index 2f7ae32259c4..178fdb36262b 100644 --- a/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md +++ b/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md @@ -52,6 +52,13 @@ Additionally, the following syntax extensions are currently used: This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing). +- []{#ssec-contributing-markup-inline-roles} + If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. + + The references will turn into links when a mapping exists in {file}`doc/build-aux/pandoc-filters/unix-man-urls.lua`. + + This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. + - []{#ssec-contributing-markup-admonitions} **Admonitions**, set off from the text to bring attention to something. diff --git a/nixpkgs/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix index 70ec98b03c16..ef609859abbf 100644 --- a/nixpkgs/lib/systems/default.nix +++ b/nixpkgs/lib/systems/default.nix @@ -107,6 +107,7 @@ rec { else if final.isMips then "mips" else if final.isPower then "powerpc" else if final.isRiscV then "riscv" + else if final.isS390 then "s390" else final.parsed.cpu.name; qemuArch = diff --git a/nixpkgs/lib/systems/doubles.nix b/nixpkgs/lib/systems/doubles.nix index e577059687b0..8af3377fb5bf 100644 --- a/nixpkgs/lib/systems/doubles.nix +++ b/nixpkgs/lib/systems/doubles.nix @@ -28,7 +28,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" - "riscv64-linux" "s390-linux" "x86_64-linux" + "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" # MMIXware "mmix-mmixware" @@ -41,7 +41,8 @@ let # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" "or1k-none" "m68k-none" "powerpc-none" - "riscv32-none" "riscv64-none" "s390-none" "vc4-none" "x86_64-none" + "riscv32-none" "riscv64-none" "s390-none" "s390x-none" "vc4-none" + "x86_64-none" # OpenBSD "i686-openbsd" "x86_64-openbsd" diff --git a/nixpkgs/lib/systems/examples.nix b/nixpkgs/lib/systems/examples.nix index 32b236d6960c..8dfa22ac787e 100644 --- a/nixpkgs/lib/systems/examples.nix +++ b/nixpkgs/lib/systems/examples.nix @@ -152,6 +152,10 @@ rec { config = "s390-unknown-linux-gnu"; }; + s390x = { + config = "s390x-unknown-linux-gnu"; + }; + arm-embedded = { config = "arm-none-eabi"; libc = "newlib"; diff --git a/nixpkgs/lib/systems/parse.nix b/nixpkgs/lib/systems/parse.nix index 77e941a913cf..8a88d8cfbe87 100644 --- a/nixpkgs/lib/systems/parse.nix +++ b/nixpkgs/lib/systems/parse.nix @@ -106,6 +106,7 @@ rec { riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; s390 = { bits = 32; significantByte = bigEndian; family = "s390"; }; + s390x = { bits = 64; significantByte = bigEndian; family = "s390"; }; sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; }; sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; }; diff --git a/nixpkgs/lib/tests/systems.nix b/nixpkgs/lib/tests/systems.nix index 661b9bc8690c..2646e792682b 100644 --- a/nixpkgs/lib/tests/systems.nix +++ b/nixpkgs/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 09c65a77fde0..628a42ce1f00 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -354,6 +354,12 @@ githubId = 4732885; name = "Ivan Jager"; }; + airwoodix = { + email = "airwoodix@posteo.me"; + github = "airwoodix"; + githubId = 44871469; + name = "Etienne Wodey"; + }; ajs124 = { email = "nix@ajs124.de"; github = "ajs124"; @@ -532,6 +538,16 @@ fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; }]; }; + alyaeanyx = { + email = "alexandra.hollmeier@mailbox.org"; + github = "alyaeanyx"; + githubId = 74795488; + name = "Alexandra Hollmeier"; + keys = [{ + longkeyid = "rsa3072/0x87D1AADCD25B8DEE"; + fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; + }]; + }; amanjeev = { email = "aj@amanjeev.com"; github = "amanjeev"; @@ -1520,12 +1536,6 @@ githubId = 355401; name = "Brian Hicks"; }; - bricewge = { - email = "bricewge@gmail.com"; - github = "bricewge"; - githubId = 5525646; - name = "Brice Waegeneire"; - }; Br1ght0ne = { email = "brightone@protonmail.com"; github = "Br1ght0ne"; @@ -1683,6 +1693,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + cameronnemo = { + email = "cnemo@tutanota.com"; + github = "cameronnemo"; + githubId = 3212452; + name = "Cameron Nemo"; + }; campadrenalin = { email = "campadrenalin@gmail.com"; github = "campadrenalin"; @@ -2269,6 +2285,12 @@ githubId = 1382175; name = "Oliver Matthews"; }; + cyounkins = { + name = "Craig Younkins"; + email = "cyounkins@gmail.com"; + github = "cyounkins"; + githubId = 346185; + }; cypherpunk2140 = { email = "stefan.mihaila@pm.me"; github = "stefan-mihaila"; @@ -5490,6 +5512,12 @@ githubId = 66669; name = "Jeff Zellner"; }; + k4leg = { + name = "k4leg"; + email = "python.bogdan@gmail.com"; + github = "k4leg"; + githubId = 39882583; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; @@ -7683,6 +7711,12 @@ githubId = 2590830; name = "Sage Raflik"; }; + neosimsim = { + email = "me@abn.sh"; + github = "neosimsim"; + githubId = 1771772; + name = "Alexander Ben Nasrallah"; + }; nequissimus = { email = "tim@nequissimus.com"; github = "nequissimus"; @@ -8806,6 +8840,12 @@ githubId = 33375; name = "Peter Sanford"; }; + pshirshov = { + email = "pshirshov@eml.cc"; + github = "pshirshov"; + githubId = 295225; + name = "Pavel Shirshov"; + }; psibi = { email = "sibi@psibi.in"; github = "psibi"; @@ -9560,6 +9600,12 @@ github = "s1341"; githubId = 5682183; }; + samalws = { + email = "sam@samalws.com"; + name = "Sam Alws"; + github = "samalws"; + githubId = 20981725; + }; samb96 = { email = "samb96@gmail.com"; github = "samb96"; @@ -9594,6 +9640,12 @@ githubId = 115821; name = "Sam Rose"; }; + samuela = { + email = "skainsworth@gmail.com"; + github = "samuela"; + githubId = 226872; + name = "Samuel Ainsworth"; + }; samueldr = { email = "samuel@dionne-riel.com"; github = "samueldr"; @@ -11064,6 +11116,12 @@ githubId = 10110; name = "Travis B. Hartwell"; }; + travisdavis-ops = { + email = "travisdavismedia@gmail.com"; + github = "travisdavis-ops"; + githubId = 52011418; + name = "Travis Davis"; + }; TredwellGit = { email = "tredwell@tutanota.com"; github = "TredwellGit"; @@ -11321,10 +11379,14 @@ name = "Jos van den Oever"; }; vanilla = { - email = "neko@hydev.org"; + email = "osu_vanilla@126.com"; github = "VergeDX"; githubId = 25173827; name = "Vanilla"; + keys = [{ + longkeyid = "rsa4096/0x4DFA2BDD7305E739"; + fingerprint = "5C16 5178 7DE2 EE5A AF98 3EA3 4DFA 2BDD 7305 E739"; + }]; }; vanschelven = { email = "klaas@vanschelven.com"; @@ -11776,6 +11838,12 @@ githubId = 3992240; name = "Elijah Rum"; }; + x3ro = { + name = "^x3ro"; + email = "nix@x3ro.dev"; + github = "x3rAx"; + githubId = 2268851; + }; xaverdh = { email = "hoe.dom@gmx.de"; github = "xaverdh"; diff --git a/nixpkgs/maintainers/scripts/db-to-md.sh b/nixpkgs/maintainers/scripts/db-to-md.sh new file mode 100755 index 000000000000..01357d1e2412 --- /dev/null +++ b/nixpkgs/maintainers/scripts/db-to-md.sh @@ -0,0 +1,88 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=. -i bash -p pandoc + +# This script is temporarily needed while we transition the manual to +# CommonMark. It converts DocBook files into our CommonMark flavour. + +debug= +files=() + +while [ "$#" -gt 0 ]; do + i="$1"; shift 1 + case "$i" in + --debug) + debug=1 + ;; + *) + files+=("$i") + ;; + esac +done + +echo "WARNING: This is an experimental script and might not preserve all formatting." > /dev/stderr +echo "Please report any issues you discover." > /dev/stderr + +outExtension="md" +if [[ $debug ]]; then + outExtension="json" +fi + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile). +# TODO: Remove raw-attribute when we can get rid of DocBook altogether. +pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute +targetLang="commonmark${pandoc_commonmark_enabled_extensions}+smart" +if [[ $debug ]]; then + targetLang=json +fi +pandoc_flags=( + # Not needed: + # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) + # - media extraction (was only required for diagram generator) + # - myst-reader/roles.lua (only relevant for MyST → DocBook) + # - link-unix-man-references.lua (links should only be added to display output) + # - docbook-writer/rst-roles.lua (only relevant for → DocBook) + # - docbook-writer/labelless-link-is-xref.lua (only relevant for → DocBook) + "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua" + "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/myst-writer/roles.lua" + "--lua-filter=$DIR/doc/unknown-code-language.lua" + -f docbook + -t "$targetLang" + --tab-stop=2 + --wrap=none +) + +for file in "${files[@]}"; do + if [[ ! -f "$file" ]]; then + echo "db-to-md.sh: $file does not exist" > /dev/stderr + exit 1 + else + rootElement=$(xmllint --xpath 'name(//*)' "$file") + + if [[ $rootElement = chapter ]]; then + extension=".chapter.$outExtension" + elif [[ $rootElement = section ]]; then + extension=".section.$outExtension" + else + echo "db-to-md.sh: $file contains an unsupported root element $rootElement" > /dev/stderr + exit 1 + fi + + outFile="${file%".section.xml"}" + outFile="${outFile%".chapter.xml"}" + outFile="${outFile%".xml"}$extension" + temp1=$(mktemp) + $DIR/doc/escape-code-markup.py "$file" "$temp1" + if [[ $debug ]]; then + echo "Converted $file to $temp1" > /dev/stderr + fi + temp2=$(mktemp) + $DIR/doc/replace-xrefs-by-empty-links.py "$temp1" "$temp2" + if [[ $debug ]]; then + echo "Converted $temp1 to $temp2" > /dev/stderr + fi + pandoc "$temp2" -o "$outFile" "${pandoc_flags[@]}" + echo "Converted $file to $outFile" > /dev/stderr + fi +done diff --git a/nixpkgs/maintainers/scripts/doc/escape-code-markup.py b/nixpkgs/maintainers/scripts/doc/escape-code-markup.py new file mode 100755 index 000000000000..015435b698e6 --- /dev/null +++ b/nixpkgs/maintainers/scripts/doc/escape-code-markup.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=channel:nixos-unstable -i python3 -p python3 -p python3.pkgs.lxml + +""" +Pandoc will strip any markup within code elements so +let’s escape them so that they can be handled manually. +""" + +import lxml.etree as ET +import re +import sys + +def replace_element_by_text(el: ET.Element, text: str) -> None: + """ + Author: bernulf + Source: https://stackoverflow.com/a/10520552/160386 + SPDX-License-Identifier: CC-BY-SA-3.0 + """ + text = text + (el.tail or "") + parent = el.getparent() + if parent is not None: + previous = el.getprevious() + if previous is not None: + previous.tail = (previous.tail or "") + text + else: + parent.text = (parent.text or "") + text + parent.remove(el) + +DOCBOOK_NS = "http://docbook.org/ns/docbook" + +# List of elements that pandoc’s DocBook reader strips markup from. +# https://github.com/jgm/pandoc/blob/master/src/Text/Pandoc/Readers/DocBook.hs +code_elements = [ + # CodeBlock + "literallayout", + "screen", + "programlisting", + # Code (inline) + "classname", + "code", + "filename", + "envar", + "literal", + "computeroutput", + "prompt", + "parameter", + "option", + "markup", + "wordasword", + "command", + "varname", + "function", + "type", + "symbol", + "constant", + "userinput", + "systemitem", +] + +XMLNS_REGEX = re.compile(r'\s+xmlns(?::[^=]+)?="[^"]*"') +ROOT_ELEMENT_REGEX = re.compile(r'^\s*<[^>]+>') + +def remove_xmlns(match: re.Match) -> str: + """ + Removes xmlns attributes. + + Expects a match containing an opening tag. + """ + return XMLNS_REGEX.sub('', match.group(0)) + +if __name__ == '__main__': + assert len(sys.argv) >= 3, "usage: escape-code-markup.py <input> <output>" + + tree = ET.parse(sys.argv[1]) + name_predicate = " or ".join([f"local-name()='{el}'" for el in code_elements]) + + for markup in tree.xpath(f"//*[({name_predicate}) and namespace-uri()='{DOCBOOK_NS}']/*"): + text = ET.tostring(markup, encoding=str) + + # tostring adds xmlns attributes to the element we want to stringify + # as if it was supposed to be usable standalone. + # We are just converting it to CDATA so we do not care. + # Let’s strip the namespace declarations to keep the code clean. + # + # Note that this removes even namespaces that were potentially + # in the original file. Though, that should be very rare – + # most of the time, we will stringify empty DocBook elements + # like <xref> or <co> or, at worst, <link> with xlink:href attribute. + # + # Also note that the regex expects the root element to be first + # thing in the string. But that should be fine, the tostring method + # does not produce XML declaration or doctype by default. + text = ROOT_ELEMENT_REGEX.sub(remove_xmlns, text) + + replace_element_by_text(markup, text) + + tree.write(sys.argv[2]) diff --git a/nixpkgs/maintainers/scripts/doc/replace-xrefs-by-empty-links.py b/nixpkgs/maintainers/scripts/doc/replace-xrefs-by-empty-links.py new file mode 100755 index 000000000000..2006ef897f7a --- /dev/null +++ b/nixpkgs/maintainers/scripts/doc/replace-xrefs-by-empty-links.py @@ -0,0 +1,32 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=channel:nixos-unstable -i python3 -p python3 -p python3.pkgs.lxml + +""" +Pandoc will try to resolve xrefs and replace them with regular links. +let’s replace them with links with empty labels which MyST +and our pandoc filters recognize as cross-references. +""" + +import lxml.etree as ET +import sys + +XLINK_NS = "http://www.w3.org/1999/xlink" + +ns = { + "db": "http://docbook.org/ns/docbook", +} + + +if __name__ == '__main__': + assert len(sys.argv) >= 3, "usage: replace-xrefs-by-empty-links.py <input> <output>" + + tree = ET.parse(sys.argv[1]) + for xref in tree.findall(".//db:xref", ns): + text = ET.tostring(xref, encoding=str) + parent = xref.getparent() + link = parent.makeelement('link') + target_name = xref.get("linkend") + link.set(f"{{{XLINK_NS}}}href", f"#{target_name}") + parent.replace(xref, link) + + tree.write(sys.argv[2]) diff --git a/nixpkgs/maintainers/scripts/doc/unknown-code-language.lua b/nixpkgs/maintainers/scripts/doc/unknown-code-language.lua new file mode 100644 index 000000000000..85d8df4690ba --- /dev/null +++ b/nixpkgs/maintainers/scripts/doc/unknown-code-language.lua @@ -0,0 +1,12 @@ +--[[ +Adds “unknown” class to CodeBlock AST nodes without any classes. + +This will cause Pandoc to use fenced code block, which we prefer. +]] + +function CodeBlock(elem) + if #elem.classes == 0 then + elem.classes:insert('unknown') + return elem + end +end diff --git a/nixpkgs/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv index 1cb6a83d42ae..8cce4049e749 100644 --- a/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -75,7 +75,7 @@ mediator_lua,,,,,, mpack,,,,,, moonscript,,,,,,arobyn nvim-client,https://github.com/neovim/lua-client.git,,,,, -penlight,https://github.com/Tieske/Penlight.git,,,,, +penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, diff --git a/nixpkgs/maintainers/scripts/update.nix b/nixpkgs/maintainers/scripts/update.nix index 7435cf64425c..d881d68301ba 100755 --- a/nixpkgs/maintainers/scripts/update.nix +++ b/nixpkgs/maintainers/scripts/update.nix @@ -103,7 +103,7 @@ let pathContent = lib.attrByPath prefix null pkgs; in if pathContent == null then - builtins.throw "Attribute path `${path}` does not exists." + builtins.throw "Attribute path `${path}` does not exist." else packagesWithPath prefix (path: pkg: builtins.hasAttr "updateScript" pkg) pathContent; @@ -115,7 +115,7 @@ let package = lib.attrByPath (lib.splitString "." path) null pkgs; in if package == null then - builtins.throw "Package with an attribute name `${path}` does not exists." + builtins.throw "Package with an attribute name `${path}` does not exist." else if ! builtins.hasAttr "updateScript" package then builtins.throw "Package with an attribute name `${path}` does not have a `passthru.updateScript` attribute defined." else diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index a86af02d2357..df0c9ce7cf61 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -178,6 +178,15 @@ with lib.maintainers; { scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; }; + openstack = { + members = [ + angustrau + superherointj + SuperSandro2000 + ]; + scope = "Maintain the ecosystem around OpenStack"; + }; + pantheon = { members = [ davidak diff --git a/nixpkgs/nixos/doc/manual/administration/boot-problems.section.md b/nixpkgs/nixos/doc/manual/administration/boot-problems.section.md index dee83e7ec225..bca4fdc3fb38 100644 --- a/nixpkgs/nixos/doc/manual/administration/boot-problems.section.md +++ b/nixpkgs/nixos/doc/manual/administration/boot-problems.section.md @@ -16,7 +16,7 @@ If NixOS fails to boot, there are a number of kernel command line parameters tha `boot.debug1mounts` -: Like `boot.debug1` or `boot.debug1devices`, but runs stage1 until all filesystems that are mounted during initrd are mounted (see [neededForBoot](#opt-fileSystems._name_.neededForBoot)). As a motivating example, this could be useful if you've forgotten to set [neededForBoot](options.html#opt-fileSystems._name_.neededForBoot) on a file system. +: Like `boot.debug1` or `boot.debug1devices`, but runs stage1 until all filesystems that are mounted during initrd are mounted (see [neededForBoot](#opt-fileSystems._name_.neededForBoot)). As a motivating example, this could be useful if you've forgotten to set [neededForBoot](#opt-fileSystems._name_.neededForBoot) on a file system. `boot.trace` diff --git a/nixpkgs/nixos/doc/manual/administration/cleaning-store.chapter.md b/nixpkgs/nixos/doc/manual/administration/cleaning-store.chapter.md new file mode 100644 index 000000000000..fb2090b31d84 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/cleaning-store.chapter.md @@ -0,0 +1,62 @@ +# Cleaning the Nix Store {#sec-nix-gc} + +Nix has a purely functional model, meaning that packages are never +upgraded in place. Instead new versions of packages end up in a +different location in the Nix store (`/nix/store`). You should +periodically run Nix's *garbage collector* to remove old, unreferenced +packages. This is easy: + +```ShellSession +$ nix-collect-garbage +``` + +Alternatively, you can use a systemd unit that does the same in the +background: + +```ShellSession +# systemctl start nix-gc.service +``` + +You can tell NixOS in `configuration.nix` to run this unit automatically +at certain points in time, for instance, every night at 03:15: + +```nix +nix.gc.automatic = true; +nix.gc.dates = "03:15"; +``` + +The commands above do not remove garbage collector roots, such as old +system configurations. Thus they do not remove the ability to roll back +to previous configurations. The following command deletes old roots, +removing the ability to roll back to them: + +```ShellSession +$ nix-collect-garbage -d +``` + +You can also do this for specific profiles, e.g. + +```ShellSession +$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old +``` + +Note that NixOS system configurations are stored in the profile +`/nix/var/nix/profiles/system`. + +Another way to reclaim disk space (often as much as 40% of the size of +the Nix store) is to run Nix's store optimiser, which seeks out +identical files in the store and replaces them with hard links to a +single copy. + +```ShellSession +$ nix-store --optimise +``` + +Since this command needs to read the entire Nix store, it can take quite +a while to finish. + +## NixOS Boot Entries {#sect-nixos-gc-boot-entries} + +If your `/boot` partition runs out of space, after clearing old profiles +you must rebuild your system with `nixos-rebuild` to update the `/boot` +partition and clear space. diff --git a/nixpkgs/nixos/doc/manual/administration/cleaning-store.xml b/nixpkgs/nixos/doc/manual/administration/cleaning-store.xml deleted file mode 100644 index 526803e429ba..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/cleaning-store.xml +++ /dev/null @@ -1,63 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-nix-gc"> - <title>Cleaning the Nix Store</title> - <para> - Nix has a purely functional model, meaning that packages are never upgraded - in place. Instead new versions of packages end up in a different location in - the Nix store (<filename>/nix/store</filename>). You should periodically run - Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced - packages. This is easy: -<screen> -<prompt>$ </prompt>nix-collect-garbage -</screen> - Alternatively, you can use a systemd unit that does the same in the - background: -<screen> -<prompt># </prompt>systemctl start nix-gc.service -</screen> - You can tell NixOS in <filename>configuration.nix</filename> to run this unit - automatically at certain points in time, for instance, every night at 03:15: -<programlisting> -<xref linkend="opt-nix.gc.automatic"/> = true; -<xref linkend="opt-nix.gc.dates"/> = "03:15"; -</programlisting> - </para> - <para> - The commands above do not remove garbage collector roots, such as old system - configurations. Thus they do not remove the ability to roll back to previous - configurations. The following command deletes old roots, removing the ability - to roll back to them: -<screen> -<prompt>$ </prompt>nix-collect-garbage -d -</screen> - You can also do this for specific profiles, e.g. -<screen> -<prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old -</screen> - Note that NixOS system configurations are stored in the profile - <filename>/nix/var/nix/profiles/system</filename>. - </para> - <para> - Another way to reclaim disk space (often as much as 40% of the size of the - Nix store) is to run Nix’s store optimiser, which seeks out identical files - in the store and replaces them with hard links to a single copy. -<screen> -<prompt>$ </prompt>nix-store --optimise -</screen> - Since this command needs to read the entire Nix store, it can take quite a - while to finish. - </para> - <section xml:id="sect-nixos-gc-boot-entries"> - <title>NixOS Boot Entries</title> - - <para> - If your <filename>/boot</filename> partition runs out of space, after - clearing old profiles you must rebuild your system with - <literal>nixos-rebuild</literal> to update the <filename>/boot</filename> - partition and clear space. - </para> - </section> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/administration/container-networking.section.md b/nixpkgs/nixos/doc/manual/administration/container-networking.section.md new file mode 100644 index 000000000000..0873768376cc --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/container-networking.section.md @@ -0,0 +1,44 @@ +# Container Networking {#sec-container-networking} + +When you create a container using `nixos-container create`, it gets it +own private IPv4 address in the range `10.233.0.0/16`. You can get the +container's IPv4 address as follows: + +```ShellSession +# nixos-container show-ip foo +10.233.4.2 + +$ ping -c1 10.233.4.2 +64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms +``` + +Networking is implemented using a pair of virtual Ethernet devices. The +network interface in the container is called `eth0`, while the matching +interface in the host is called `ve-container-name` (e.g., `ve-foo`). +The container has its own network namespace and the `CAP_NET_ADMIN` +capability, so it can perform arbitrary network configuration such as +setting up firewall rules, without affecting or having access to the +host's network. + +By default, containers cannot talk to the outside network. If you want +that, you should set up Network Address Translation (NAT) rules on the +host to rewrite container traffic to use your external IP address. This +can be accomplished using the following configuration on the host: + +```nix +networking.nat.enable = true; +networking.nat.internalInterfaces = ["ve-+"]; +networking.nat.externalInterface = "eth0"; +``` + +where `eth0` should be replaced with the desired external interface. +Note that `ve-+` is a wildcard that matches all container interfaces. + +If you are using Network Manager, you need to explicitly prevent it from +managing container interfaces: + +```nix +networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; +``` + +You may need to restart your system for the changes to take effect. diff --git a/nixpkgs/nixos/doc/manual/administration/container-networking.xml b/nixpkgs/nixos/doc/manual/administration/container-networking.xml deleted file mode 100644 index 42486f01fe8c..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/container-networking.xml +++ /dev/null @@ -1,59 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-container-networking"> - <title>Container Networking</title> - - <para> - When you create a container using <literal>nixos-container create</literal>, - it gets it own private IPv4 address in the range - <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address - as follows: -<screen> -<prompt># </prompt>nixos-container show-ip foo -10.233.4.2 - -<prompt>$ </prompt>ping -c1 10.233.4.2 -64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms -</screen> - </para> - - <para> - Networking is implemented using a pair of virtual Ethernet devices. The - network interface in the container is called <literal>eth0</literal>, while - the matching interface in the host is called - <literal>ve-<replaceable>container-name</replaceable></literal> (e.g., - <literal>ve-foo</literal>). The container has its own network namespace and - the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary - network configuration such as setting up firewall rules, without affecting or - having access to the host’s network. - </para> - - <para> - By default, containers cannot talk to the outside network. If you want that, - you should set up Network Address Translation (NAT) rules on the host to - rewrite container traffic to use your external IP address. This can be - accomplished using the following configuration on the host: -<programlisting> -<xref linkend="opt-networking.nat.enable"/> = true; -<xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"]; -<xref linkend="opt-networking.nat.externalInterface"/> = "eth0"; -</programlisting> - where <literal>eth0</literal> should be replaced with the desired external - interface. Note that <literal>ve-+</literal> is a wildcard that matches all - container interfaces. - </para> - - <para> - If you are using Network Manager, you need to explicitly prevent it from - managing container interfaces: -<programlisting> -networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; -</programlisting> - </para> - - <para> - You may need to restart your system for the changes to take effect. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/administration/containers.chapter.md b/nixpkgs/nixos/doc/manual/administration/containers.chapter.md new file mode 100644 index 000000000000..ea51f91f698f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/containers.chapter.md @@ -0,0 +1,28 @@ +# Container Management {#ch-containers} + +NixOS allows you to easily run other NixOS instances as *containers*. +Containers are a light-weight approach to virtualisation that runs +software in the container at the same speed as in the host system. NixOS +containers share the Nix store of the host, making container creation +very efficient. + +::: {.warning} +Currently, NixOS containers are not perfectly isolated from the host +system. This means that a user with root access to the container can do +things that affect the host. So you should not give container root +access to untrusted users. +::: + +NixOS containers can be created in two ways: imperatively, using the +command `nixos-container`, and declaratively, by specifying them in your +`configuration.nix`. The declarative approach implies that containers +get upgraded along with your host system when you run `nixos-rebuild`, +which is often not what you want. By contrast, in the imperative +approach, containers are configured and updated independently from the +host system. + +```{=docbook} +<xi:include href="imperative-containers.section.xml" /> +<xi:include href="declarative-containers.section.xml" /> +<xi:include href="container-networking.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/administration/containers.xml b/nixpkgs/nixos/doc/manual/administration/containers.xml deleted file mode 100644 index 0d3355e56a58..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/containers.xml +++ /dev/null @@ -1,34 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-containers"> - <title>Container Management</title> - <para> - NixOS allows you to easily run other NixOS instances as - <emphasis>containers</emphasis>. Containers are a light-weight approach to - virtualisation that runs software in the container at the same speed as in - the host system. NixOS containers share the Nix store of the host, making - container creation very efficient. - </para> - <warning> - <para> - Currently, NixOS containers are not perfectly isolated from the host system. - This means that a user with root access to the container can do things that - affect the host. So you should not give container root access to untrusted - users. - </para> - </warning> - <para> - NixOS containers can be created in two ways: imperatively, using the command - <command>nixos-container</command>, and declaratively, by specifying them in - your <filename>configuration.nix</filename>. The declarative approach implies - that containers get upgraded along with your host system when you run - <command>nixos-rebuild</command>, which is often not what you want. By - contrast, in the imperative approach, containers are configured and updated - independently from the host system. - </para> - <xi:include href="imperative-containers.xml" /> - <xi:include href="declarative-containers.xml" /> - <xi:include href="container-networking.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/administration/control-groups.chapter.md b/nixpkgs/nixos/doc/manual/administration/control-groups.chapter.md new file mode 100644 index 000000000000..abe8dd80b5ab --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/control-groups.chapter.md @@ -0,0 +1,59 @@ +# Control Groups {#sec-cgroups} + +To keep track of the processes in a running system, systemd uses +*control groups* (cgroups). A control group is a set of processes used +to allocate resources such as CPU, memory or I/O bandwidth. There can be +multiple control group hierarchies, allowing each kind of resource to be +managed independently. + +The command `systemd-cgls` lists all control groups in the `systemd` +hierarchy, which is what systemd uses to keep track of the processes +belonging to each service or user session: + +```ShellSession +$ systemd-cgls +├─user +│ └─eelco +│ └─c1 +│ ├─ 2567 -:0 +│ ├─ 2682 kdeinit4: kdeinit4 Running... +│ ├─ ... +│ └─10851 sh -c less -R +└─system + ├─httpd.service + │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH + │ └─... + ├─dhcpcd.service + │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf + └─ ... +``` + +Similarly, `systemd-cgls cpu` shows the cgroups in the CPU hierarchy, +which allows per-cgroup CPU scheduling priorities. By default, every +systemd service gets its own CPU cgroup, while all user sessions are in +the top-level CPU cgroup. This ensures, for instance, that a thousand +run-away processes in the `httpd.service` cgroup cannot starve the CPU +for one process in the `postgresql.service` cgroup. (By contrast, it +they were in the same cgroup, then the PostgreSQL process would get +1/1001 of the cgroup's CPU time.) You can limit a service's CPU share in +`configuration.nix`: + +```nix +systemd.services.httpd.serviceConfig.CPUShares = 512; +``` + +By default, every cgroup has 1024 CPU shares, so this will halve the CPU +allocation of the `httpd.service` cgroup. + +There also is a `memory` hierarchy that controls memory allocation +limits; by default, all processes are in the top-level cgroup, so any +service or session can exhaust all available memory. Per-cgroup memory +limits can be specified in `configuration.nix`; for instance, to limit +`httpd.service` to 512 MiB of RAM (excluding swap): + +```nix +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +``` + +The command `systemd-cgtop` shows a continuously updated list of all +cgroups with their CPU and memory usage. diff --git a/nixpkgs/nixos/doc/manual/administration/control-groups.xml b/nixpkgs/nixos/doc/manual/administration/control-groups.xml deleted file mode 100644 index 16d03cc0d1ab..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/control-groups.xml +++ /dev/null @@ -1,65 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-cgroups"> - <title>Control Groups</title> - <para> - To keep track of the processes in a running system, systemd uses - <emphasis>control groups</emphasis> (cgroups). A control group is a set of - processes used to allocate resources such as CPU, memory or I/O bandwidth. - There can be multiple control group hierarchies, allowing each kind of - resource to be managed independently. - </para> - <para> - The command <command>systemd-cgls</command> lists all control groups in the - <literal>systemd</literal> hierarchy, which is what systemd uses to keep - track of the processes belonging to each service or user session: -<screen> -<prompt>$ </prompt>systemd-cgls -├─user -│ └─eelco -│ └─c1 -│ ├─ 2567 -:0 -│ ├─ 2682 kdeinit4: kdeinit4 Running... -│ ├─ <replaceable>...</replaceable> -│ └─10851 sh -c less -R -└─system - ├─httpd.service - │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH - │ └─<replaceable>...</replaceable> - ├─dhcpcd.service - │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf - └─ <replaceable>...</replaceable> -</screen> - Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU - hierarchy, which allows per-cgroup CPU scheduling priorities. By default, - every systemd service gets its own CPU cgroup, while all user sessions are in - the top-level CPU cgroup. This ensures, for instance, that a thousand - run-away processes in the <literal>httpd.service</literal> cgroup cannot - starve the CPU for one process in the <literal>postgresql.service</literal> - cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL - process would get 1/1001 of the cgroup’s CPU time.) You can limit a - service’s CPU share in <filename>configuration.nix</filename>: -<programlisting> -<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512; -</programlisting> - By default, every cgroup has 1024 CPU shares, so this will halve the CPU - allocation of the <literal>httpd.service</literal> cgroup. - </para> - <para> - There also is a <literal>memory</literal> hierarchy that controls memory - allocation limits; by default, all processes are in the top-level cgroup, so - any service or session can exhaust all available memory. Per-cgroup memory - limits can be specified in <filename>configuration.nix</filename>; for - instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM - (excluding swap): -<programlisting> -<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M"; -</programlisting> - </para> - <para> - The command <command>systemd-cgtop</command> shows a continuously updated - list of all cgroups with their CPU and memory usage. - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/administration/declarative-containers.section.md b/nixpkgs/nixos/doc/manual/administration/declarative-containers.section.md new file mode 100644 index 000000000000..273672fc10ca --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/declarative-containers.section.md @@ -0,0 +1,48 @@ +# Declarative Container Specification {#sec-declarative-containers} + +You can also specify containers and their configuration in the host's +`configuration.nix`. For example, the following specifies that there +shall be a container named `database` running PostgreSQL: + +```nix +containers.database = + { config = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql_9_6; + }; + }; +``` + +If you run `nixos-rebuild switch`, the container will be built. If the +container was already running, it will be updated in place, without +rebooting. The container can be configured to start automatically by +setting `containers.database.autoStart = true` in its configuration. + +By default, declarative containers share the network namespace of the +host, meaning that they can listen on (privileged) ports. However, they +cannot change the network configuration. You can give a container its +own network as follows: + +```nix +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; +``` + +This gives the container a private virtual Ethernet interface with IP +address `192.168.100.11`, which is hooked up to a virtual Ethernet +interface on the host with IP address `192.168.100.10`. (See the next +section for details on container networking.) + +To disable the container, just remove it from `configuration.nix` and +run `nixos-rebuild + switch`. Note that this will not delete the root directory of the +container in `/var/lib/containers`. Containers can be destroyed using +the imperative method: `nixos-container destroy foo`. + +Declarative containers can be started and stopped using the +corresponding systemd service, e.g. +`systemctl start container@database`. diff --git a/nixpkgs/nixos/doc/manual/administration/declarative-containers.xml b/nixpkgs/nixos/doc/manual/administration/declarative-containers.xml deleted file mode 100644 index d03dbc4d7055..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/declarative-containers.xml +++ /dev/null @@ -1,60 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-declarative-containers"> - <title>Declarative Container Specification</title> - - <para> - You can also specify containers and their configuration in the host’s - <filename>configuration.nix</filename>. For example, the following specifies - that there shall be a container named <literal>database</literal> running - PostgreSQL: -<programlisting> -containers.database = - { config = - { config, pkgs, ... }: - { <xref linkend="opt-services.postgresql.enable"/> = true; - <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_9_6; - }; - }; -</programlisting> - If you run <literal>nixos-rebuild switch</literal>, the container will be - built. If the container was already running, it will be updated in place, - without rebooting. The container can be configured to start automatically by - setting <literal>containers.database.autoStart = true</literal> in its - configuration. - </para> - - <para> - By default, declarative containers share the network namespace of the host, - meaning that they can listen on (privileged) ports. However, they cannot - change the network configuration. You can give a container its own network as - follows: -<programlisting> -containers.database = { - <link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true; - <link linkend="opt-containers._name_.hostAddress">hostAddress</link> = "192.168.100.10"; - <link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11"; -}; -</programlisting> - This gives the container a private virtual Ethernet interface with IP address - <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet - interface on the host with IP address <literal>192.168.100.10</literal>. (See - the next section for details on container networking.) - </para> - - <para> - To disable the container, just remove it from - <filename>configuration.nix</filename> and run <literal>nixos-rebuild - switch</literal>. Note that this will not delete the root directory of the - container in <literal>/var/lib/containers</literal>. Containers can be - destroyed using the imperative method: <literal>nixos-container destroy - foo</literal>. - </para> - - <para> - Declarative containers can be started and stopped using the corresponding - systemd service, e.g. <literal>systemctl start container@database</literal>. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/administration/imperative-containers.section.md b/nixpkgs/nixos/doc/manual/administration/imperative-containers.section.md new file mode 100644 index 000000000000..05196bf5d819 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/imperative-containers.section.md @@ -0,0 +1,115 @@ +# Imperative Container Management {#sec-imperative-containers} + +We'll cover imperative container management using `nixos-container` +first. Be aware that container management is currently only possible as +`root`. + +You create a container with identifier `foo` as follows: + +```ShellSession +# nixos-container create foo +``` + +This creates the container's root directory in `/var/lib/containers/foo` +and a small configuration file in `/etc/containers/foo.conf`. It also +builds the container's initial system configuration and stores it in +`/nix/var/nix/profiles/per-container/foo/system`. You can modify the +initial configuration of the container on the command line. For +instance, to create a container that has `sshd` running, with the given +public key for `root`: + +```ShellSession +# nixos-container create foo --config ' + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; +' +``` + +By default the next free address in the `10.233.0.0/16` subnet will be +chosen as container IP. This behavior can be altered by setting +`--host-address` and `--local-address`: + +```ShellSession +# nixos-container create test --config-file test-container.nix \ + --local-address 10.235.1.2 --host-address 10.235.1.1 +``` + +Creating a container does not start it. To start the container, run: + +```ShellSession +# nixos-container start foo +``` + +This command will return as soon as the container has booted and has +reached `multi-user.target`. On the host, the container runs within a +systemd unit called `container@container-name.service`. Thus, if +something went wrong, you can get status info using `systemctl`: + +```ShellSession +# systemctl status container@foo +``` + +If the container has started successfully, you can log in as root using +the `root-login` operation: + +```ShellSession +# nixos-container root-login foo +[root@foo:~]# +``` + +Note that only root on the host can do this (since there is no +authentication). You can also get a regular login prompt using the +`login` operation, which is available to all users on the host: + +```ShellSession +# nixos-container login foo +foo login: alice +Password: *** +``` + +With `nixos-container run`, you can execute arbitrary commands in the +container: + +```ShellSession +# nixos-container run foo -- uname -a +Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux +``` + +There are several ways to change the configuration of the container. +First, on the host, you can edit +`/var/lib/container/name/etc/nixos/configuration.nix`, and run + +```ShellSession +# nixos-container update foo +``` + +This will build and activate the new configuration. You can also specify +a new configuration on the command line: + +```ShellSession +# nixos-container update foo --config ' + services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; +' + +# curl http://$(nixos-container show-ip foo)/ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… +``` + +However, note that this will overwrite the container's +`/etc/nixos/configuration.nix`. + +Alternatively, you can change the configuration from within the +container itself by running `nixos-rebuild switch` inside the container. +Note that the container by default does not have a copy of the NixOS +channel, so you should run `nix-channel --update` first. + +Containers can be stopped and started using `nixos-container + stop` and `nixos-container start`, respectively, or by using +`systemctl` on the container's service unit. To destroy a container, +including its file system, do + +```ShellSession +# nixos-container destroy foo +``` diff --git a/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml b/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml deleted file mode 100644 index bc19acf9f690..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml +++ /dev/null @@ -1,123 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-imperative-containers"> - <title>Imperative Container Management</title> - - <para> - We’ll cover imperative container management using - <command>nixos-container</command> first. Be aware that container management - is currently only possible as <literal>root</literal>. - </para> - - <para> - You create a container with identifier <literal>foo</literal> as follows: -<screen> -<prompt># </prompt>nixos-container create <replaceable>foo</replaceable> -</screen> - This creates the container’s root directory in - <filename>/var/lib/containers/<replaceable>foo</replaceable></filename> and a small configuration file - in <filename>/etc/containers/<replaceable>foo</replaceable>.conf</filename>. It also builds the - container’s initial system configuration and stores it in - <filename>/nix/var/nix/profiles/per-container/<replaceable>foo</replaceable>/system</filename>. You can - modify the initial configuration of the container on the command line. For - instance, to create a container that has <command>sshd</command> running, - with the given public key for <literal>root</literal>: -<screen> -<prompt># </prompt>nixos-container create <replaceable>foo</replaceable> --config ' - <xref linkend="opt-services.openssh.enable"/> = true; - <link linkend="opt-users.users._name_.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"]; -' -</screen> - By default the next free address in the <literal>10.233.0.0/16</literal> subnet will be chosen - as container IP. This behavior can be altered by setting <literal>--host-address</literal> and - <literal>--local-address</literal>: -<screen> -<prompt># </prompt>nixos-container create test --config-file test-container.nix \ - --local-address 10.235.1.2 --host-address 10.235.1.1 -</screen> - </para> - - <para> - Creating a container does not start it. To start the container, run: -<screen> -<prompt># </prompt>nixos-container start <replaceable>foo</replaceable> -</screen> - This command will return as soon as the container has booted and has reached - <literal>multi-user.target</literal>. On the host, the container runs within - a systemd unit called - <literal>container@<replaceable>container-name</replaceable>.service</literal>. - Thus, if something went wrong, you can get status info using - <command>systemctl</command>: -<screen> -<prompt># </prompt>systemctl status container@<replaceable>foo</replaceable> -</screen> - </para> - - <para> - If the container has started successfully, you can log in as root using the - <command>root-login</command> operation: -<screen> -<prompt># </prompt>nixos-container root-login <replaceable>foo</replaceable> -<prompt>[root@foo:~]#</prompt> -</screen> - Note that only root on the host can do this (since there is no - authentication). You can also get a regular login prompt using the - <command>login</command> operation, which is available to all users on the - host: -<screen> -<prompt># </prompt>nixos-container login <replaceable>foo</replaceable> -foo login: alice -Password: *** -</screen> - With <command>nixos-container run</command>, you can execute arbitrary - commands in the container: -<screen> -<prompt># </prompt>nixos-container run <replaceable>foo</replaceable> -- uname -a -Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux -</screen> - </para> - - <para> - There are several ways to change the configuration of the container. First, - on the host, you can edit - <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, - and run -<screen> -<prompt># </prompt>nixos-container update <replaceable>foo</replaceable> -</screen> - This will build and activate the new configuration. You can also specify a - new configuration on the command line: -<screen> -<prompt># </prompt>nixos-container update <replaceable>foo</replaceable> --config ' - <xref linkend="opt-services.httpd.enable"/> = true; - <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org"; - <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ]; -' - -<prompt># </prompt>curl http://$(nixos-container show-ip <replaceable>foo</replaceable>)/ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… -</screen> - However, note that this will overwrite the container’s - <filename>/etc/nixos/configuration.nix</filename>. - </para> - - <para> - Alternatively, you can change the configuration from within the container - itself by running <command>nixos-rebuild switch</command> inside the - container. Note that the container by default does not have a copy of the - NixOS channel, so you should run <command>nix-channel --update</command> - first. - </para> - - <para> - Containers can be stopped and started using <literal>nixos-container - stop</literal> and <literal>nixos-container start</literal>, respectively, or - by using <command>systemctl</command> on the container’s service unit. To - destroy a container, including its file system, do -<screen> -<prompt># </prompt>nixos-container destroy <replaceable>foo</replaceable> -</screen> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/administration/logging.chapter.md b/nixpkgs/nixos/doc/manual/administration/logging.chapter.md new file mode 100644 index 000000000000..4ce6f5e9fa72 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/logging.chapter.md @@ -0,0 +1,38 @@ +# Logging {#sec-logging} + +System-wide logging is provided by systemd's *journal*, which subsumes +traditional logging daemons such as syslogd and klogd. Log entries are +kept in binary files in `/var/log/journal/`. The command `journalctl` +allows you to see the contents of the journal. For example, + +```ShellSession +$ journalctl -b +``` + +shows all journal entries since the last reboot. (The output of +`journalctl` is piped into `less` by default.) You can use various +options and match operators to restrict output to messages of interest. +For instance, to get all messages from PostgreSQL: + +```ShellSession +$ journalctl -u postgresql.service +-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- +... +Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down +-- Reboot -- +Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET +Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections +``` + +Or to get all messages since the last reboot that have at least a +"critical" severity level: + +```ShellSession +$ journalctl -b -p crit +Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] +Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) +``` + +The system journal is readable by root and by users in the `wheel` and +`systemd-journal` groups. All users have a private journal that can be +read using `journalctl`. diff --git a/nixpkgs/nixos/doc/manual/administration/logging.xml b/nixpkgs/nixos/doc/manual/administration/logging.xml deleted file mode 100644 index da4877fcdf08..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/logging.xml +++ /dev/null @@ -1,43 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-logging"> - <title>Logging</title> - <para> - System-wide logging is provided by systemd’s <emphasis>journal</emphasis>, - which subsumes traditional logging daemons such as syslogd and klogd. Log - entries are kept in binary files in <filename>/var/log/journal/</filename>. - The command <literal>journalctl</literal> allows you to see the contents of - the journal. For example, -<screen> -<prompt>$ </prompt>journalctl -b -</screen> - shows all journal entries since the last reboot. (The output of - <command>journalctl</command> is piped into <command>less</command> by - default.) You can use various options and match operators to restrict output - to messages of interest. For instance, to get all messages from PostgreSQL: -<screen> -<prompt>$ </prompt>journalctl -u postgresql.service --- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- -... -Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down --- Reboot -- -Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET -Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections -</screen> - Or to get all messages since the last reboot that have at least a - “critical” severity level: -<screen> -<prompt>$ </prompt>journalctl -b -p crit -Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] -Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) -</screen> - </para> - <para> - The system journal is readable by root and by users in the - <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All - users have a private journal that can be read using - <command>journalctl</command>. - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/administration/maintenance-mode.section.md b/nixpkgs/nixos/doc/manual/administration/maintenance-mode.section.md new file mode 100644 index 000000000000..0aec013c0a9b --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/maintenance-mode.section.md @@ -0,0 +1,11 @@ +# Maintenance Mode {#sec-maintenance-mode} + +You can enter rescue mode by running: + +```ShellSession +# systemctl rescue +``` + +This will eventually give you a single-user root shell. Systemd will +stop (almost) all system services. To get out of maintenance mode, just +exit from the rescue shell. diff --git a/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml b/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml deleted file mode 100644 index 74abfdd7c663..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml +++ /dev/null @@ -1,16 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-maintenance-mode"> - <title>Maintenance Mode</title> - - <para> - You can enter rescue mode by running: -<screen> -<prompt># </prompt>systemctl rescue</screen> - This will eventually give you a single-user root shell. Systemd will stop - (almost) all system services. To get out of maintenance mode, just exit from - the rescue shell. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/administration/network-problems.section.md b/nixpkgs/nixos/doc/manual/administration/network-problems.section.md new file mode 100644 index 000000000000..d360120d72d0 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/network-problems.section.md @@ -0,0 +1,21 @@ +# Network Problems {#sec-nix-network-issues} + +Nix uses a so-called *binary cache* to optimise building a package from +source into downloading it as a pre-built binary. That is, whenever a +command like `nixos-rebuild` needs a path in the Nix store, Nix will try +to download that path from the Internet rather than build it from +source. The default binary cache is `https://cache.nixos.org/`. If this +cache is unreachable, Nix operations may take a long time due to HTTP +connection timeouts. You can disable the use of the binary cache by +adding `--option use-binary-caches false`, e.g. + +```ShellSession +# nixos-rebuild switch --option use-binary-caches false +``` + +If you have an alternative binary cache at your disposal, you can use it +instead: + +```ShellSession +# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ +``` diff --git a/nixpkgs/nixos/doc/manual/administration/network-problems.xml b/nixpkgs/nixos/doc/manual/administration/network-problems.xml deleted file mode 100644 index 1035e4e056a9..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/network-problems.xml +++ /dev/null @@ -1,27 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-nix-network-issues"> - <title>Network Problems</title> - - <para> - Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a - package from source into downloading it as a pre-built binary. That is, - whenever a command like <command>nixos-rebuild</command> needs a path in the - Nix store, Nix will try to download that path from the Internet rather than - build it from source. The default binary cache is - <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix - operations may take a long time due to HTTP connection timeouts. You can - disable the use of the binary cache by adding <option>--option - use-binary-caches false</option>, e.g. -<screen> -<prompt># </prompt>nixos-rebuild switch --option use-binary-caches false -</screen> - If you have an alternative binary cache at your disposal, you can use it - instead: -<screen> -<prompt># </prompt>nixos-rebuild switch --option binary-caches <replaceable>http://my-cache.example.org/</replaceable> -</screen> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/administration/rebooting.chapter.md b/nixpkgs/nixos/doc/manual/administration/rebooting.chapter.md new file mode 100644 index 000000000000..ec4b889b1648 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/rebooting.chapter.md @@ -0,0 +1,30 @@ +# Rebooting and Shutting Down {#sec-rebooting} + +The system can be shut down (and automatically powered off) by doing: + +```ShellSession +# shutdown +``` + +This is equivalent to running `systemctl poweroff`. + +To reboot the system, run + +```ShellSession +# reboot +``` + +which is equivalent to `systemctl reboot`. Alternatively, you can +quickly reboot the system using `kexec`, which bypasses the BIOS by +directly loading the new kernel into memory: + +```ShellSession +# systemctl kexec +``` + +The machine can be suspended to RAM (if supported) using `systemctl suspend`, +and suspended to disk using `systemctl hibernate`. + +These commands can be run by any user who is logged in locally, i.e. on +a virtual console or in X11; otherwise, the user is asked for +authentication. diff --git a/nixpkgs/nixos/doc/manual/administration/rebooting.xml b/nixpkgs/nixos/doc/manual/administration/rebooting.xml deleted file mode 100644 index c57d885c5f3c..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/rebooting.xml +++ /dev/null @@ -1,35 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-rebooting"> - <title>Rebooting and Shutting Down</title> - <para> - The system can be shut down (and automatically powered off) by doing: -<screen> -<prompt># </prompt>shutdown -</screen> - This is equivalent to running <command>systemctl poweroff</command>. - </para> - <para> - To reboot the system, run -<screen> -<prompt># </prompt>reboot -</screen> - which is equivalent to <command>systemctl reboot</command>. Alternatively, - you can quickly reboot the system using <literal>kexec</literal>, which - bypasses the BIOS by directly loading the new kernel into memory: -<screen> -<prompt># </prompt>systemctl kexec -</screen> - </para> - <para> - The machine can be suspended to RAM (if supported) using <command>systemctl - suspend</command>, and suspended to disk using <command>systemctl - hibernate</command>. - </para> - <para> - These commands can be run by any user who is logged in locally, i.e. on a - virtual console or in X11; otherwise, the user is asked for authentication. - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/administration/rollback.section.md b/nixpkgs/nixos/doc/manual/administration/rollback.section.md new file mode 100644 index 000000000000..290d685a2a18 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/rollback.section.md @@ -0,0 +1,38 @@ +# Rolling Back Configuration Changes {#sec-rollback} + +After running `nixos-rebuild` to switch to a new configuration, you may +find that the new configuration doesn't work very well. In that case, +there are several ways to return to a previous configuration. + +First, the GRUB boot manager allows you to boot into any previous +configuration that hasn't been garbage-collected. These configurations +can be found under the GRUB submenu "NixOS - All configurations". This +is especially useful if the new configuration fails to boot. After the +system has booted, you can make the selected configuration the default +for subsequent boots: + +```ShellSession +# /run/current-system/bin/switch-to-configuration boot +``` + +Second, you can switch to the previous configuration in a running +system: + +```ShellSession +# nixos-rebuild switch --rollback +``` + +This is equivalent to running: + +```ShellSession +# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch +``` + +where `N` is the number of the NixOS system configuration. To get a +list of the available configurations, do: + +```ShellSession +$ ls -l /nix/var/nix/profiles/system-*-link +... +lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 +``` diff --git a/nixpkgs/nixos/doc/manual/administration/rollback.xml b/nixpkgs/nixos/doc/manual/administration/rollback.xml deleted file mode 100644 index 80d79e1a53f1..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/rollback.xml +++ /dev/null @@ -1,41 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-rollback"> - <title>Rolling Back Configuration Changes</title> - - <para> - After running <command>nixos-rebuild</command> to switch to a new - configuration, you may find that the new configuration doesn’t work very - well. In that case, there are several ways to return to a previous - configuration. - </para> - - <para> - First, the GRUB boot manager allows you to boot into any previous - configuration that hasn’t been garbage-collected. These configurations can - be found under the GRUB submenu “NixOS - All configurations”. This is - especially useful if the new configuration fails to boot. After the system - has booted, you can make the selected configuration the default for - subsequent boots: -<screen> -<prompt># </prompt>/run/current-system/bin/switch-to-configuration boot</screen> - </para> - - <para> - Second, you can switch to the previous configuration in a running system: -<screen> -<prompt># </prompt>nixos-rebuild switch --rollback</screen> - This is equivalent to running: -<screen> -<prompt># </prompt>/nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen> - where <replaceable>N</replaceable> is the number of the NixOS system - configuration. To get a list of the available configurations, do: -<screen> -<prompt>$ </prompt>ls -l /nix/var/nix/profiles/system-*-link -<replaceable>...</replaceable> -lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 -</screen> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/administration/running.xml b/nixpkgs/nixos/doc/manual/administration/running.xml index 19bec1f7794d..d9fcc1aee263 100644 --- a/nixpkgs/nixos/doc/manual/administration/running.xml +++ b/nixpkgs/nixos/doc/manual/administration/running.xml @@ -10,12 +10,12 @@ such as how to use the <command>systemd</command> service manager. </para> </partintro> - <xi:include href="service-mgmt.xml" /> - <xi:include href="rebooting.xml" /> - <xi:include href="user-sessions.xml" /> - <xi:include href="control-groups.xml" /> - <xi:include href="logging.xml" /> - <xi:include href="cleaning-store.xml" /> - <xi:include href="containers.xml" /> - <xi:include href="troubleshooting.xml" /> + <xi:include href="../from_md/administration/service-mgmt.chapter.xml" /> + <xi:include href="../from_md/administration/rebooting.chapter.xml" /> + <xi:include href="../from_md/administration/user-sessions.chapter.xml" /> + <xi:include href="../from_md/administration/control-groups.chapter.xml" /> + <xi:include href="../from_md/administration/logging.chapter.xml" /> + <xi:include href="../from_md/administration/cleaning-store.chapter.xml" /> + <xi:include href="../from_md/administration/containers.chapter.xml" /> + <xi:include href="../from_md/administration/troubleshooting.chapter.xml" /> </part> diff --git a/nixpkgs/nixos/doc/manual/administration/service-mgmt.chapter.md b/nixpkgs/nixos/doc/manual/administration/service-mgmt.chapter.md new file mode 100644 index 000000000000..bb0f9b62e913 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/service-mgmt.chapter.md @@ -0,0 +1,120 @@ +# Service Management {#sec-systemctl} + +In NixOS, all system services are started and monitored using the +systemd program. systemd is the "init" process of the system (i.e. PID +1), the parent of all other processes. It manages a set of so-called +"units", which can be things like system services (programs), but also +mount points, swap files, devices, targets (groups of units) and more. +Units can have complex dependencies; for instance, one unit can require +that another unit must be successfully started before the first unit can +be started. When the system boots, it starts a unit named +`default.target`; the dependencies of this unit cause all system +services to be started, file systems to be mounted, swap files to be +activated, and so on. + +## Interacting with a running systemd {#sect-nixos-systemd-general} + +The command `systemctl` is the main way to interact with `systemd`. The +following paragraphs demonstrate ways to interact with any OS running +systemd as init system. NixOS is of no exception. The [next section +](#sect-nixos-systemd-nixos) explains NixOS specific things worth +knowing. + +Without any arguments, `systemctl` the status of active units: + +```ShellSession +$ systemctl +-.mount loaded active mounted / +swapfile.swap loaded active active /swapfile +sshd.service loaded active running SSH Daemon +graphical.target loaded active active Graphical Interface +... +``` + +You can ask for detailed status information about a unit, for instance, +the PostgreSQL database service: + +```ShellSession +$ systemctl status postgresql.service +postgresql.service - PostgreSQL Server + Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) + Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago + Main PID: 2390 (postgres) + CGroup: name=systemd:/system/postgresql.service + ├─2390 postgres + ├─2418 postgres: writer process + ├─2419 postgres: wal writer process + ├─2420 postgres: autovacuum launcher process + ├─2421 postgres: stats collector process + └─2498 postgres: zabbix zabbix [local] idle + +Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET +Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections +Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started +Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. +``` + +Note that this shows the status of the unit (active and running), all +the processes belonging to the service, as well as the most recent log +messages from the service. + +Units can be stopped, started or restarted: + +```ShellSession +# systemctl stop postgresql.service +# systemctl start postgresql.service +# systemctl restart postgresql.service +``` + +These operations are synchronous: they wait until the service has +finished starting or stopping (or has failed). Starting a unit will +cause the dependencies of that unit to be started as well (if +necessary). + +## systemd in NixOS {#sect-nixos-systemd-nixos} + +Packages in Nixpkgs sometimes provide systemd units with them, usually +in e.g `#pkg-out#/lib/systemd/`. Putting such a package in +`environment.systemPackages` doesn\'t make the service available to +users or the system. + +In order to enable a systemd *system* service with provided upstream +package, use (e.g): + +```nix +systemd.packages = [ pkgs.packagekit ]; +``` + +Usually NixOS modules written by the community do the above, plus take +care of other details. If a module was written for a service you are +interested in, you\'d probably need only to use +`services.#name#.enable = true;`. These services are defined in +Nixpkgs\' [ `nixos/modules/` directory +](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules). In case +the service is simple enough, the above method should work, and start +the service on boot. + +*User* systemd services on the other hand, should be treated +differently. Given a package that has a systemd unit file at +`#pkg-out#/lib/systemd/user/`, using [](#opt-systemd.packages) will +make you able to start the service via `systemctl --user start`, but it +won\'t start automatically on login. However, You can imperatively +enable it by adding the package\'s attribute to +[](#opt-systemd.packages) and then do this (e.g): + +```ShellSession +$ mkdir -p ~/.config/systemd/user/default.target.wants +$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ +$ systemctl --user daemon-reload +$ systemctl --user enable syncthing.service +``` + +If you are interested in a timer file, use `timers.target.wants` instead +of `default.target.wants` in the 1st and 2nd command. + +Using `systemctl --user enable syncthing.service` instead of the above, +will work, but it\'ll use the absolute path of `syncthing.service` for +the symlink, and this path is in `/nix/store/.../lib/systemd/user/`. +Hence [garbage collection](#sec-nix-gc) will remove that file and you +will wind up with a broken symlink in your systemd configuration, which +in turn will not make the service / timer start on login. diff --git a/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml b/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml deleted file mode 100644 index 863b0d47f6c7..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml +++ /dev/null @@ -1,140 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-systemctl"> - <title>Service Management</title> - <para> - In NixOS, all system services are started and monitored using the systemd - program. systemd is the “init” process of the system (i.e. PID 1), the - parent of all other processes. It manages a set of so-called “units”, - which can be things like system services (programs), but also mount points, - swap files, devices, targets (groups of units) and more. Units can have - complex dependencies; for instance, one unit can require that another unit - must be successfully started before the first unit can be started. When the - system boots, it starts a unit named <literal>default.target</literal>; the - dependencies of this unit cause all system services to be started, file - systems to be mounted, swap files to be activated, and so on. - </para> - <section xml:id="sect-nixos-systemd-general"> - <title>Interacting with a running systemd</title> - <para> - The command <command>systemctl</command> is the main way to interact with - <command>systemd</command>. The following paragraphs demonstrate ways to - interact with any OS running systemd as init system. NixOS is of no - exception. The <link xlink:href="#sect-nixos-systemd-nixos">next section - </link> explains NixOS specific things worth knowing. - </para> - <para> - Without any arguments, <literal>systmctl</literal> the status of active units: -<screen> -<prompt>$ </prompt>systemctl --.mount loaded active mounted / -swapfile.swap loaded active active /swapfile -sshd.service loaded active running SSH Daemon -graphical.target loaded active active Graphical Interface -<replaceable>...</replaceable> -</screen> - </para> - <para> - You can ask for detailed status information about a unit, for instance, the - PostgreSQL database service: -<screen> -<prompt>$ </prompt>systemctl status postgresql.service -postgresql.service - PostgreSQL Server - Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) - Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago - Main PID: 2390 (postgres) - CGroup: name=systemd:/system/postgresql.service - ├─2390 postgres - ├─2418 postgres: writer process - ├─2419 postgres: wal writer process - ├─2420 postgres: autovacuum launcher process - ├─2421 postgres: stats collector process - └─2498 postgres: zabbix zabbix [local] idle - -Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET -Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections -Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started -Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. -</screen> - Note that this shows the status of the unit (active and running), all the - processes belonging to the service, as well as the most recent log messages - from the service. - </para> - <para> - Units can be stopped, started or restarted: -<screen> -<prompt># </prompt>systemctl stop postgresql.service -<prompt># </prompt>systemctl start postgresql.service -<prompt># </prompt>systemctl restart postgresql.service -</screen> - These operations are synchronous: they wait until the service has finished - starting or stopping (or has failed). Starting a unit will cause the - dependencies of that unit to be started as well (if necessary). - </para> - <!-- TODO: document cgroups, draft: - each service and user session is a cgroup - - - cgroup resource management --> - </section> - <section xml:id="sect-nixos-systemd-nixos"> - <title>systemd in NixOS</title> - <para> - Packages in Nixpkgs sometimes provide systemd units with them, usually in - e.g <literal>#pkg-out#/lib/systemd/</literal>. Putting such a package in - <literal>environment.systemPackages</literal> doesn't make the service - available to users or the system. - </para> - <para> - In order to enable a systemd <emphasis>system</emphasis> service with - provided upstream package, use (e.g): -<programlisting> -<xref linkend="opt-systemd.packages"/> = [ pkgs.packagekit ]; -</programlisting> - </para> - <para> - Usually NixOS modules written by the community do the above, plus take care of - other details. If a module was written for a service you are interested in, - you'd probably need only to use - <literal>services.#name#.enable = true;</literal>. These services are defined - in Nixpkgs' - <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"> - <literal>nixos/modules/</literal> directory </link>. In case the service is - simple enough, the above method should work, and start the service on boot. - </para> - <para> - <emphasis>User</emphasis> systemd services on the other hand, should be - treated differently. Given a package that has a systemd unit file at - <literal>#pkg-out#/lib/systemd/user/</literal>, using - <xref linkend="opt-systemd.packages"/> will make you able to start the service via - <literal>systemctl --user start</literal>, but it won't start automatically on login. - <!-- TODO: Document why systemd.packages doesn't work for user services or fix this. - https://github.com/NixOS/nixpkgs/blob/2cd6594a8710a801038af2b72348658f732ce84a/nixos/modules/system/boot/systemd-lib.nix#L177-L198 - - This has been talked over at https://discourse.nixos.org/t/how-to-enable-upstream-systemd-user-services-declaratively/7649/5 - --> - However, You can imperatively enable it by adding the package's attribute to - <link linkend="opt-environment.systemPackages"> - <literal>systemd.packages</literal></link> and then do this (e.g): -<screen> -<prompt>$ </prompt>mkdir -p ~/.config/systemd/user/default.target.wants -<prompt>$ </prompt>ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ -<prompt>$ </prompt>systemctl --user daemon-reload -<prompt>$ </prompt>systemctl --user enable syncthing.service -</screen> - If you are interested in a timer file, use <literal>timers.target.wants</literal> - instead of <literal>default.target.wants</literal> in the 1st and 2nd command. - </para> - <para> - Using <literal>systemctl --user enable syncthing.service</literal> instead of - the above, will work, but it'll use the absolute path of - <literal>syncthing.service</literal> for the symlink, and this path is in - <literal>/nix/store/.../lib/systemd/user/</literal>. Hence - <link xlink:href="#sec-nix-gc">garbage collection</link> will remove that file - and you will wind up with a broken symlink in your systemd configuration, which - in turn will not make the service / timer start on login. - </para> - </section> -</chapter> - diff --git a/nixpkgs/nixos/doc/manual/administration/store-corruption.section.md b/nixpkgs/nixos/doc/manual/administration/store-corruption.section.md new file mode 100644 index 000000000000..bd8a5772b37c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/store-corruption.section.md @@ -0,0 +1,28 @@ +# Nix Store Corruption {#sec-nix-store-corruption} + +After a system crash, it's possible for files in the Nix store to become +corrupted. (For instance, the Ext4 file system has the tendency to +replace un-synced files with zero bytes.) NixOS tries hard to prevent +this from happening: it performs a `sync` before switching to a new +configuration, and Nix's database is fully transactional. If corruption +still occurs, you may be able to fix it automatically. + +If the corruption is in a path in the closure of the NixOS system +configuration, you can fix it by doing + +```ShellSession +# nixos-rebuild switch --repair +``` + +This will cause Nix to check every path in the closure, and if its +cryptographic hash differs from the hash recorded in Nix's database, the +path is rebuilt or redownloaded. + +You can also scan the entire Nix store for corrupt paths: + +```ShellSession +# nix-store --verify --check-contents --repair +``` + +Any corrupt paths will be redownloaded if they're available in a binary +cache; otherwise, they cannot be repaired. diff --git a/nixpkgs/nixos/doc/manual/administration/store-corruption.xml b/nixpkgs/nixos/doc/manual/administration/store-corruption.xml deleted file mode 100644 index b9d11152d5e1..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/store-corruption.xml +++ /dev/null @@ -1,36 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-nix-store-corruption"> - <title>Nix Store Corruption</title> - - <para> - After a system crash, it’s possible for files in the Nix store to become - corrupted. (For instance, the Ext4 file system has the tendency to replace - un-synced files with zero bytes.) NixOS tries hard to prevent this from - happening: it performs a <command>sync</command> before switching to a new - configuration, and Nix’s database is fully transactional. If corruption - still occurs, you may be able to fix it automatically. - </para> - - <para> - If the corruption is in a path in the closure of the NixOS system - configuration, you can fix it by doing -<screen> -<prompt># </prompt>nixos-rebuild switch --repair -</screen> - This will cause Nix to check every path in the closure, and if its - cryptographic hash differs from the hash recorded in Nix’s database, the - path is rebuilt or redownloaded. - </para> - - <para> - You can also scan the entire Nix store for corrupt paths: -<screen> -<prompt># </prompt>nix-store --verify --check-contents --repair -</screen> - Any corrupt paths will be redownloaded if they’re available in a binary - cache; otherwise, they cannot be repaired. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/administration/troubleshooting.chapter.md b/nixpkgs/nixos/doc/manual/administration/troubleshooting.chapter.md new file mode 100644 index 000000000000..548456eaf6d6 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/troubleshooting.chapter.md @@ -0,0 +1,12 @@ +# Troubleshooting {#ch-troubleshooting} + +This chapter describes solutions to common problems you might encounter +when you manage your NixOS system. + +```{=docbook} +<xi:include href="boot-problems.section.xml" /> +<xi:include href="maintenance-mode.section.xml" /> +<xi:include href="rollback.section.xml" /> +<xi:include href="store-corruption.section.xml" /> +<xi:include href="network-problems.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/administration/troubleshooting.xml b/nixpkgs/nixos/doc/manual/administration/troubleshooting.xml deleted file mode 100644 index b055acadacf3..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/troubleshooting.xml +++ /dev/null @@ -1,16 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-troubleshooting"> - <title>Troubleshooting</title> - <para> - This chapter describes solutions to common problems you might encounter when - you manage your NixOS system. - </para> - <xi:include href="../from_md/administration/boot-problems.section.xml" /> - <xi:include href="maintenance-mode.xml" /> - <xi:include href="rollback.xml" /> - <xi:include href="store-corruption.xml" /> - <xi:include href="network-problems.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/administration/user-sessions.chapter.md b/nixpkgs/nixos/doc/manual/administration/user-sessions.chapter.md new file mode 100644 index 000000000000..5ff468b30122 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/administration/user-sessions.chapter.md @@ -0,0 +1,43 @@ +# User Sessions {#sec-user-sessions} + +Systemd keeps track of all users who are logged into the system (e.g. on +a virtual console or remotely via SSH). The command `loginctl` allows +querying and manipulating user sessions. For instance, to list all user +sessions: + +```ShellSession +$ loginctl + SESSION UID USER SEAT + c1 500 eelco seat0 + c3 0 root seat0 + c4 500 alice +``` + +This shows that two users are logged in locally, while another is logged +in remotely. ("Seats" are essentially the combinations of displays and +input devices attached to the system; usually, there is only one seat.) +To get information about a session: + +```ShellSession +$ loginctl session-status c3 +c3 - root (0) + Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago + Leader: 2536 (login) + Seat: seat0; vc3 + TTY: /dev/tty3 + Service: login; type tty; class user + State: online + CGroup: name=systemd:/user/root/c3 + ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- + ├─10339 -bash + └─10355 w3m nixos.org +``` + +This shows that the user is logged in on virtual console 3. It also +lists the processes belonging to this session. Since systemd keeps track +of this, you can terminate a session in a way that ensures that all the +session's processes are gone: + +```ShellSession +# loginctl terminate-session c3 +``` diff --git a/nixpkgs/nixos/doc/manual/administration/user-sessions.xml b/nixpkgs/nixos/doc/manual/administration/user-sessions.xml deleted file mode 100644 index 9acb147ac1a6..000000000000 --- a/nixpkgs/nixos/doc/manual/administration/user-sessions.xml +++ /dev/null @@ -1,45 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-user-sessions"> - <title>User Sessions</title> - <para> - Systemd keeps track of all users who are logged into the system (e.g. on a - virtual console or remotely via SSH). The command <command>loginctl</command> - allows querying and manipulating user sessions. For instance, to list all - user sessions: -<screen> -<prompt>$ </prompt>loginctl - SESSION UID USER SEAT - c1 500 eelco seat0 - c3 0 root seat0 - c4 500 alice -</screen> - This shows that two users are logged in locally, while another is logged in - remotely. (“Seats” are essentially the combinations of displays and input - devices attached to the system; usually, there is only one seat.) To get - information about a session: -<screen> -<prompt>$ </prompt>loginctl session-status c3 -c3 - root (0) - Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago - Leader: 2536 (login) - Seat: seat0; vc3 - TTY: /dev/tty3 - Service: login; type tty; class user - State: online - CGroup: name=systemd:/user/root/c3 - ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- - ├─10339 -bash - └─10355 w3m nixos.org -</screen> - This shows that the user is logged in on virtual console 3. It also lists the - processes belonging to this session. Since systemd keeps track of this, you - can terminate a session in a way that ensures that all the session’s - processes are gone: -<screen> -<prompt># </prompt>loginctl terminate-session c3 -</screen> - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.section.md b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.section.md new file mode 100644 index 000000000000..4478d77f361d --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.section.md @@ -0,0 +1,13 @@ +# Ad-Hoc Configuration {#ad-hoc-network-config} + +You can use [](#opt-networking.localCommands) to +specify shell commands to be run at the end of `network-setup.service`. This +is useful for doing network configuration not covered by the existing NixOS +modules. For instance, to statically configure an IPv6 address: + +```nix +networking.localCommands = + '' + ip -6 addr add 2001:610:685:1::1/64 dev eth0 + ''; +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.xml deleted file mode 100644 index 00e595c7cb7f..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/ad-hoc-network-config.xml +++ /dev/null @@ -1,20 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ad-hoc-network-config"> - <title>Ad-Hoc Configuration</title> - - <para> - You can use <xref linkend="opt-networking.localCommands"/> to specify shell - commands to be run at the end of <literal>network-setup.service</literal>. - This is useful for doing network configuration not covered by the existing - NixOS modules. For instance, to statically configure an IPv6 address: -<programlisting> -<xref linkend="opt-networking.localCommands"/> = - '' - ip -6 addr add 2001:610:685:1::1/64 dev eth0 - ''; -</programlisting> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.section.md b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.section.md new file mode 100644 index 000000000000..e9d574903a10 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.section.md @@ -0,0 +1,51 @@ +# Ad-Hoc Package Management {#sec-ad-hoc-packages} + +With the command `nix-env`, you can install and uninstall packages from +the command line. For instance, to install Mozilla Thunderbird: + +```ShellSession +$ nix-env -iA nixos.thunderbird +``` + +If you invoke this as root, the package is installed in the Nix profile +`/nix/var/nix/profiles/default` and visible to all users of the system; +otherwise, the package ends up in +`/nix/var/nix/profiles/per-user/username/profile` and is not visible to +other users. The `-A` flag specifies the package by its attribute name; +without it, the package is installed by matching against its package +name (e.g. `thunderbird`). The latter is slower because it requires +matching against all available Nix packages, and is ambiguous if there +are multiple matching packages. + +Packages come from the NixOS channel. You typically upgrade a package by +updating to the latest version of the NixOS channel: + +```ShellSession +$ nix-channel --update nixos +``` + +and then running `nix-env -i` again. Other packages in the profile are +*not* affected; this is the crucial difference with the declarative +style of package management, where running `nixos-rebuild switch` causes +all packages to be updated to their current versions in the NixOS +channel. You can however upgrade all packages for which there is a newer +version by doing: + +```ShellSession +$ nix-env -u '*' +``` + +A package can be uninstalled using the `-e` flag: + +```ShellSession +$ nix-env -e thunderbird +``` + +Finally, you can roll back an undesirable `nix-env` action: + +```ShellSession +$ nix-env --rollback +``` + +`nix-env` has many more flags. For details, see the nix-env(1) manpage or +the Nix manual. diff --git a/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.xml deleted file mode 100644 index c7e882d846fa..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/ad-hoc-packages.xml +++ /dev/null @@ -1,61 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-ad-hoc-packages"> - <title>Ad-Hoc Package Management</title> - - <para> - With the command <command>nix-env</command>, you can install and uninstall - packages from the command line. For instance, to install Mozilla Thunderbird: -<screen> -<prompt>$ </prompt>nix-env -iA nixos.thunderbird</screen> - If you invoke this as root, the package is installed in the Nix profile - <filename>/nix/var/nix/profiles/default</filename> and visible to all users - of the system; otherwise, the package ends up in - <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename> - and is not visible to other users. The <option>-A</option> flag specifies the - package by its attribute name; without it, the package is installed by - matching against its package name (e.g. <literal>thunderbird</literal>). The - latter is slower because it requires matching against all available Nix - packages, and is ambiguous if there are multiple matching packages. - </para> - - <para> - Packages come from the NixOS channel. You typically upgrade a package by - updating to the latest version of the NixOS channel: -<screen> -<prompt>$ </prompt>nix-channel --update nixos -</screen> - and then running <literal>nix-env -i</literal> again. Other packages in the - profile are <emphasis>not</emphasis> affected; this is the crucial difference - with the declarative style of package management, where running - <command>nixos-rebuild switch</command> causes all packages to be updated to - their current versions in the NixOS channel. You can however upgrade all - packages for which there is a newer version by doing: -<screen> -<prompt>$ </prompt>nix-env -u '*' -</screen> - </para> - - <para> - A package can be uninstalled using the <option>-e</option> flag: -<screen> -<prompt>$ </prompt>nix-env -e thunderbird -</screen> - </para> - - <para> - Finally, you can roll back an undesirable <command>nix-env</command> action: -<screen> -<prompt>$ </prompt>nix-env --rollback -</screen> - </para> - - <para> - <command>nix-env</command> has many more flags. For details, see the - <citerefentry> - <refentrytitle>nix-env</refentrytitle> - <manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md b/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md new file mode 100644 index 000000000000..5d1198fb0f41 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md @@ -0,0 +1,74 @@ +# Adding Custom Packages {#sec-custom-packages} + +It's possible that a package you need is not available in NixOS. In that +case, you can do two things. First, you can clone the Nixpkgs +repository, add the package to your clone, and (optionally) submit a +patch or pull request to have it accepted into the main Nixpkgs repository. +This is described in detail in the [Nixpkgs manual](https://nixos.org/nixpkgs/manual). +In short, you clone Nixpkgs: + +```ShellSession +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +``` + +Then you write and test the package as described in the Nixpkgs manual. +Finally, you add it to [](#opt-environment.systemPackages), e.g. + +```nix +environment.systemPackages = [ pkgs.my-package ]; +``` + +and you run `nixos-rebuild`, specifying your own Nixpkgs tree: + +```ShellSession +# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs +``` + +The second possibility is to add the package outside of the Nixpkgs +tree. For instance, here is how you specify a build of the +[GNU Hello](https://www.gnu.org/software/hello/) package directly in +`configuration.nix`: + +```nix +environment.systemPackages = + let + my-hello = with pkgs; stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; + }; + in + [ my-hello ]; +``` + +Of course, you can also move the definition of `my-hello` into a +separate Nix expression, e.g. + +```nix +environment.systemPackages = [ (import ./my-hello.nix) ]; +``` + +where `my-hello.nix` contains: + +```nix +with import <nixpkgs> {}; # bring all of Nixpkgs into scope + +stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; +} +``` + +This allows testing the package easily: + +```ShellSession +$ nix-build my-hello.nix +$ ./result/bin/hello +Hello, world! +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml deleted file mode 100644 index 19eb2429d0a0..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml +++ /dev/null @@ -1,73 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-custom-packages"> - <title>Adding Custom Packages</title> - - <para> - It’s possible that a package you need is not available in NixOS. In that - case, you can do two things. First, you can clone the Nixpkgs repository, add - the package to your clone, and (optionally) submit a patch or pull request to - have it accepted into the main Nixpkgs repository. This is described in - detail in the <link -xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs - manual</link>. In short, you clone Nixpkgs: -<screen> -<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs -<prompt>$ </prompt>cd nixpkgs -</screen> - Then you write and test the package as described in the Nixpkgs manual. - Finally, you add it to <literal>environment.systemPackages</literal>, e.g. -<programlisting> -<xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ]; -</programlisting> - and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs - tree: -<screen> -<prompt># </prompt>nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen> - </para> - - <para> - The second possibility is to add the package outside of the Nixpkgs tree. For - instance, here is how you specify a build of the - <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link> - package directly in <filename>configuration.nix</filename>: -<programlisting> -<xref linkend="opt-environment.systemPackages"/> = - let - my-hello = with pkgs; stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; - }; - in - [ my-hello ]; -</programlisting> - Of course, you can also move the definition of <literal>my-hello</literal> - into a separate Nix expression, e.g. -<programlisting> -<xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ]; -</programlisting> - where <filename>my-hello.nix</filename> contains: -<programlisting> -with import <nixpkgs> {}; # bring all of Nixpkgs into scope - -stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; -} -</programlisting> - This allows testing the package easily: -<screen> -<prompt>$ </prompt>nix-build my-hello.nix -<prompt>$ </prompt>./result/bin/hello -Hello, world! -</screen> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/config-file.section.md b/nixpkgs/nixos/doc/manual/configuration/config-file.section.md new file mode 100644 index 000000000000..f21ba113bf8c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/config-file.section.md @@ -0,0 +1,175 @@ +# NixOS Configuration File {#sec-configuration-file} + +The NixOS configuration file generally looks like this: + +```nix +{ config, pkgs, ... }: + +{ option definitions +} +``` + +The first line (`{ config, pkgs, ... }:`) denotes that this is actually +a function that takes at least the two arguments `config` and `pkgs`. +(These are explained later, in chapter [](#sec-writing-modules)) The +function returns a *set* of option definitions (`{ ... }`). +These definitions have the form `name = value`, where `name` is the +name of an option and `value` is its value. For example, + +```nix +{ config, pkgs, ... }: + +{ services.httpd.enable = true; + services.httpd.adminAddr = "alice@example.org"; + services.httpd.virtualHosts.localhost.documentRoot = "/webroot"; +} +``` + +defines a configuration with three option definitions that together +enable the Apache HTTP Server with `/webroot` as the document root. + +Sets can be nested, and in fact dots in option names are shorthand for +defining a set containing another set. For instance, +[](#opt-services.httpd.enable) defines a set named +`services` that contains a set named `httpd`, which in turn contains an +option definition named `enable` with value `true`. This means that the +example above can also be written as: + +```nix +{ config, pkgs, ... }: + +{ services = { + httpd = { + enable = true; + adminAddr = "alice@example.org"; + virtualHosts = { + localhost = { + documentRoot = "/webroot"; + }; + }; + }; + }; +} +``` + +which may be more convenient if you have lots of option definitions that +share the same prefix (such as `services.httpd`). + +NixOS checks your option definitions for correctness. For instance, if +you try to define an option that doesn't exist (that is, doesn't have a +corresponding *option declaration*), `nixos-rebuild` will give an error +like: + +```plain +The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. +``` + +Likewise, values in option definitions must have a correct type. For +instance, `services.httpd.enable` must be a Boolean (`true` or `false`). +Trying to give it a value of another type, such as a string, will cause +an error: + +```plain +The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. +``` + +Options have various types of values. The most important are: + +Strings + +: Strings are enclosed in double quotes, e.g. + + ```nix + networking.hostName = "dexter"; + ``` + + Special characters can be escaped by prefixing them with a backslash + (e.g. `\"`). + + Multi-line strings can be enclosed in *double single quotes*, e.g. + + ```nix + networking.extraHosts = + '' + 127.0.0.2 other-localhost + 10.0.0.1 server + ''; + ``` + + The main difference is that it strips from each line a number of + spaces equal to the minimal indentation of the string as a whole + (disregarding the indentation of empty lines), and that characters + like `"` and `\` are not special (making it more convenient for + including things like shell code). See more info about this in the + Nix manual [here](https://nixos.org/nix/manual/#ssec-values). + +Booleans + +: These can be `true` or `false`, e.g. + + ```nix + networking.firewall.enable = true; + networking.firewall.allowPing = false; + ``` + +Integers + +: For example, + + ```nix + boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; + ``` + + (Note that here the attribute name `net.ipv4.tcp_keepalive_time` is + enclosed in quotes to prevent it from being interpreted as a set + named `net` containing a set named `ipv4`, and so on. This is + because it's not a NixOS option but the literal name of a Linux + kernel setting.) + +Sets + +: Sets were introduced above. They are name/value pairs enclosed in + braces, as in the option definition + + ```nix + fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext4"; + options = [ "rw" "data=ordered" "relatime" ]; + }; + ``` + +Lists + +: The important thing to note about lists is that list elements are + separated by whitespace, like this: + + ```nix + boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + ``` + + List elements can be any other type, e.g. sets: + + ```nix + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; + ``` + +Packages + +: Usually, the packages you need are already part of the Nix Packages + collection, which is a set that can be accessed through the function + argument `pkgs`. Typical uses: + + ```nix + environment.systemPackages = + [ pkgs.thunderbird + pkgs.emacs + ]; + + services.postgresql.package = pkgs.postgresql_10; + ``` + + The latter option definition changes the default PostgreSQL package + used by NixOS's PostgreSQL service to 10.x. For more information on + packages, including how to add new ones, see + [](#sec-custom-packages). diff --git a/nixpkgs/nixos/doc/manual/configuration/config-file.xml b/nixpkgs/nixos/doc/manual/configuration/config-file.xml deleted file mode 100644 index 19cfb57920df..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/config-file.xml +++ /dev/null @@ -1,216 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-configuration-file"> - <title>NixOS Configuration File</title> - - <para> - The NixOS configuration file generally looks like this: -<programlisting> -{ config, pkgs, ... }: - -{ <replaceable>option definitions</replaceable> -} -</programlisting> - The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this - is actually a function that takes at least the two arguments - <varname>config</varname> and <varname>pkgs</varname>. (These are explained - later, in chapter <xref linkend="sec-writing-modules" />) The function returns - a <emphasis>set</emphasis> of option definitions (<literal>{ - <replaceable>...</replaceable> }</literal>). These definitions have the form - <literal><replaceable>name</replaceable> = - <replaceable>value</replaceable></literal>, where - <replaceable>name</replaceable> is the name of an option and - <replaceable>value</replaceable> is its value. For example, -<programlisting> -{ config, pkgs, ... }: - -{ <xref linkend="opt-services.httpd.enable"/> = true; - <xref linkend="opt-services.httpd.adminAddr"/> = "alice@example.org"; - <link linkend="opt-services.httpd.virtualHosts">services.httpd.virtualHosts.localhost.documentRoot</link> = "/webroot"; -} -</programlisting> - defines a configuration with three option definitions that together enable - the Apache HTTP Server with <filename>/webroot</filename> as the document - root. - </para> - - <para> - Sets can be nested, and in fact dots in option names are shorthand for - defining a set containing another set. For instance, - <xref linkend="opt-services.httpd.enable"/> defines a set named - <varname>services</varname> that contains a set named - <varname>httpd</varname>, which in turn contains an option definition named - <varname>enable</varname> with value <literal>true</literal>. This means that - the example above can also be written as: -<programlisting> -{ config, pkgs, ... }: - -{ services = { - httpd = { - enable = true; - adminAddr = "alice@example.org"; - virtualHosts = { - localhost = { - documentRoot = "/webroot"; - }; - }; - }; - }; -} -</programlisting> - which may be more convenient if you have lots of option definitions that - share the same prefix (such as <literal>services.httpd</literal>). - </para> - - <para> - NixOS checks your option definitions for correctness. For instance, if you - try to define an option that doesn’t exist (that is, doesn’t have a - corresponding <emphasis>option declaration</emphasis>), - <command>nixos-rebuild</command> will give an error like: -<screen> -The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. -</screen> - Likewise, values in option definitions must have a correct type. For - instance, <option>services.httpd.enable</option> must be a Boolean - (<literal>true</literal> or <literal>false</literal>). Trying to give it a - value of another type, such as a string, will cause an error: -<screen> -The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. -</screen> - </para> - - <para> - Options have various types of values. The most important are: - <variablelist> - <varlistentry> - <term> - Strings - </term> - <listitem> - <para> - Strings are enclosed in double quotes, e.g. -<programlisting> -<xref linkend="opt-networking.hostName"/> = "dexter"; -</programlisting> - Special characters can be escaped by prefixing them with a backslash - (e.g. <literal>\"</literal>). - </para> - <para> - Multi-line strings can be enclosed in <emphasis>double single - quotes</emphasis>, e.g. -<programlisting> -<xref linkend="opt-networking.extraHosts"/> = - '' - 127.0.0.2 other-localhost - 10.0.0.1 server - ''; -</programlisting> - The main difference is that it strips from each line a number of spaces - equal to the minimal indentation of the string as a whole (disregarding - the indentation of empty lines), and that characters like - <literal>"</literal> and <literal>\</literal> are not special (making it - more convenient for including things like shell code). See more info - about this in the Nix manual - <link - xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Booleans - </term> - <listitem> - <para> - These can be <literal>true</literal> or <literal>false</literal>, e.g. -<programlisting> -<xref linkend="opt-networking.firewall.enable"/> = true; -<xref linkend="opt-networking.firewall.allowPing"/> = false; -</programlisting> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Integers - </term> - <listitem> - <para> - For example, -<programlisting> -<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 60; -</programlisting> - (Note that here the attribute name - <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to - prevent it from being interpreted as a set named <literal>net</literal> - containing a set named <literal>ipv4</literal>, and so on. This is - because it’s not a NixOS option but the literal name of a Linux kernel - setting.) - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Sets - </term> - <listitem> - <para> - Sets were introduced above. They are name/value pairs enclosed in braces, - as in the option definition -<programlisting> -<xref linkend="opt-fileSystems"/>."/boot" = - { device = "/dev/sda1"; - fsType = "ext4"; - options = [ "rw" "data=ordered" "relatime" ]; - }; -</programlisting> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Lists - </term> - <listitem> - <para> - The important thing to note about lists is that list elements are - separated by whitespace, like this: -<programlisting> -<xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ]; -</programlisting> - List elements can be any other type, e.g. sets: -<programlisting> -swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; -</programlisting> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Packages - </term> - <listitem> - <para> - Usually, the packages you need are already part of the Nix Packages - collection, which is a set that can be accessed through the function - argument <varname>pkgs</varname>. Typical uses: -<programlisting> -<xref linkend="opt-environment.systemPackages"/> = - [ pkgs.thunderbird - pkgs.emacs - ]; - -<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_10; -</programlisting> - The latter option definition changes the default PostgreSQL package used - by NixOS’s PostgreSQL service to 10.x. For more information on - packages, including how to add new ones, see - <xref linkend="sec-custom-packages"/>. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/config-syntax.chapter.md b/nixpkgs/nixos/doc/manual/configuration/config-syntax.chapter.md new file mode 100644 index 000000000000..56d093c0f6e8 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/config-syntax.chapter.md @@ -0,0 +1,19 @@ +# Configuration Syntax {#sec-configuration-syntax} + +The NixOS configuration file `/etc/nixos/configuration.nix` is actually +a *Nix expression*, which is the Nix package manager's purely functional +language for describing how to build packages and configurations. This +means you have all the expressive power of that language at your +disposal, including the ability to abstract over common patterns, which +is very useful when managing complex systems. The syntax and semantics +of the Nix language are fully described in the [Nix +manual](https://nixos.org/nix/manual/#chap-writing-nix-expressions), but +here we give a short overview of the most important constructs useful in +NixOS configuration files. + +```{=docbook} +<xi:include href="config-file.section.xml" /> +<xi:include href="abstractions.section.xml" /> +<xi:include href="modularity.section.xml" /> +<xi:include href="summary.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml b/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml deleted file mode 100644 index a374c6a87074..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/config-syntax.xml +++ /dev/null @@ -1,25 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-configuration-syntax"> - <title>Configuration Syntax</title> - <para> - The NixOS configuration file - <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix - expression</emphasis>, which is the Nix package manager’s purely functional - language for describing how to build packages and configurations. This means - you have all the expressive power of that language at your disposal, - including the ability to abstract over common patterns, which is very useful - when managing complex systems. The syntax and semantics of the Nix language - are fully described in the - <link -xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix - manual</link>, but here we give a short overview of the most important - constructs useful in NixOS configuration files. - </para> - <xi:include href="config-file.xml" /> - <xi:include href="../from_md/configuration/abstractions.section.xml" /> - <xi:include href="modularity.xml" /> - <xi:include href="summary.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/configuration.xml b/nixpkgs/nixos/doc/manual/configuration/configuration.xml index 6949189b8883..b04316cfa48e 100644 --- a/nixpkgs/nixos/doc/manual/configuration/configuration.xml +++ b/nixpkgs/nixos/doc/manual/configuration/configuration.xml @@ -13,19 +13,19 @@ effect after you run <command>nixos-rebuild</command>. </para> </partintro> - <xi:include href="config-syntax.xml" /> - <xi:include href="package-mgmt.xml" /> - <xi:include href="user-mgmt.xml" /> - <xi:include href="file-systems.xml" /> - <xi:include href="x-windows.xml" /> - <xi:include href="wayland.xml" /> - <xi:include href="gpu-accel.xml" /> - <xi:include href="xfce.xml" /> - <xi:include href="networking.xml" /> - <xi:include href="linux-kernel.xml" /> - <xi:include href="subversion.xml" /> + <xi:include href="../from_md/configuration/config-syntax.chapter.xml" /> + <xi:include href="../from_md/configuration/package-mgmt.chapter.xml" /> + <xi:include href="../from_md/configuration/user-mgmt.chapter.xml" /> + <xi:include href="../from_md/configuration/file-systems.chapter.xml" /> + <xi:include href="../from_md/configuration/x-windows.chapter.xml" /> + <xi:include href="../from_md/configuration/wayland.chapter.xml" /> + <xi:include href="../from_md/configuration/gpu-accel.chapter.xml" /> + <xi:include href="../from_md/configuration/xfce.chapter.xml" /> + <xi:include href="../from_md/configuration/networking.chapter.xml" /> + <xi:include href="../from_md/configuration/linux-kernel.chapter.xml" /> + <xi:include href="../from_md/configuration/subversion.chapter.xml" /> <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" /> - <xi:include href="profiles.xml" /> - <xi:include href="kubernetes.xml" /> + <xi:include href="../from_md/configuration/profiles.chapter.xml" /> + <xi:include href="../from_md/configuration/kubernetes.chapter.xml" /> <!-- Apache; libvirtd virtualisation --> </part> diff --git a/nixpkgs/nixos/doc/manual/configuration/customizing-packages.section.md b/nixpkgs/nixos/doc/manual/configuration/customizing-packages.section.md new file mode 100644 index 000000000000..bceeeb2d7a16 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/customizing-packages.section.md @@ -0,0 +1,74 @@ +# Customising Packages {#sec-customising-packages} + +Some packages in Nixpkgs have options to enable or disable optional +functionality or change other aspects of the package. For instance, the +Firefox wrapper package (which provides Firefox with a set of plugins +such as the Adobe Flash player) has an option to enable the Google Talk +plugin. It can be set in `configuration.nix` as follows: +`nixpkgs.config.firefox.enableGoogleTalkPlugin = true;` + +::: {.warning} +Unfortunately, Nixpkgs currently lacks a way to query available +configuration options. +::: + +Apart from high-level options, it's possible to tweak a package in +almost arbitrary ways, such as changing or disabling dependencies of a +package. For instance, the Emacs package in Nixpkgs by default has a +dependency on GTK 2. If you want to build it against GTK 3, you can +specify that as follows: + +```nix +environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; +``` + +The function `override` performs the call to the Nix function that +produces Emacs, with the original arguments amended by the set of +arguments specified by you. So here the function argument `gtk` gets the +value `pkgs.gtk3`, causing Emacs to depend on GTK 3. (The parentheses +are necessary because in Nix, function application binds more weakly +than list construction, so without them, +[](#opt-environment.systemPackages) +would be a list with two elements.) + +Even greater customisation is possible using the function +`overrideAttrs`. While the `override` mechanism above overrides the +arguments of a package function, `overrideAttrs` allows changing the +*attributes* passed to `mkDerivation`. This permits changing any aspect +of the package, such as the source code. For instance, if you want to +override the source code of Emacs, you can say: + +```nix +environment.systemPackages = [ + (pkgs.emacs.overrideAttrs (oldAttrs: { + name = "emacs-25.0-pre"; + src = /path/to/my/emacs/tree; + })) +]; +``` + +Here, `overrideAttrs` takes the Nix derivation specified by `pkgs.emacs` +and produces a new derivation in which the original's `name` and `src` +attribute have been replaced by the given values by re-calling +`stdenv.mkDerivation`. The original attributes are accessible via the +function argument, which is conventionally named `oldAttrs`. + +The overrides shown above are not global. They do not affect the +original package; other packages in Nixpkgs continue to depend on the +original rather than the customised package. This means that if another +package in your system depends on the original package, you end up with +two instances of the package. If you want to have everything depend on +your customised instance, you can apply a *global* override as follows: + +```nix +nixpkgs.config.packageOverrides = pkgs: + { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; + }; +``` + +The effect of this definition is essentially equivalent to modifying the +`emacs` attribute in the Nixpkgs source tree. Any package in Nixpkgs +that depends on `emacs` will be passed your customised instance. +(However, the value `pkgs.emacs` in `nixpkgs.config.packageOverrides` +refers to the original rather than overridden instance, to prevent an +infinite recursion.) diff --git a/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml b/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml deleted file mode 100644 index 34e6ab4b24d6..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/customizing-packages.xml +++ /dev/null @@ -1,86 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-customising-packages"> - <title>Customising Packages</title> - - <para> - Some packages in Nixpkgs have options to enable or disable optional - functionality or change other aspects of the package. For instance, the - Firefox wrapper package (which provides Firefox with a set of plugins such as - the Adobe Flash player) has an option to enable the Google Talk plugin. It - can be set in <filename>configuration.nix</filename> as follows: <filename> - nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename> - </para> - - <warning> - <para> - Unfortunately, Nixpkgs currently lacks a way to query available - configuration options. - </para> - </warning> - - <para> - Apart from high-level options, it’s possible to tweak a package in almost - arbitrary ways, such as changing or disabling dependencies of a package. For - instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. - If you want to build it against GTK 3, you can specify that as follows: -<programlisting> -<xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; -</programlisting> - The function <varname>override</varname> performs the call to the Nix - function that produces Emacs, with the original arguments amended by the set - of arguments specified by you. So here the function argument - <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing - Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, - function application binds more weakly than list construction, so without - them, <xref linkend="opt-environment.systemPackages"/> would be a list with - two elements.) - </para> - - <para> - Even greater customisation is possible using the function - <varname>overrideAttrs</varname>. While the <varname>override</varname> - mechanism above overrides the arguments of a package function, - <varname>overrideAttrs</varname> allows changing the - <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>. - This permits changing any aspect of the package, such as the source code. For - instance, if you want to override the source code of Emacs, you can say: -<programlisting> -<xref linkend="opt-environment.systemPackages"/> = [ - (pkgs.emacs.overrideAttrs (oldAttrs: { - name = "emacs-25.0-pre"; - src = /path/to/my/emacs/tree; - })) -]; -</programlisting> - Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by - <varname>pkgs.emacs</varname> and produces a new derivation in which the - original’s <literal>name</literal> and <literal>src</literal> attribute - have been replaced by the given values by re-calling - <literal>stdenv.mkDerivation</literal>. The original attributes are - accessible via the function argument, which is conventionally named - <varname>oldAttrs</varname>. - </para> - - <para> - The overrides shown above are not global. They do not affect the original - package; other packages in Nixpkgs continue to depend on the original rather - than the customised package. This means that if another package in your - system depends on the original package, you end up with two instances of the - package. If you want to have everything depend on your customised instance, - you can apply a <emphasis>global</emphasis> override as follows: -<screen> -nixpkgs.config.packageOverrides = pkgs: - { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; - }; -</screen> - The effect of this definition is essentially equivalent to modifying the - <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in - Nixpkgs that depends on <literal>emacs</literal> will be passed your - customised instance. (However, the value <literal>pkgs.emacs</literal> in - <varname>nixpkgs.config.packageOverrides</varname> refers to the original - rather than overridden instance, to prevent an infinite recursion.) - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/declarative-packages.section.md b/nixpkgs/nixos/doc/manual/configuration/declarative-packages.section.md new file mode 100644 index 000000000000..337cdf8472e4 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/declarative-packages.section.md @@ -0,0 +1,46 @@ +# Declarative Package Management {#sec-declarative-package-mgmt} + +With declarative package management, you specify which packages you want +on your system by setting the option +[](#opt-environment.systemPackages). For instance, adding the +following line to `configuration.nix` enables the Mozilla Thunderbird +email application: + +```nix +environment.systemPackages = [ pkgs.thunderbird ]; +``` + +The effect of this specification is that the Thunderbird package from +Nixpkgs will be built or downloaded as part of the system when you run +`nixos-rebuild switch`. + +::: {.note} +Some packages require additional global configuration such as D-Bus or +systemd service registration so adding them to +[](#opt-environment.systemPackages) might not be sufficient. You are +advised to check the [list of options](#ch-options) whether a NixOS +module for the package does not exist. +::: + +You can get a list of the available packages as follows: + +```ShellSession +$ nix-env -qaP '*' --description +nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded +... +``` + +The first column in the output is the *attribute name*, such as +`nixos.thunderbird`. + +Note: the `nixos` prefix tells us that we want to get the package from +the `nixos` channel and works only in CLI tools. In declarative +configuration use `pkgs` prefix (variable). + +To "uninstall" a package, simply remove it from +[](#opt-environment.systemPackages) and run `nixos-rebuild switch`. + +```{=docbook} +<xi:include href="customizing-packages.section.xml" /> +<xi:include href="adding-custom-packages.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/declarative-packages.xml b/nixpkgs/nixos/doc/manual/configuration/declarative-packages.xml deleted file mode 100644 index cd84d1951d24..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/declarative-packages.xml +++ /dev/null @@ -1,54 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-declarative-package-mgmt"> - <title>Declarative Package Management</title> - - <para> - With declarative package management, you specify which packages you want on - your system by setting the option - <xref linkend="opt-environment.systemPackages"/>. For instance, adding the - following line to <filename>configuration.nix</filename> enables the Mozilla - Thunderbird email application: -<programlisting> -<xref linkend="opt-environment.systemPackages"/> = [ pkgs.thunderbird ]; -</programlisting> - The effect of this specification is that the Thunderbird package from Nixpkgs - will be built or downloaded as part of the system when you run - <command>nixos-rebuild switch</command>. - </para> - - <note> - <para> - Some packages require additional global configuration such as D-Bus or systemd service registration so adding them to <xref linkend="opt-environment.systemPackages"/> might not be sufficient. You are advised to check the <link xlink:href="#ch-options">list of options</link> whether a NixOS module for the package does not exist. - </para> - </note> - - <para> - You can get a list of the available packages as follows: -<screen> -<prompt>$ </prompt>nix-env -qaP '*' --description -nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded -<replaceable>...</replaceable> -</screen> - The first column in the output is the <emphasis>attribute name</emphasis>, - such as <literal>nixos.thunderbird</literal>. - </para> - <para> - Note: the <literal>nixos</literal> prefix tells us that we want to get the - package from the <literal>nixos</literal> channel and works only in CLI tools. - - In declarative configuration use <literal>pkgs</literal> prefix (variable). - </para> - - <para> - To “uninstall” a package, simply remove it from - <xref linkend="opt-environment.systemPackages"/> and run - <command>nixos-rebuild switch</command>. - </para> - - <xi:include href="customizing-packages.xml" /> - - <xi:include href="adding-custom-packages.xml" /> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/file-systems.chapter.md b/nixpkgs/nixos/doc/manual/configuration/file-systems.chapter.md new file mode 100644 index 000000000000..901e2e4f181b --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/file-systems.chapter.md @@ -0,0 +1,42 @@ +# File Systems {#ch-file-systems} + +You can define file systems using the `fileSystems` configuration +option. For instance, the following definition causes NixOS to mount the +Ext4 file system on device `/dev/disk/by-label/data` onto the mount +point `/data`: + +```nix +fileSystems."/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; +``` + +This will create an entry in `/etc/fstab`, which will generate a +corresponding [systemd.mount](https://www.freedesktop.org/software/systemd/man/systemd.mount.html) +unit via [systemd-fstab-generator](https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html). +The filesystem will be mounted automatically unless `"noauto"` is +present in [options](#opt-fileSystems._name_.options). `"noauto"` +filesystems can be mounted explicitly using `systemctl` e.g. +`systemctl start data.mount`. Mount points are created automatically if they don't +already exist. For `device`, it's best to use the topology-independent +device aliases in `/dev/disk/by-label` and `/dev/disk/by-uuid`, as these +don't change if the topology changes (e.g. if a disk is moved to another +IDE controller). + +You can usually omit the file system type (`fsType`), since `mount` can +usually detect the type and load the necessary kernel module +automatically. However, if the file system is needed at early boot (in +the initial ramdisk) and is not `ext2`, `ext3` or `ext4`, then it's best +to specify `fsType` to ensure that the kernel module is available. + +::: {.note} +System startup will fail if any of the filesystems fails to mount, +dropping you to the emergency shell. You can make a mount asynchronous +and non-critical by adding `options = [ "nofail" ];`. +::: + +```{=docbook} +<xi:include href="luks-file-systems.section.xml" /> +<xi:include href="sshfs-file-systems.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/file-systems.xml b/nixpkgs/nixos/doc/manual/configuration/file-systems.xml deleted file mode 100644 index 42c59844ff4a..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/file-systems.xml +++ /dev/null @@ -1,58 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-file-systems"> - <title>File Systems</title> - <para> - You can define file systems using the <option>fileSystems</option> - configuration option. For instance, the following definition causes NixOS to - mount the Ext4 file system on device - <filename>/dev/disk/by-label/data</filename> onto the mount point - <filename>/data</filename>: -<programlisting> -<xref linkend="opt-fileSystems"/>."/data" = - { device = "/dev/disk/by-label/data"; - fsType = "ext4"; - }; -</programlisting> - This will create an entry in <filename>/etc/fstab</filename>, which will - generate a corresponding - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.mount.html">systemd.mount</link> - unit via - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html">systemd-fstab-generator</link>. - The filesystem will be mounted automatically unless - <literal>"noauto"</literal> is present in <link - linkend="opt-fileSystems._name_.options">options</link>. - <literal>"noauto"</literal> filesystems can be mounted explicitly using - <command>systemctl</command> e.g. <command>systemctl start - data.mount</command>. - Mount points are created automatically if they don’t already exist. For - <option><link linkend="opt-fileSystems._name_.device">device</link></option>, - it’s best to use the topology-independent device aliases in - <filename>/dev/disk/by-label</filename> and - <filename>/dev/disk/by-uuid</filename>, as these don’t change if the - topology changes (e.g. if a disk is moved to another IDE controller). - </para> - <para> - You can usually omit the file system type - (<option><link linkend="opt-fileSystems._name_.fsType">fsType</link></option>), - since <command>mount</command> can usually detect the type and load the - necessary kernel module automatically. However, if the file system is needed - at early boot (in the initial ramdisk) and is not <literal>ext2</literal>, - <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to - specify <option>fsType</option> to ensure that the kernel module is - available. - </para> - <note> - <para> - System startup will fail if any of the filesystems fails to mount, dropping - you to the emergency shell. You can make a mount asynchronous and - non-critical by adding - <literal><link linkend="opt-fileSystems._name_.options">options</link> = [ - "nofail" ];</literal>. - </para> - </note> - <xi:include href="luks-file-systems.xml" /> - <xi:include href="../from_md/configuration/sshfs-file-systems.section.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/firewall.section.md b/nixpkgs/nixos/doc/manual/configuration/firewall.section.md new file mode 100644 index 000000000000..dbf0ffb9273e --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/firewall.section.md @@ -0,0 +1,32 @@ +# Firewall {#sec-firewall} + +NixOS has a simple stateful firewall that blocks incoming connections +and other unexpected packets. The firewall applies to both IPv4 and IPv6 +traffic. It is enabled by default. It can be disabled as follows: + +```nix +networking.firewall.enable = false; +``` + +If the firewall is enabled, you can open specific TCP ports to the +outside world: + +```nix +networking.firewall.allowedTCPPorts = [ 80 443 ]; +``` + +Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is +enabled (`services.openssh.enable = true`). UDP ports can be opened through +[](#opt-networking.firewall.allowedUDPPorts). + +To open ranges of TCP ports: + +```nix +networking.firewall.allowedTCPPortRanges = [ + { from = 4000; to = 4007; } + { from = 8000; to = 8010; } +]; +``` + +Similarly, UDP port ranges can be opened through +[](#opt-networking.firewall.allowedUDPPortRanges). diff --git a/nixpkgs/nixos/doc/manual/configuration/firewall.xml b/nixpkgs/nixos/doc/manual/configuration/firewall.xml deleted file mode 100644 index 47a19ac82c0f..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/firewall.xml +++ /dev/null @@ -1,37 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-firewall"> - <title>Firewall</title> - - <para> - NixOS has a simple stateful firewall that blocks incoming connections and - other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic. - It is enabled by default. It can be disabled as follows: -<programlisting> -<xref linkend="opt-networking.firewall.enable"/> = false; -</programlisting> - If the firewall is enabled, you can open specific TCP ports to the outside - world: -<programlisting> -<xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 443 ]; -</programlisting> - Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is - enabled (<option><xref linkend="opt-services.openssh.enable"/> = - true</option>). UDP ports can be opened through - <xref linkend="opt-networking.firewall.allowedUDPPorts"/>. - </para> - - <para> - To open ranges of TCP ports: -<programlisting> -<xref linkend="opt-networking.firewall.allowedTCPPortRanges"/> = [ - { from = 4000; to = 4007; } - { from = 8000; to = 8010; } -]; -</programlisting> - Similarly, UDP port ranges can be opened through - <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md new file mode 100644 index 000000000000..08b6af5d98ae --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -0,0 +1,204 @@ +# GPU acceleration {#sec-gpu-accel} + +NixOS provides various APIs that benefit from GPU hardware acceleration, +such as VA-API and VDPAU for video playback; OpenGL and Vulkan for 3D +graphics; and OpenCL for general-purpose computing. This chapter +describes how to set up GPU hardware acceleration (as far as this is not +done automatically) and how to verify that hardware acceleration is +indeed used. + +Most of the aforementioned APIs are agnostic with regards to which +display server is used. Consequently, these instructions should apply +both to the X Window System and Wayland compositors. + +## OpenCL {#sec-gpu-accel-opencl} + +[OpenCL](https://en.wikipedia.org/wiki/OpenCL) is a general compute API. +It is used by various applications such as Blender and Darktable to +accelerate certain operations. + +OpenCL applications load drivers through the *Installable Client Driver* +(ICD) mechanism. In this mechanism, an ICD file specifies the path to +the OpenCL driver for a particular GPU family. In NixOS, there are two +ways to make ICD files visible to the ICD loader. The first is through +the `OCL_ICD_VENDORS` environment variable. This variable can contain a +directory which is scanned by the ICL loader for ICD files. For example: + +```ShellSession +$ export \ + OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ +``` + +The second mechanism is to add the OpenCL driver package to +[](#opt-hardware.opengl.extraPackages). +This links the ICD file under `/run/opengl-driver`, where it will be visible +to the ICD loader. + +The proper installation of OpenCL drivers can be verified through the +`clinfo` command of the clinfo package. This command will report the +number of hardware devices that is found and give detailed information +for each device: + +```ShellSession +$ clinfo | head -n3 +Number of platforms 1 +Platform Name AMD Accelerated Parallel Processing +Platform Vendor Advanced Micro Devices, Inc. +``` + +### AMD {#sec-gpu-accel-opencl-amd} + +Modern AMD [Graphics Core +Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are +supported through the rocm-opencl-icd package. Adding this package to +[](#opt-hardware.opengl.extraPackages) +enables OpenCL support: + +```nix +hardware.opengl.extraPackages = [ + rocm-opencl-icd +]; +``` + +### Intel {#sec-gpu-accel-opencl-intel} + +[Intel Gen8 and later +GPUs](https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Gen8) +are supported by the Intel NEO OpenCL runtime that is provided by the +intel-compute-runtime package. For Gen7 GPUs, the deprecated Beignet +runtime can be used, which is provided by the beignet package. The +proprietary Intel OpenCL runtime, in the intel-ocl package, is an +alternative for Gen7 GPUs. + +The intel-compute-runtime, beignet, or intel-ocl package can be added to +[](#opt-hardware.opengl.extraPackages) +to enable OpenCL support. For example, for Gen8 and later GPUs, the following +configuration can be used: + +```nix +hardware.opengl.extraPackages = [ + intel-compute-runtime +]; +``` + +## Vulkan {#sec-gpu-accel-vulkan} + +[Vulkan](https://en.wikipedia.org/wiki/Vulkan_(API)) is a graphics and +compute API for GPUs. It is used directly by games or indirectly though +compatibility layers like +[DXVK](https://github.com/doitsujin/dxvk/wiki). + +By default, if [](#opt-hardware.opengl.driSupport) +is enabled, mesa is installed and provides Vulkan for supported hardware. + +Similar to OpenCL, Vulkan drivers are loaded through the *Installable +Client Driver* (ICD) mechanism. ICD files for Vulkan are JSON files that +specify the path to the driver library and the supported Vulkan version. +All successfully loaded drivers are exposed to the application as +different GPUs. In NixOS, there are two ways to make ICD files visible +to Vulkan applications: an environment variable and a module option. + +The first option is through the `VK_ICD_FILENAMES` environment variable. +This variable can contain multiple JSON files, separated by `:`. For +example: + +```ShellSession +$ export \ + VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json +``` + +The second mechanism is to add the Vulkan driver package to +[](#opt-hardware.opengl.extraPackages). +This links the ICD file under `/run/opengl-driver`, where it will be +visible to the ICD loader. + +The proper installation of Vulkan drivers can be verified through the +`vulkaninfo` command of the vulkan-tools package. This command will +report the hardware devices and drivers found, in this example output +amdvlk and radv: + +```ShellSession +$ vulkaninfo | grep GPU + GPU id : 0 (Unknown AMD GPU) + GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) + ... +GPU0: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU + deviceName = Unknown AMD GPU +GPU1: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU +``` + +A simple graphical application that uses Vulkan is `vkcube` from the +vulkan-tools package. + +### AMD {#sec-gpu-accel-vulkan-amd} + +Modern AMD [Graphics Core +Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are +supported through either radv, which is part of mesa, or the amdvlk +package. Adding the amdvlk package to +[](#opt-hardware.opengl.extraPackages) +makes amdvlk the default driver and hides radv and lavapipe from the device list. +A specific driver can be forced as follows: + +```nix +hardware.opengl.extraPackages = [ + pkgs.amdvlk +]; + +# To enable Vulkan support for 32-bit applications, also add: +hardware.opengl.extraPackages32 = [ + pkgs.driversi686Linux.amdvlk +]; + +# Force radv +environment.variables.AMD_VULKAN_ICD = "RADV"; +# Or +environment.variables.VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; +``` + +## Common issues {#sec-gpu-accel-common-issues} + +### User permissions {#sec-gpu-accel-common-issues-permissions} + +Except where noted explicitly, it should not be necessary to adjust user +permissions to use these acceleration APIs. In the default +configuration, GPU devices have world-read/write permissions +(`/dev/dri/renderD*`) or are tagged as `uaccess` (`/dev/dri/card*`). The +access control lists of devices with the `uaccess` tag will be updated +automatically when a user logs in through `systemd-logind`. For example, +if the user *jane* is logged in, the access control list should look as +follows: + +```ShellSession +$ getfacl /dev/dri/card0 +# file: dev/dri/card0 +# owner: root +# group: video +user::rw- +user:jane:rw- +group::rw- +mask::rw- +other::--- +``` + +If you disabled (this functionality of) `systemd-logind`, you may need +to add the user to the `video` group and log in again. + +### Mixing different versions of nixpkgs {#sec-gpu-accel-common-issues-mixing-nixpkgs} + +The *Installable Client Driver* (ICD) mechanism used by OpenCL and +Vulkan loads runtimes into its address space using `dlopen`. Mixing an +ICD loader mechanism and runtimes from different version of nixpkgs may +not work. For example, if the ICD loader uses an older version of glibc +than the runtime, the runtime may not be loadable due to missing +symbols. Unfortunately, the loader will generally be quiet about such +issues. + +If you suspect that you are running into library version mismatches +between an ICL loader and a runtime, you could run an application with +the `LD_DEBUG` variable set to get more diagnostic information. For +example, OpenCL can be tested with `LD_DEBUG=files clinfo`, which should +report missing symbols. diff --git a/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml b/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml deleted file mode 100644 index 9aa9be86a061..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml +++ /dev/null @@ -1,262 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-gpu-accel"> - <title>GPU acceleration</title> - - <para> - NixOS provides various APIs that benefit from GPU hardware - acceleration, such as VA-API and VDPAU for video playback; OpenGL and - Vulkan for 3D graphics; and OpenCL for general-purpose computing. - This chapter describes how to set up GPU hardware acceleration (as far - as this is not done automatically) and how to verify that hardware - acceleration is indeed used. - </para> - - <para> - Most of the aforementioned APIs are agnostic with regards to which - display server is used. Consequently, these instructions should apply - both to the X Window System and Wayland compositors. - </para> - - <section xml:id="sec-gpu-accel-opencl"> - <title>OpenCL</title> - - <para> - <link xlink:href="https://en.wikipedia.org/wiki/OpenCL">OpenCL</link> is a - general compute API. It is used by various applications such as - Blender and Darktable to accelerate certain operations. - </para> - - <para> - OpenCL applications load drivers through the <emphasis>Installable Client - Driver</emphasis> (ICD) mechanism. In this mechanism, an ICD file - specifies the path to the OpenCL driver for a particular GPU family. - In NixOS, there are two ways to make ICD files visible to the ICD - loader. The first is through the <varname>OCL_ICD_VENDORS</varname> - environment variable. This variable can contain a directory which - is scanned by the ICL loader for ICD files. For example: - - <screen><prompt>$</prompt> export \ - OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/</screen> - </para> - - <para> - The second mechanism is to add the OpenCL driver package to - <xref linkend="opt-hardware.opengl.extraPackages"/>. This links the - ICD file under <filename>/run/opengl-driver</filename>, where it will - be visible to the ICD loader. - </para> - - <para> - The proper installation of OpenCL drivers can be verified through - the <command>clinfo</command> command of the <package>clinfo</package> - package. This command will report the number of hardware devices - that is found and give detailed information for each device: - </para> - - <screen><prompt>$</prompt> clinfo | head -n3 -Number of platforms 1 -Platform Name AMD Accelerated Parallel Processing -Platform Vendor Advanced Micro Devices, Inc.</screen> - - <section xml:id="sec-gpu-accel-opencl-amd"> - <title>AMD</title> - - <para> - Modern AMD <link - xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics - Core Next</link> (GCN) GPUs are supported through the - <package>rocm-opencl-icd</package> package. Adding this package to - <xref linkend="opt-hardware.opengl.extraPackages"/> enables OpenCL - support: - - <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [ - rocm-opencl-icd - ];</programlisting> - </para> - </section> - - <section xml:id="sec-gpu-accel-opencl-intel"> - <title>Intel</title> - - <para> - <link - xlink:href="https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Gen8">Intel - Gen8 and later GPUs</link> are supported by the Intel NEO OpenCL - runtime that is provided by the - <package>intel-compute-runtime</package> package. For Gen7 GPUs, - the deprecated Beignet runtime can be used, which is provided - by the <package>beignet</package> package. The proprietary Intel - OpenCL runtime, in the <package>intel-ocl</package> package, is - an alternative for Gen7 GPUs. - </para> - - <para> - The <package>intel-compute-runtime</package>, <package>beignet</package>, - or <package>intel-ocl</package> package can be added to - <xref linkend="opt-hardware.opengl.extraPackages"/> to enable OpenCL - support. For example, for Gen8 and later GPUs, the following - configuration can be used: - - <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [ - intel-compute-runtime - ];</programlisting> - - </para> - </section> - </section> - - <section xml:id="sec-gpu-accel-vulkan"> - <title>Vulkan</title> - - <para> - <link xlink:href="https://en.wikipedia.org/wiki/Vulkan_(API)">Vulkan</link> is a - graphics and compute API for GPUs. It is used directly by games or indirectly though - compatibility layers like <link xlink:href="https://github.com/doitsujin/dxvk/wiki">DXVK</link>. - </para> - - <para> - By default, if <xref linkend="opt-hardware.opengl.driSupport"/> is enabled, - <package>mesa</package> is installed and provides Vulkan for supported hardware. - </para> - - <para> - Similar to OpenCL, Vulkan drivers are loaded through the <emphasis>Installable Client - Driver</emphasis> (ICD) mechanism. ICD files for Vulkan are JSON files that specify - the path to the driver library and the supported Vulkan version. All successfully - loaded drivers are exposed to the application as different GPUs. - In NixOS, there are two ways to make ICD files visible to Vulkan applications: an - environment variable and a module option. - </para> - - <para> - The first option is through the <varname>VK_ICD_FILENAMES</varname> - environment variable. This variable can contain multiple JSON files, separated by - <literal>:</literal>. For example: - - <screen><prompt>$</prompt> export \ - VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json</screen> - </para> - - <para> - The second mechanism is to add the Vulkan driver package to - <xref linkend="opt-hardware.opengl.extraPackages"/>. This links the - ICD file under <filename>/run/opengl-driver</filename>, where it will - be visible to the ICD loader. - </para> - - <para> - The proper installation of Vulkan drivers can be verified through - the <command>vulkaninfo</command> command of the <package>vulkan-tools</package> - package. This command will report the hardware devices and drivers found, - in this example output amdvlk and radv: - </para> - - <screen><prompt>$</prompt> vulkaninfo | grep GPU - GPU id : 0 (Unknown AMD GPU) - GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) - ... -GPU0: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU - deviceName = Unknown AMD GPU -GPU1: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU</screen> - - <para> - A simple graphical application that uses Vulkan is <command>vkcube</command> - from the <package>vulkan-tools</package> package. - </para> - - <section xml:id="sec-gpu-accel-vulkan-amd"> - <title>AMD</title> - - <para> - Modern AMD <link - xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics - Core Next</link> (GCN) GPUs are supported through either radv, which is - part of <package>mesa</package>, or the <package>amdvlk</package> package. - Adding the <package>amdvlk</package> package to - <xref linkend="opt-hardware.opengl.extraPackages"/> makes amdvlk the - default driver and hides radv and lavapipe from the device list. A - specific driver can be forced as follows: - - <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [ - pkgs.<package>amdvlk</package> - ]; - - # To enable Vulkan support for 32-bit applications, also add: - <xref linkend="opt-hardware.opengl.extraPackages32"/> = [ - pkgs.driversi686Linux.<package>amdvlk</package> - ]; - - # Force radv - <xref linkend="opt-environment.variables"/>.AMD_VULKAN_ICD = "RADV"; - # Or - <xref linkend="opt-environment.variables"/>.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; - </programlisting> - </para> - </section> - </section> - - <section xml:id="sec-gpu-accel-common-issues"> - <title>Common issues</title> - - <section xml:id="sec-gpu-accel-common-issues-permissions"> - <title>User permissions</title> - - <para> - Except where noted explicitly, it should not be necessary to - adjust user permissions to use these acceleration APIs. In the default - configuration, GPU devices have world-read/write permissions - (<filename>/dev/dri/renderD*</filename>) or are tagged as - <code>uaccess</code> (<filename>/dev/dri/card*</filename>). The - access control lists of devices with the <varname>uaccess</varname> - tag will be updated automatically when a user logs in through - <command>systemd-logind</command>. For example, if the user - <emphasis>jane</emphasis> is logged in, the access control list - should look as follows: - - <screen><prompt>$</prompt> getfacl /dev/dri/card0 -# file: dev/dri/card0 -# owner: root -# group: video -user::rw- -user:jane:rw- -group::rw- -mask::rw- -other::---</screen> - - If you disabled (this functionality of) <command>systemd-logind</command>, - you may need to add the user to the <code>video</code> group and - log in again. - </para> - </section> - - <section xml:id="sec-gpu-accel-common-issues-mixing-nixpkgs"> - <title>Mixing different versions of nixpkgs</title> - - <para> - The <emphasis>Installable Client Driver</emphasis> (ICD) - mechanism used by OpenCL and Vulkan loads runtimes into its address - space using <code>dlopen</code>. Mixing an ICD loader mechanism and - runtimes from different version of nixpkgs may not work. For example, - if the ICD loader uses an older version of <package>glibc</package> - than the runtime, the runtime may not be loadable due to - missing symbols. Unfortunately, the loader will generally be quiet - about such issues. - </para> - - <para> - If you suspect that you are running into library version mismatches - between an ICL loader and a runtime, you could run an application with - the <code>LD_DEBUG</code> variable set to get more diagnostic - information. For example, OpenCL can be tested with - <code>LD_DEBUG=files clinfo</code>, which should report missing - symbols. - </para> - </section> - </section> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/ipv4-config.section.md b/nixpkgs/nixos/doc/manual/configuration/ipv4-config.section.md new file mode 100644 index 000000000000..c73024b856d7 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/ipv4-config.section.md @@ -0,0 +1,35 @@ +# IPv4 Configuration {#sec-ipv4} + +By default, NixOS uses DHCP (specifically, `dhcpcd`) to automatically +configure network interfaces. However, you can configure an interface +manually as follows: + +```nix +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; +``` + +Typically you'll also want to set a default gateway and set of name +servers: + +```nix +networking.defaultGateway = "192.168.1.1"; +networking.nameservers = [ "8.8.8.8" ]; +``` + +::: {.note} +Statically configured interfaces are set up by the systemd service +`interface-name-cfg.service`. The default gateway and name server +configuration is performed by `network-setup.service`. +::: + +The host name is set using [](#opt-networking.hostName): + +```nix +networking.hostName = "cartman"; +``` + +The default host name is `nixos`. Set it to the empty string (`""`) to +allow the DHCP server to provide the host name. diff --git a/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml b/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml deleted file mode 100644 index 884becf0979a..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml +++ /dev/null @@ -1,43 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-ipv4"> - <title>IPv4 Configuration</title> - - <para> - By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to - automatically configure network interfaces. However, you can configure an - interface manually as follows: -<programlisting> -<link linkend="opt-networking.interfaces._name_.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ { - address = "192.168.1.2"; - prefixLength = 24; -} ]; -</programlisting> - Typically you’ll also want to set a default gateway and set of name - servers: -<programlisting> -<xref linkend="opt-networking.defaultGateway"/> = "192.168.1.1"; -<xref linkend="opt-networking.nameservers"/> = [ "8.8.8.8" ]; -</programlisting> - </para> - - <note> - <para> - Statically configured interfaces are set up by the systemd service - <replaceable>interface-name</replaceable><literal>-cfg.service</literal>. - The default gateway and name server configuration is performed by - <literal>network-setup.service</literal>. - </para> - </note> - - <para> - The host name is set using <xref linkend="opt-networking.hostName"/>: -<programlisting> -<xref linkend="opt-networking.hostName"/> = "cartman"; -</programlisting> - The default host name is <literal>nixos</literal>. Set it to the empty string - (<literal>""</literal>) to allow the DHCP server to provide the host name. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/ipv6-config.section.md b/nixpkgs/nixos/doc/manual/configuration/ipv6-config.section.md new file mode 100644 index 000000000000..ce66f53ed472 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/ipv6-config.section.md @@ -0,0 +1,42 @@ +# IPv6 Configuration {#sec-ipv6} + +IPv6 is enabled by default. Stateless address autoconfiguration is used +to automatically assign IPv6 addresses to all interfaces, and Privacy +Extensions (RFC 4946) are enabled by default. You can adjust the default +for this by setting [](#opt-networking.tempAddresses). This option +may be overridden on a per-interface basis by +[](#opt-networking.interfaces._name_.tempAddress). You can disable +IPv6 support globally by setting: + +```nix +networking.enableIPv6 = false; +``` + +You can disable IPv6 on a single interface using a normal sysctl (in +this example, we use interface `eth0`): + +```nix +boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +``` + +As with IPv4 networking interfaces are automatically configured via +DHCPv6. You can configure an interface manually: + +```nix +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; +``` + +For configuring a gateway, optionally with explicitly specified +interface: + +```nix +networking.defaultGateway6 = { + address = "fe00::1"; + interface = "enp0s3"; +}; +``` + +See [](#sec-ipv4) for similar examples and additional information. diff --git a/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml b/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml deleted file mode 100644 index 45e85dbf3dfd..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml +++ /dev/null @@ -1,54 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-ipv6"> - <title>IPv6 Configuration</title> - - <para> - IPv6 is enabled by default. Stateless address autoconfiguration is used to - automatically assign IPv6 addresses to all interfaces, and Privacy - Extensions (RFC 4946) are enabled by default. You can adjust the default - for this by setting <xref linkend="opt-networking.tempAddresses"/>. - This option may be overridden on a per-interface basis by - <xref linkend="opt-networking.interfaces._name_.tempAddress"/>. - You can disable IPv6 support globally by setting: -<programlisting> -<xref linkend="opt-networking.enableIPv6"/> = false; -</programlisting> - </para> - - <para> - You can disable IPv6 on a single interface using a normal sysctl (in this - example, we use interface <varname>eth0</varname>): -<programlisting> -<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv6.conf.eth0.disable_ipv6" = true; -</programlisting> - </para> - - <para> - As with IPv4 networking interfaces are automatically configured via DHCPv6. - You can configure an interface manually: -<programlisting> -<link linkend="opt-networking.interfaces._name_.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ { - address = "fe00:aa:bb:cc::2"; - prefixLength = 64; -} ]; -</programlisting> - </para> - - <para> - For configuring a gateway, optionally with explicitly specified interface: -<programlisting> -<xref linkend="opt-networking.defaultGateway6"/> = { - address = "fe00::1"; - interface = "enp0s3"; -}; -</programlisting> - </para> - - <para> - See <xref linkend='sec-ipv4' /> for similar examples and additional - information. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/kubernetes.chapter.md b/nixpkgs/nixos/doc/manual/configuration/kubernetes.chapter.md new file mode 100644 index 000000000000..93787577be9b --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/kubernetes.chapter.md @@ -0,0 +1,104 @@ +# Kubernetes {#sec-kubernetes} + +The NixOS Kubernetes module is a collective term for a handful of +individual submodules implementing the Kubernetes cluster components. + +There are generally two ways of enabling Kubernetes on NixOS. One way is +to enable and configure cluster components appropriately by hand: + +```nix +services.kubernetes = { + apiserver.enable = true; + controllerManager.enable = true; + scheduler.enable = true; + addonManager.enable = true; + proxy.enable = true; + flannel.enable = true; +}; +``` + +Another way is to assign cluster roles (\"master\" and/or \"node\") to +the host. This enables apiserver, controllerManager, scheduler, +addonManager, kube-proxy and etcd: + +```nix +services.kubernetes.roles = [ "master" ]; +``` + +While this will enable the kubelet and kube-proxy only: + +```nix +services.kubernetes.roles = [ "node" ]; +``` + +Assigning both the master and node roles is usable if you want a single +node Kubernetes cluster for dev or testing purposes: + +```nix +services.kubernetes.roles = [ "master" "node" ]; +``` + +Note: Assigning either role will also default both +[](#opt-services.kubernetes.flannel.enable) +and [](#opt-services.kubernetes.easyCerts) +to true. This sets up flannel as CNI and activates automatic PKI bootstrapping. + +As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled +ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP +ports have been disabled by default. While opening insecure ports is +still possible, it is recommended not to bind these to other interfaces +than loopback. To re-enable the insecure port on the apiserver, see options: +[](#opt-services.kubernetes.apiserver.insecurePort) and +[](#opt-services.kubernetes.apiserver.insecureBindAddress) + +::: {.note} +As of NixOS 19.03, it is mandatory to configure: +[](#opt-services.kubernetes.masterAddress). +The masterAddress must be resolveable and routeable by all cluster nodes. +In single node clusters, this can be set to `localhost`. +::: + +Role-based access control (RBAC) authorization mode is enabled by +default. This means that anonymous requests to the apiserver secure port +will expectedly cause a permission denied error. All cluster components +must therefore be configured with x509 certificates for two-way tls +communication. The x509 certificate subject section determines the roles +and permissions granted by the apiserver to perform clusterwide or +namespaced operations. See also: [ Using RBAC +Authorization](https://kubernetes.io/docs/reference/access-authn-authz/rbac/). + +The NixOS kubernetes module provides an option for automatic certificate +bootstrapping and configuration, +[](#opt-services.kubernetes.easyCerts). +The PKI bootstrapping process involves setting up a certificate authority (CA) +daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert +for the cluster, and uses the CA-cert for signing subordinate certs issued +to each of the cluster components. Subsequently, the certmgr daemon monitors +active certificates and renews them when needed. For single node Kubernetes +clusters, setting [](#opt-services.kubernetes.easyCerts) += true is sufficient and no further action is required. For joining extra node +machines to an existing cluster on the other hand, establishing initial +trust is mandatory. + +To add new nodes to the cluster: On any (non-master) cluster node where +[](#opt-services.kubernetes.easyCerts) +is enabled, the helper script `nixos-kubernetes-node-join` is available on PATH. +Given a token on stdin, it will copy the token to the kubernetes secrets directory +and restart the certmgr service. As requested certificates are issued, the +script will restart kubernetes cluster components as needed for them to +pick up new keypairs. + +::: {.note} +Multi-master (HA) clusters are not supported by the easyCerts module. +::: + +In order to interact with an RBAC-enabled cluster as an administrator, +one needs to have cluster-admin privileges. By default, when easyCerts +is enabled, a cluster-admin kubeconfig file is generated and linked into +`/etc/kubernetes/cluster-admin.kubeconfig` as determined by +[](#opt-services.kubernetes.pki.etcClusterAdminKubeconfig). +`export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig` will make +kubectl use this kubeconfig to access and authenticate the cluster. The +cluster-admin kubeconfig references an auto-generated keypair owned by +root. Thus, only root on the kubernetes master may obtain cluster-admin +rights by means of this file. diff --git a/nixpkgs/nixos/doc/manual/configuration/kubernetes.xml b/nixpkgs/nixos/doc/manual/configuration/kubernetes.xml deleted file mode 100644 index 54a100e44795..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/kubernetes.xml +++ /dev/null @@ -1,112 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-kubernetes"> - <title>Kubernetes</title> - <para> - The NixOS Kubernetes module is a collective term for a handful of individual - submodules implementing the Kubernetes cluster components. - </para> - <para> - There are generally two ways of enabling Kubernetes on NixOS. One way is to - enable and configure cluster components appropriately by hand: -<programlisting> -services.kubernetes = { - apiserver.enable = true; - controllerManager.enable = true; - scheduler.enable = true; - addonManager.enable = true; - proxy.enable = true; - flannel.enable = true; -}; -</programlisting> - Another way is to assign cluster roles ("master" and/or "node") to the host. - This enables apiserver, controllerManager, scheduler, addonManager, - kube-proxy and etcd: -<programlisting> -<xref linkend="opt-services.kubernetes.roles"/> = [ "master" ]; -</programlisting> - While this will enable the kubelet and kube-proxy only: -<programlisting> -<xref linkend="opt-services.kubernetes.roles"/> = [ "node" ]; -</programlisting> - Assigning both the master and node roles is usable if you want a single node - Kubernetes cluster for dev or testing purposes: -<programlisting> -<xref linkend="opt-services.kubernetes.roles"/> = [ "master" "node" ]; -</programlisting> - Note: Assigning either role will also default both - <xref linkend="opt-services.kubernetes.flannel.enable"/> and - <xref linkend="opt-services.kubernetes.easyCerts"/> to true. This sets up - flannel as CNI and activates automatic PKI bootstrapping. - </para> - <para> - As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports - on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have - been disabled by default. While opening insecure ports is still possible, it - is recommended not to bind these to other interfaces than loopback. To - re-enable the insecure port on the apiserver, see options: - <xref linkend="opt-services.kubernetes.apiserver.insecurePort"/> and - <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress"/> - </para> - <note> - <para> - As of NixOS 19.03, it is mandatory to configure: - <xref linkend="opt-services.kubernetes.masterAddress"/>. The masterAddress - must be resolveable and routeable by all cluster nodes. In single node - clusters, this can be set to <literal>localhost</literal>. - </para> - </note> - <para> - Role-based access control (RBAC) authorization mode is enabled by default. - This means that anonymous requests to the apiserver secure port will - expectedly cause a permission denied error. All cluster components must - therefore be configured with x509 certificates for two-way tls communication. - The x509 certificate subject section determines the roles and permissions - granted by the apiserver to perform clusterwide or namespaced operations. See - also: - <link - xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/"> - Using RBAC Authorization</link>. - </para> - <para> - The NixOS kubernetes module provides an option for automatic certificate - bootstrapping and configuration, - <xref linkend="opt-services.kubernetes.easyCerts"/>. The PKI bootstrapping - process involves setting up a certificate authority (CA) daemon (cfssl) on - the kubernetes master node. cfssl generates a CA-cert for the cluster, and - uses the CA-cert for signing subordinate certs issued to each of the cluster - components. Subsequently, the certmgr daemon monitors active certificates and - renews them when needed. For single node Kubernetes clusters, setting - <xref linkend="opt-services.kubernetes.easyCerts"/> = true is sufficient and - no further action is required. For joining extra node machines to an existing - cluster on the other hand, establishing initial trust is mandatory. - </para> - <para> - To add new nodes to the cluster: On any (non-master) cluster node where - <xref linkend="opt-services.kubernetes.easyCerts"/> is enabled, the helper - script <literal>nixos-kubernetes-node-join</literal> is available on PATH. - Given a token on stdin, it will copy the token to the kubernetes secrets - directory and restart the certmgr service. As requested certificates are - issued, the script will restart kubernetes cluster components as needed for - them to pick up new keypairs. - </para> - <note> - <para> - Multi-master (HA) clusters are not supported by the easyCerts module. - </para> - </note> - <para> - In order to interact with an RBAC-enabled cluster as an administrator, one - needs to have cluster-admin privileges. By default, when easyCerts is - enabled, a cluster-admin kubeconfig file is generated and linked into - <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as determined by - <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig"/>. - <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal> - will make kubectl use this kubeconfig to access and authenticate the cluster. - The cluster-admin kubeconfig references an auto-generated keypair owned by - root. Thus, only root on the kubernetes master may obtain cluster-admin - rights by means of this file. - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixpkgs/nixos/doc/manual/configuration/linux-kernel.chapter.md new file mode 100644 index 000000000000..aad6d49c72c3 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -0,0 +1,135 @@ +# Linux Kernel {#sec-kernel-config} + +You can override the Linux kernel and associated packages using the +option `boot.kernelPackages`. For instance, this selects the Linux 3.10 +kernel: + +```nix +boot.kernelPackages = pkgs.linuxPackages_3_10; +``` + +Note that this not only replaces the kernel, but also packages that are +specific to the kernel version, such as the NVIDIA video drivers. This +ensures that driver packages are consistent with the kernel. + +The default Linux kernel configuration should be fine for most users. +You can see the configuration of your current kernel with the following +command: + +```ShellSession +zcat /proc/config.gz +``` + +If you want to change the kernel configuration, you can use the +`packageOverrides` feature (see [](#sec-customising-packages)). For +instance, to enable support for the kernel debugger KGDB: + +```nix +nixpkgs.config.packageOverrides = pkgs: + { linux_3_4 = pkgs.linux_3_4.override { + extraConfig = + '' + KGDB y + ''; + }; + }; +``` + +`extraConfig` takes a list of Linux kernel configuration options, one +per line. The name of the option should not include the prefix +`CONFIG_`. The option value is typically `y`, `n` or `m` (to build +something as a kernel module). + +Kernel modules for hardware devices are generally loaded automatically +by `udev`. You can force a module to be loaded via +[](#opt-boot.kernelModules), e.g. + +```nix +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; +``` + +If the module is required early during the boot (e.g. to mount the root +file system), you can use [](#opt-boot.initrd.kernelModules): + +```nix +boot.initrd.kernelModules = [ "cifs" ]; +``` + +This causes the specified modules and their dependencies to be added to +the initial ramdisk. + +Kernel runtime parameters can be set through +[](#opt-boot.kernel.sysctl), e.g. + +```nix +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; +``` + +sets the kernel's TCP keepalive time to 120 seconds. To see the +available parameters, run `sysctl -a`. + +## Customize your kernel {#sec-linux-config-customizing} + +The first step before compiling the kernel is to generate an appropriate +`.config` configuration. Either you pass your own config via the +`configfile` setting of `linuxManualConfig`: + +```nix +custom-kernel = super.linuxManualConfig { + inherit (super) stdenv hostPlatform; + inherit (linux_4_9) src; + version = "${linux_4_9.version}-custom"; + + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; +}; +``` + +You can edit the config with this snippet (by default `make + menuconfig` won\'t work out of the box on nixos): + +```ShellSession +nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' +``` + +or you can let nixpkgs generate the configuration. Nixpkgs generates it +via answering the interactive kernel utility `make config`. The answers +depend on parameters passed to +`pkgs/os-specific/linux/kernel/generic.nix` (which you can influence by +overriding `extraConfig, autoModules, + modDirVersion, preferBuiltin, extraConfig`). + +```nix +mptcp93.override ({ + name="mptcp-local"; + + ignoreConfigErrors = true; + autoModules = false; + kernelPreferBuiltin = true; + + enableParallelBuilding = true; + + extraConfig = '' + DEBUG_KERNEL y + FRAME_POINTER y + KGDB y + KGDB_SERIAL_CONSOLE y + DEBUG_INFO y + ''; +}); +``` + +## Developing kernel modules {#sec-linux-config-developing-modules} + +When developing kernel modules it\'s often convenient to run +edit-compile-run loop as quickly as possible. See below snippet as an +example of developing `mellanox` drivers. + +```ShellSession +$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev +$ nix-shell '<nixpkgs>' -A linuxPackages.kernel +$ unpackPhase +$ cd linux-* +$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules +# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml b/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml deleted file mode 100644 index 529ac1b1cd46..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml +++ /dev/null @@ -1,138 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-kernel-config"> - <title>Linux Kernel</title> - <para> - You can override the Linux kernel and associated packages using the option - <option>boot.kernelPackages</option>. For instance, this selects the Linux - 3.10 kernel: -<programlisting> -<xref linkend="opt-boot.kernelPackages"/> = pkgs.linuxPackages_3_10; -</programlisting> - Note that this not only replaces the kernel, but also packages that are - specific to the kernel version, such as the NVIDIA video drivers. This - ensures that driver packages are consistent with the kernel. - </para> - <para> - The default Linux kernel configuration should be fine for most users. You can - see the configuration of your current kernel with the following command: -<programlisting> -zcat /proc/config.gz -</programlisting> - If you want to change the kernel configuration, you can use the - <option>packageOverrides</option> feature (see - <xref -linkend="sec-customising-packages" />). For instance, to enable support - for the kernel debugger KGDB: -<programlisting> -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; - }; -</programlisting> - <varname>extraConfig</varname> takes a list of Linux kernel configuration - options, one per line. The name of the option should not include the prefix - <literal>CONFIG_</literal>. The option value is typically - <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build - something as a kernel module). - </para> - <para> - Kernel modules for hardware devices are generally loaded automatically by - <command>udev</command>. You can force a module to be loaded via - <xref linkend="opt-boot.kernelModules"/>, e.g. -<programlisting> -<xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ]; -</programlisting> - If the module is required early during the boot (e.g. to mount the root file - system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>: -<programlisting> -<xref linkend="opt-boot.initrd.kernelModules"/> = [ "cifs" ]; -</programlisting> - This causes the specified modules and their dependencies to be added to the - initial ramdisk. - </para> - <para> - Kernel runtime parameters can be set through - <xref linkend="opt-boot.kernel.sysctl"/>, e.g. -<programlisting> -<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 120; -</programlisting> - sets the kernel’s TCP keepalive time to 120 seconds. To see the available - parameters, run <command>sysctl -a</command>. - </para> - <section xml:id="sec-linux-config-customizing"> - <title>Customize your kernel</title> - - <para> - The first step before compiling the kernel is to generate an appropriate - <literal>.config</literal> configuration. Either you pass your own config - via the <literal>configfile</literal> setting of - <literal>linuxManualConfig</literal>: -<screen><![CDATA[ - custom-kernel = super.linuxManualConfig { - inherit (super) stdenv hostPlatform; - inherit (linux_4_9) src; - version = "${linux_4_9.version}-custom"; - - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; - }; - ]]></screen> - You can edit the config with this snippet (by default <command>make - menuconfig</command> won't work out of the box on nixos): -<screen><![CDATA[ - nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' - ]]></screen> - or you can let nixpkgs generate the configuration. Nixpkgs generates it via - answering the interactive kernel utility <command>make config</command>. The - answers depend on parameters passed to - <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you - can influence by overriding <literal>extraConfig, autoModules, - modDirVersion, preferBuiltin, extraConfig</literal>). -<screen><![CDATA[ - - mptcp93.override ({ - name="mptcp-local"; - - ignoreConfigErrors = true; - autoModules = false; - kernelPreferBuiltin = true; - - enableParallelBuilding = true; - - extraConfig = '' - DEBUG_KERNEL y - FRAME_POINTER y - KGDB y - KGDB_SERIAL_CONSOLE y - DEBUG_INFO y - ''; - }); - ]]></screen> - </para> - </section> - <section xml:id="sec-linux-config-developing-modules"> - <title>Developing kernel modules</title> - - <para> - When developing kernel modules it's often convenient to run edit-compile-run - loop as quickly as possible. See below snippet as an example of developing - <literal>mellanox</literal> drivers. - </para> - -<screen> -<prompt>$ </prompt>nix-build '<nixpkgs>' -A linuxPackages.kernel.dev -<prompt>$ </prompt>nix-shell '<nixpkgs>' -A linuxPackages.kernel -<prompt>$ </prompt>unpackPhase -<prompt>$ </prompt>cd linux-* -<prompt>$ </prompt>make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules -<prompt># </prompt>insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko -</screen> - </section> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.section.md b/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.section.md new file mode 100644 index 000000000000..b5d0407d1659 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.section.md @@ -0,0 +1,77 @@ +# LUKS-Encrypted File Systems {#sec-luks-file-systems} + +NixOS supports file systems that are encrypted using *LUKS* (Linux +Unified Key Setup). For example, here is how you create an encrypted +Ext4 file system on the device +`/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d`: + +```ShellSession +# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d + +WARNING! +======== +This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. + +Are you sure? (Type uppercase yes): YES +Enter LUKS passphrase: *** +Verify passphrase: *** + +# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted +Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** + +# mkfs.ext4 /dev/mapper/crypted +``` + +The LUKS volume should be automatically picked up by +`nixos-generate-config`, but you might want to verify that your +`hardware-configuration.nix` looks correct. To manually ensure that the +system is automatically mounted at boot time as `/`, add the following +to `configuration.nix`: + +```nix +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +fileSystems."/".device = "/dev/mapper/crypted"; +``` + +Should grub be used as bootloader, and `/boot` is located on an +encrypted partition, it is necessary to add the following grub option: + +```nix +boot.loader.grub.enableCryptodisk = true; +``` + +## FIDO2 {#sec-luks-file-systems-fido2} + +NixOS also supports unlocking your LUKS-Encrypted file system using a +FIDO2 compatible token. In the following example, we will create a new +FIDO2 credential and add it as a new key to our existing device +`/dev/sda2`: + +```ShellSession +# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" +# fido2luks credential "$FIDO2_LABEL" +f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 + +# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 +Password: +Password (again): +Old password: +Old password (again): +Added to key to device /dev/sda2, slot: 2 +``` + +To ensure that this file system is decrypted using the FIDO2 compatible +key, add the following to `configuration.nix`: + +```nix +boot.initrd.luks.fido2Support = true; +boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; +``` + +You can also use the FIDO2 passwordless setup, but for security reasons, +you might want to enable it only when your device is PIN protected, such +as [Trezor](https://trezor.io/). + +```nix +boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml b/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml deleted file mode 100644 index d8654d71ac00..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml +++ /dev/null @@ -1,78 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-luks-file-systems"> - <title>LUKS-Encrypted File Systems</title> - - <para> - NixOS supports file systems that are encrypted using - <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how - you create an encrypted Ext4 file system on the device - <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>: -<screen> -<prompt># </prompt>cryptsetup luksFormat <replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable> - -WARNING! -======== -This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. - -Are you sure? (Type uppercase yes): YES -Enter LUKS passphrase: *** -Verify passphrase: *** - -<prompt># </prompt>cryptsetup luksOpen <replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable> <replaceable>crypted</replaceable> -Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** - -<prompt># </prompt>mkfs.ext4 /dev/mapper/<replaceable>crypted</replaceable> -</screen> - The LUKS volume should be automatically picked up by - <command>nixos-generate-config</command>, but you might want to verify that your - <filename>hardware-configuration.nix</filename> looks correct. - - To manually ensure that the system is automatically mounted at boot time as - <filename>/</filename>, add the following to - <filename>configuration.nix</filename>: -<programlisting> -<link linkend="opt-boot.initrd.luks.devices._name_.device">boot.initrd.luks.devices.crypted.device</link> = "<replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable>"; -<xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/<replaceable>crypted</replaceable>"; -</programlisting> - Should grub be used as bootloader, and <filename>/boot</filename> is located - on an encrypted partition, it is necessary to add the following grub option: -<programlisting><xref linkend="opt-boot.loader.grub.enableCryptodisk"/> = true;</programlisting> - </para> - <section xml:id="sec-luks-file-systems-fido2"> - <title>FIDO2</title> - - <para> - NixOS also supports unlocking your LUKS-Encrypted file system using a FIDO2 compatible token. In the following example, we will create a new FIDO2 credential - and add it as a new key to our existing device <filename>/dev/sda2</filename>: - - <screen> -<prompt># </prompt>export FIDO2_LABEL="<replaceable>/dev/sda2</replaceable> @ $HOSTNAME" -<prompt># </prompt>fido2luks credential "$FIDO2_LABEL" -f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 - -<prompt># </prompt>fido2luks -i add-key <replaceable>/dev/sda2</replaceable> <replaceable>f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7</replaceable> -Password: -Password (again): -Old password: -Old password (again): -Added to key to device /dev/sda2, slot: 2 -</screen> - - To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to <filename>configuration.nix</filename>: -<programlisting> -<link linkend="opt-boot.initrd.luks.fido2Support">boot.initrd.luks.fido2Support</link> = true; -<link linkend="opt-boot.initrd.luks.devices._name_.fido2.credential">boot.initrd.luks.devices."<replaceable>/dev/sda2</replaceable>".fido2.credential</link> = "<replaceable>f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7</replaceable>"; -</programlisting> - - You can also use the FIDO2 passwordless setup, but for security reasons, you might want to enable it only when your device is PIN protected, such as <link xlink:href="https://trezor.io/">Trezor</link>. - -<programlisting> -<link linkend="opt-boot.initrd.luks.devices._name_.fido2.passwordLess">boot.initrd.luks.devices."<replaceable>/dev/sda2</replaceable>".fido2.passwordLess</link> = true; -</programlisting> - </para> - </section> - -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/modularity.section.md b/nixpkgs/nixos/doc/manual/configuration/modularity.section.md new file mode 100644 index 000000000000..3395ace20c4f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/modularity.section.md @@ -0,0 +1,133 @@ +# Modularity {#sec-modularity} + +The NixOS configuration mechanism is modular. If your +`configuration.nix` becomes too big, you can split it into multiple +files. Likewise, if you have multiple NixOS configurations (e.g. for +different computers) with some commonality, you can move the common +configuration into a shared file. + +Modules have exactly the same syntax as `configuration.nix`. In fact, +`configuration.nix` is itself a module. You can use other modules by +including them from `configuration.nix`, e.g.: + +```nix +{ config, pkgs, ... }: + +{ imports = [ ./vpn.nix ./kde.nix ]; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.emacs ]; + ... +} +``` + +Here, we include two modules from the same directory, `vpn.nix` and +`kde.nix`. The latter might look like this: + +```nix +{ config, pkgs, ... }: + +{ services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + environment.systemPackages = [ pkgs.vim ]; +} +``` + +Note that both `configuration.nix` and `kde.nix` define the option +[](#opt-environment.systemPackages). When multiple modules define an +option, NixOS will try to *merge* the definitions. In the case of +[](#opt-environment.systemPackages), that's easy: the lists of +packages can simply be concatenated. The value in `configuration.nix` is +merged last, so for list-type options, it will appear at the end of the +merged list. If you want it to appear first, you can use `mkBefore`: + +```nix +boot.kernelModules = mkBefore [ "kvm-intel" ]; +``` + +This causes the `kvm-intel` kernel module to be loaded before any other +kernel modules. + +For other types of options, a merge may not be possible. For instance, +if two modules define [](#opt-services.httpd.adminAddr), +`nixos-rebuild` will give an error: + +```plain +The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. +``` + +When that happens, it's possible to force one definition take precedence +over the others: + +```nix +services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; +``` + +When using multiple modules, you may need to access configuration values +defined in other modules. This is what the `config` function argument is +for: it contains the complete, merged system configuration. That is, +`config` is the result of combining the configurations returned by every +module [^1] . For example, here is a module that adds some packages to +[](#opt-environment.systemPackages) only if +[](#opt-services.xserver.enable) is set to `true` somewhere else: + +```nix +{ config, pkgs, ... }: + +{ environment.systemPackages = + if config.services.xserver.enable then + [ pkgs.firefox + pkgs.thunderbird + ] + else + [ ]; +} +``` + +With multiple modules, it may not be obvious what the final value of a +configuration option is. The command `nixos-option` allows you to find +out: + +```ShellSession +$ nixos-option services.xserver.enable +true + +$ nixos-option boot.kernelModules +[ "tun" "ipv6" "loop" ... ] +``` + +Interactive exploration of the configuration is possible using `nix + repl`, a read-eval-print loop for Nix expressions. A typical use: + +```ShellSession +$ nix repl '<nixpkgs/nixos>' + +nix-repl> config.networking.hostName +"mandark" + +nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +[ "example.org" "example.gov" ] +``` + +While abstracting your configuration, you may find it useful to generate +modules using code, instead of writing files. The example below would +have the same effect as importing a file which sets those options. + +```nix +{ config, pkgs, ... }: + +let netConfig = hostName: { + networking.hostName = hostName; + networking.useDHCP = false; +}; + +in + +{ imports = [ (netConfig "nixos.localdomain") ]; } +``` + +[^1]: If you're wondering how it's possible that the (indirect) *result* + of a function is passed as an *input* to that same function: that's + because Nix is a "lazy" language --- it only computes values when + they are needed. This works as long as no individual configuration + value depends on itself. diff --git a/nixpkgs/nixos/doc/manual/configuration/modularity.xml b/nixpkgs/nixos/doc/manual/configuration/modularity.xml deleted file mode 100644 index d6eee4e9d76e..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/modularity.xml +++ /dev/null @@ -1,146 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-modularity"> - <title>Modularity</title> - - <para> - The NixOS configuration mechanism is modular. If your - <filename>configuration.nix</filename> becomes too big, you can split it into - multiple files. Likewise, if you have multiple NixOS configurations (e.g. for - different computers) with some commonality, you can move the common - configuration into a shared file. - </para> - - <para> - Modules have exactly the same syntax as - <filename>configuration.nix</filename>. In fact, - <filename>configuration.nix</filename> is itself a module. You can use other - modules by including them from <filename>configuration.nix</filename>, e.g.: -<programlisting> -{ config, pkgs, ... }: - -{ imports = [ ./vpn.nix ./kde.nix ]; - <xref linkend="opt-services.httpd.enable"/> = true; - <xref linkend="opt-environment.systemPackages"/> = [ pkgs.emacs ]; - <replaceable>...</replaceable> -} -</programlisting> - Here, we include two modules from the same directory, - <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter - might look like this: -<programlisting> -{ config, pkgs, ... }: - -{ <xref linkend="opt-services.xserver.enable"/> = true; - <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true; - <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true; - <xref linkend="opt-environment.systemPackages"/> = [ pkgs.vim ]; -} -</programlisting> - Note that both <filename>configuration.nix</filename> and - <filename>kde.nix</filename> define the option - <xref linkend="opt-environment.systemPackages"/>. When multiple modules - define an option, NixOS will try to <emphasis>merge</emphasis> the - definitions. In the case of <xref linkend="opt-environment.systemPackages"/>, - that’s easy: the lists of packages can simply be concatenated. The value in - <filename>configuration.nix</filename> is merged last, so for list-type - options, it will appear at the end of the merged list. If you want it to - appear first, you can use <varname>mkBefore</varname>: -<programlisting> -<xref linkend="opt-boot.kernelModules"/> = mkBefore [ "kvm-intel" ]; -</programlisting> - This causes the <literal>kvm-intel</literal> kernel module to be loaded - before any other kernel modules. - </para> - - <para> - For other types of options, a merge may not be possible. For instance, if two - modules define <xref linkend="opt-services.httpd.adminAddr"/>, - <command>nixos-rebuild</command> will give an error: -<screen> -The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. -</screen> - When that happens, it’s possible to force one definition take precedence - over the others: -<programlisting> -<xref linkend="opt-services.httpd.adminAddr"/> = pkgs.lib.mkForce "bob@example.org"; -</programlisting> - </para> - - <para> - When using multiple modules, you may need to access configuration values - defined in other modules. This is what the <varname>config</varname> function - argument is for: it contains the complete, merged system configuration. That - is, <varname>config</varname> is the result of combining the configurations - returned by every module - <footnote xml:id="footnote-nix-is-lazy"> - <para> - If you’re wondering how it’s possible that the (indirect) - <emphasis>result</emphasis> of a function is passed as an - <emphasis>input</emphasis> to that same function: that’s because Nix is a - “lazy” language — it only computes values when they are needed. This - works as long as no individual configuration value depends on itself. - </para> - </footnote> - . For example, here is a module that adds some packages to - <xref linkend="opt-environment.systemPackages"/> only if - <xref linkend="opt-services.xserver.enable"/> is set to - <literal>true</literal> somewhere else: -<programlisting> -{ config, pkgs, ... }: - -{ <xref linkend="opt-environment.systemPackages"/> = - if config.<xref linkend="opt-services.xserver.enable"/> then - [ pkgs.firefox - pkgs.thunderbird - ] - else - [ ]; -} -</programlisting> - </para> - - <para> - With multiple modules, it may not be obvious what the final value of a - configuration option is. The command <option>nixos-option</option> allows you - to find out: -<screen> -<prompt>$ </prompt>nixos-option <xref linkend="opt-services.xserver.enable"/> -true - -<prompt>$ </prompt>nixos-option <xref linkend="opt-boot.kernelModules"/> -[ "tun" "ipv6" "loop" <replaceable>...</replaceable> ] -</screen> - Interactive exploration of the configuration is possible using <command>nix - repl</command>, a read-eval-print loop for Nix expressions. A typical use: -<screen> -<prompt>$ </prompt>nix repl '<nixpkgs/nixos>' - -<prompt>nix-repl> </prompt>config.<xref linkend="opt-networking.hostName"/> -"mandark" - -<prompt>nix-repl> </prompt>map (x: x.hostName) config.<xref linkend="opt-services.httpd.virtualHosts"/> -[ "example.org" "example.gov" ] -</screen> - </para> - - <para> - While abstracting your configuration, you may find it useful to generate - modules using code, instead of writing files. The example below would have - the same effect as importing a file which sets those options. -<programlisting> -{ config, pkgs, ... }: - -let netConfig = hostName: { - networking.hostName = hostName; - networking.useDHCP = false; -}; - -in - -{ imports = [ (netConfig "nixos.localdomain") ]; } -</programlisting> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/network-manager.section.md b/nixpkgs/nixos/doc/manual/configuration/network-manager.section.md new file mode 100644 index 000000000000..4bda21d34a10 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/network-manager.section.md @@ -0,0 +1,42 @@ +# NetworkManager {#sec-networkmanager} + +To facilitate network configuration, some desktop environments use +NetworkManager. You can enable NetworkManager by setting: + +```nix +networking.networkmanager.enable = true; +``` + +some desktop managers (e.g., GNOME) enable NetworkManager automatically +for you. + +All users that should have permission to change network settings must +belong to the `networkmanager` group: + +```nix +users.users.alice.extraGroups = [ "networkmanager" ]; +``` + +NetworkManager is controlled using either `nmcli` or `nmtui` +(curses-based terminal user interface). See their manual pages for +details on their usage. Some desktop environments (GNOME, KDE) have +their own configuration tools for NetworkManager. On XFCE, there is no +configuration tool for NetworkManager by default: by enabling +[](#opt-programs.nm-applet.enable), the graphical applet will be +installed and will launch automatically when the graphical session is +started. + +::: {.note} +`networking.networkmanager` and `networking.wireless` (WPA Supplicant) +can be used together if desired. To do this you need to instruct +NetworkManager to ignore those interfaces like: + +```nix +networking.networkmanager.unmanaged = [ + "*" "except:type:wwan" "except:type:gsm" +]; +``` + +Refer to the option description for the exact syntax and references to +external documentation. +::: diff --git a/nixpkgs/nixos/doc/manual/configuration/network-manager.xml b/nixpkgs/nixos/doc/manual/configuration/network-manager.xml deleted file mode 100644 index 94d229fd803f..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/network-manager.xml +++ /dev/null @@ -1,48 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-networkmanager"> - <title>NetworkManager</title> - - <para> - To facilitate network configuration, some desktop environments use - NetworkManager. You can enable NetworkManager by setting: -<programlisting> -<xref linkend="opt-networking.networkmanager.enable"/> = true; -</programlisting> - some desktop managers (e.g., GNOME) enable NetworkManager automatically for - you. - </para> - - <para> - All users that should have permission to change network settings must belong - to the <code>networkmanager</code> group: -<programlisting> -<link linkend="opt-users.users._name_.extraGroups">users.users.alice.extraGroups</link> = [ "networkmanager" ]; -</programlisting> - </para> - - <para> - NetworkManager is controlled using either <command>nmcli</command> or - <command>nmtui</command> (curses-based terminal user interface). See their - manual pages for details on their usage. Some desktop environments (GNOME, - KDE) have their own configuration tools for NetworkManager. On XFCE, there is - no configuration tool for NetworkManager by default: by enabling <xref linkend="opt-programs.nm-applet.enable"/>, the - graphical applet will be installed and will launch automatically when the graphical session is started. - </para> - - <note> - <para> - <code>networking.networkmanager</code> and <code>networking.wireless</code> - (WPA Supplicant) can be used together if desired. To do this you need to instruct - NetworkManager to ignore those interfaces like: -<programlisting> -<xref linkend="opt-networking.networkmanager.unmanaged"/> = [ - "*" "except:type:wwan" "except:type:gsm" -]; -</programlisting> - Refer to the option description for the exact syntax and references to external documentation. - </para> - </note> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/networking.chapter.md b/nixpkgs/nixos/doc/manual/configuration/networking.chapter.md new file mode 100644 index 000000000000..529dc0610bda --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/networking.chapter.md @@ -0,0 +1,16 @@ +# Networking {#sec-networking} + +This section describes how to configure networking components +on your NixOS machine. + +```{=docbook} +<xi:include href="network-manager.section.xml" /> +<xi:include href="ssh.section.xml" /> +<xi:include href="ipv4-config.section.xml" /> +<xi:include href="ipv6-config.section.xml" /> +<xi:include href="firewall.section.xml" /> +<xi:include href="wireless.section.xml" /> +<xi:include href="ad-hoc-network-config.section.xml" /> +<xi:include href="renaming-interfaces.section.xml" /> +``` +<!-- TODO: OpenVPN, NAT --> diff --git a/nixpkgs/nixos/doc/manual/configuration/networking.xml b/nixpkgs/nixos/doc/manual/configuration/networking.xml deleted file mode 100644 index 8369e9c9c852..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/networking.xml +++ /dev/null @@ -1,20 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-networking"> - <title>Networking</title> - <para> - This section describes how to configure networking components on your NixOS - machine. - </para> - <xi:include href="network-manager.xml" /> - <xi:include href="ssh.xml" /> - <xi:include href="ipv4-config.xml" /> - <xi:include href="ipv6-config.xml" /> - <xi:include href="firewall.xml" /> - <xi:include href="wireless.xml" /> - <xi:include href="ad-hoc-network-config.xml" /> - <xi:include href="renaming-interfaces.xml" /> -<!-- TODO: OpenVPN, NAT --> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/package-mgmt.chapter.md b/nixpkgs/nixos/doc/manual/configuration/package-mgmt.chapter.md new file mode 100644 index 000000000000..a6c414be59a9 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/package-mgmt.chapter.md @@ -0,0 +1,18 @@ +# Package Management {#sec-package-management} + +This section describes how to add additional packages to your system. +NixOS has two distinct styles of package management: + +- *Declarative*, where you declare what packages you want in your + `configuration.nix`. Every time you run `nixos-rebuild`, NixOS will + ensure that you get a consistent set of binaries corresponding to + your specification. + +- *Ad hoc*, where you install, upgrade and uninstall packages via the + `nix-env` command. This style allows mixing packages from different + Nixpkgs versions. It's the only choice for non-root users. + +```{=docbook} +<xi:include href="declarative-packages.section.xml" /> +<xi:include href="ad-hoc-packages.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/package-mgmt.xml b/nixpkgs/nixos/doc/manual/configuration/package-mgmt.xml deleted file mode 100644 index e8ac5d0681a9..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/package-mgmt.xml +++ /dev/null @@ -1,31 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-package-management"> - <title>Package Management</title> - <para> - This section describes how to add additional packages to your system. NixOS - has two distinct styles of package management: - <itemizedlist> - <listitem> - <para> - <emphasis>Declarative</emphasis>, where you declare what packages you want - in your <filename>configuration.nix</filename>. Every time you run - <command>nixos-rebuild</command>, NixOS will ensure that you get a - consistent set of binaries corresponding to your specification. - </para> - </listitem> - <listitem> - <para> - <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall - packages via the <command>nix-env</command> command. This style allows - mixing packages from different Nixpkgs versions. It’s the only choice - for non-root users. - </para> - </listitem> - </itemizedlist> - </para> - <xi:include href="declarative-packages.xml" /> - <xi:include href="ad-hoc-packages.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles.chapter.md b/nixpkgs/nixos/doc/manual/configuration/profiles.chapter.md new file mode 100644 index 000000000000..b4ae1b7d3faa --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles.chapter.md @@ -0,0 +1,34 @@ +# Profiles {#ch-profiles} + +In some cases, it may be desirable to take advantage of commonly-used, +predefined configurations provided by nixpkgs, but different from those +that come as default. This is a role fulfilled by NixOS\'s Profiles, +which come as files living in `<nixpkgs/nixos/modules/profiles>`. That +is to say, expected usage is to add them to the imports list of your +`/etc/configuration.nix` as such: + +```nix +imports = [ + <nixpkgs/nixos/modules/profiles/profile-name.nix> +]; +``` + +Even if some of these profiles seem only useful in the context of +install media, many are actually intended to be used in real installs. + +What follows is a brief explanation on the purpose and use-case for each +profile. Detailing each option configured by each one is out of scope. + +```{=docbook} +<xi:include href="profiles/all-hardware.section.xml" /> +<xi:include href="profiles/base.section.xml" /> +<xi:include href="profiles/clone-config.section.xml" /> +<xi:include href="profiles/demo.section.xml" /> +<xi:include href="profiles/docker-container.section.xml" /> +<xi:include href="profiles/graphical.section.xml" /> +<xi:include href="profiles/hardened.section.xml" /> +<xi:include href="profiles/headless.section.xml" /> +<xi:include href="profiles/installation-device.section.xml" /> +<xi:include href="profiles/minimal.section.xml" /> +<xi:include href="profiles/qemu-guest.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles.xml b/nixpkgs/nixos/doc/manual/configuration/profiles.xml deleted file mode 100644 index 9d08f7f7bed2..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles.xml +++ /dev/null @@ -1,39 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-profiles"> - <title>Profiles</title> - <para> - In some cases, it may be desirable to take advantage of commonly-used, - predefined configurations provided by nixpkgs, but different from those that - come as default. This is a role fulfilled by NixOS's Profiles, which come as - files living in <filename><nixpkgs/nixos/modules/profiles></filename>. - That is to say, expected usage is to add them to the imports list of your - <filename>/etc/configuration.nix</filename> as such: - </para> -<programlisting> - imports = [ - <nixpkgs/nixos/modules/profiles/profile-name.nix> - ]; -</programlisting> - <para> - Even if some of these profiles seem only useful in the context of install - media, many are actually intended to be used in real installs. - </para> - <para> - What follows is a brief explanation on the purpose and use-case for each - profile. Detailing each option configured by each one is out of scope. - </para> - <xi:include href="profiles/all-hardware.xml" /> - <xi:include href="profiles/base.xml" /> - <xi:include href="profiles/clone-config.xml" /> - <xi:include href="profiles/demo.xml" /> - <xi:include href="profiles/docker-container.xml" /> - <xi:include href="profiles/graphical.xml" /> - <xi:include href="profiles/hardened.xml" /> - <xi:include href="profiles/headless.xml" /> - <xi:include href="profiles/installation-device.xml" /> - <xi:include href="profiles/minimal.xml" /> - <xi:include href="profiles/qemu-guest.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.section.md new file mode 100644 index 000000000000..e2dd7c76089c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.section.md @@ -0,0 +1,11 @@ +# All Hardware {#sec-profile-all-hardware} + +Enables all hardware supported by NixOS: i.e., all firmware is included, and +all devices from which one may boot are enabled in the initrd. Its primary +use is in the NixOS installation CDs. + +The enabled kernel modules include support for SATA and PATA, SCSI +(partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and +Hyper-V. Additionally, [](#opt-hardware.enableAllFirmware) is +enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically +installed. diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.xml deleted file mode 100644 index 2936f71069d5..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/all-hardware.xml +++ /dev/null @@ -1,21 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-all-hardware"> - <title>All Hardware</title> - - <para> - Enables all hardware supported by NixOS: i.e., all firmware is included, and - all devices from which one may boot are enabled in the initrd. Its primary - use is in the NixOS installation CDs. - </para> - - <para> - The enabled kernel modules include support for SATA and PATA, SCSI - (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and - Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is - enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically - installed. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/base.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/base.section.md new file mode 100644 index 000000000000..59b3068fda32 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/base.section.md @@ -0,0 +1,7 @@ +# Base {#sec-profile-base} + +Defines the software packages included in the "minimal" installation CD. It +installs several utilities useful in a simple recovery or install media, such +as a text-mode web browser, and tools for manipulating block devices, +networking, hardware diagnostics, and filesystems (with their respective +kernel modules). diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/base.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/base.xml deleted file mode 100644 index b75f6ba25b4f..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/base.xml +++ /dev/null @@ -1,15 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-base"> - <title>Base</title> - - <para> - Defines the software packages included in the "minimal" installation CD. It - installs several utilities useful in a simple recovery or install media, such - as a text-mode web browser, and tools for manipulating block devices, - networking, hardware diagnostics, and filesystems (with their respective - kernel modules). - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.section.md new file mode 100644 index 000000000000..e2583715e517 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.section.md @@ -0,0 +1,11 @@ +# Clone Config {#sec-profile-clone-config} + +This profile is used in installer images. It provides an editable +configuration.nix that imports all the modules that were also used when +creating the image in the first place. As a result it allows users to edit +and rebuild the live-system. + +On images where the installation media also becomes an installation target, +copying over `configuration.nix` should be disabled by +setting `installer.cloneConfig` to `false`. +For example, this is done in `sd-image-aarch64-installer.nix`. diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml deleted file mode 100644 index 9c70cf352041..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml +++ /dev/null @@ -1,21 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-clone-config"> - <title>Clone Config</title> - - <para> - This profile is used in installer images. It provides an editable - configuration.nix that imports all the modules that were also used when - creating the image in the first place. As a result it allows users to edit - and rebuild the live-system. - </para> - - <para> - On images where the installation media also becomes an installation target, - copying over <literal>configuration.nix</literal> should be disabled by - setting <literal>installer.cloneConfig</literal> to <literal>false</literal>. - For example, this is done in <literal>sd-image-aarch64-installer.nix</literal>. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/demo.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/demo.section.md new file mode 100644 index 000000000000..0a0df483c123 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/demo.section.md @@ -0,0 +1,4 @@ +# Demo {#sec-profile-demo} + +This profile just enables a `demo` user, with password `demo`, uid `1000`, `wheel` group and +[autologin in the SDDM display manager](#opt-services.xserver.displayManager.autoLogin). diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml deleted file mode 100644 index bc801bb3dc5b..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/demo.xml +++ /dev/null @@ -1,14 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-demo"> - <title>Demo</title> - - <para> - This profile just enables a <systemitem class="username">demo</systemitem> - user, with password <literal>demo</literal>, uid <literal>1000</literal>, - <systemitem class="groupname">wheel</systemitem> group and - <link linkend="opt-services.xserver.displayManager.autoLogin">autologin in the SDDM display manager</link>. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.section.md new file mode 100644 index 000000000000..f3e29b92f5e6 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.section.md @@ -0,0 +1,7 @@ +# Docker Container {#sec-profile-docker-container} + +This is the profile from which the Docker images are generated. It prepares a +working system by importing the [Minimal](#sec-profile-minimal) and +[Clone Config](#sec-profile-clone-config) profiles, and +setting appropriate configuration options that are useful inside a container +context, like [](#opt-boot.isContainer). diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.xml deleted file mode 100644 index efa7b8f24c43..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/docker-container.xml +++ /dev/null @@ -1,16 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-docker-container"> - <title>Docker Container</title> - - <para> - This is the profile from which the Docker images are generated. It prepares a - working system by importing the - <link linkend="sec-profile-minimal">Minimal</link> and - <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and - setting appropriate configuration options that are useful inside a container - context, like <xref linkend="opt-boot.isContainer"/>. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.section.md new file mode 100644 index 000000000000..aaea5c8c0288 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.section.md @@ -0,0 +1,10 @@ +# Graphical {#sec-profile-graphical} + +Defines a NixOS configuration with the Plasma 5 desktop. It's used by the +graphical installation CD. + +It sets [](#opt-services.xserver.enable), +[](#opt-services.xserver.displayManager.sddm.enable), +[](#opt-services.xserver.desktopManager.plasma5.enable), +and [](#opt-services.xserver.libinput.enable) to true. It also +includes glxinfo and firefox in the system packages list. diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.xml deleted file mode 100644 index cc6d0825d241..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/graphical.xml +++ /dev/null @@ -1,20 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-graphical"> - <title>Graphical</title> - - <para> - Defines a NixOS configuration with the Plasma 5 desktop. It's used by the - graphical installation CD. - </para> - - <para> - It sets <xref linkend="opt-services.xserver.enable"/>, - <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>, - <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/>, and - <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also - includes glxinfo and firefox in the system packages list. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.section.md new file mode 100644 index 000000000000..9fb5e18c384a --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.section.md @@ -0,0 +1,20 @@ +# Hardened {#sec-profile-hardened} + +A profile with most (vanilla) hardening options enabled by default, +potentially at the cost of stability, features and performance. + +This includes a hardened kernel, and limiting the system information +available to processes through the `/sys` and +`/proc` filesystems. It also disables the User Namespaces +feature of the kernel, which stops Nix from being able to build anything +(this particular setting can be overriden via +[](#opt-security.allowUserNamespaces)). See the +[profile source](https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix) +for further detail on which settings are altered. + +::: {.warning} +This profile enables options that are known to affect system +stability. If you experience any stability issues when using the +profile, try disabling it. If you report an issue and use this +profile, always mention that you do. +::: diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.xml deleted file mode 100644 index 4a51754cc7ae..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/hardened.xml +++ /dev/null @@ -1,32 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-hardened"> - <title>Hardened</title> - - <para> - A profile with most (vanilla) hardening options enabled by default, - potentially at the cost of stability, features and performance. - </para> - - <para> - This includes a hardened kernel, and limiting the system information - available to processes through the <filename>/sys</filename> and - <filename>/proc</filename> filesystems. It also disables the User Namespaces - feature of the kernel, which stops Nix from being able to build anything - (this particular setting can be overriden via - <xref linkend="opt-security.allowUserNamespaces"/>). See the - <literal - xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix"> - profile source</literal> for further detail on which settings are altered. - </para> - <warning> - <para> - This profile enables options that are known to affect system - stability. If you experience any stability issues when using the - profile, try disabling it. If you report an issue and use this - profile, always mention that you do. - </para> - </warning> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/headless.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/headless.section.md new file mode 100644 index 000000000000..d185a9a774b7 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/headless.section.md @@ -0,0 +1,9 @@ +# Headless {#sec-profile-headless} + +Common configuration for headless machines (e.g., Amazon EC2 instances). + +Disables [sound](#opt-sound.enable), +[vesa](#opt-boot.vesa), serial consoles, +[emergency mode](#opt-systemd.enableEmergencyMode), +[grub splash images](#opt-boot.loader.grub.splashImage) +and configures the kernel to reboot automatically on panic. diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/headless.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/headless.xml deleted file mode 100644 index 1b64497ebf7f..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/headless.xml +++ /dev/null @@ -1,19 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-headless"> - <title>Headless</title> - - <para> - Common configuration for headless machines (e.g., Amazon EC2 instances). - </para> - - <para> - Disables <link linkend="opt-sound.enable">sound</link>, - <link linkend="opt-boot.vesa">vesa</link>, serial consoles, - <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>, - <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link> - and configures the kernel to reboot automatically on panic. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.section.md new file mode 100644 index 000000000000..ae9f8fa7757f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.section.md @@ -0,0 +1,24 @@ +# Installation Device {#sec-profile-installation-device} + +Provides a basic configuration for installation devices like CDs. +This enables redistributable firmware, includes the +[Clone Config profile](#sec-profile-clone-config) +and a copy of the Nixpkgs channel, so `nixos-install` +works out of the box. + +Documentation for [Nixpkgs](#opt-documentation.enable) +and [NixOS](#opt-documentation.nixos.enable) are +forcefully enabled (to override the +[Minimal profile](#sec-profile-minimal) preference); the +NixOS manual is shown automatically on TTY 8, udisks is disabled. +Autologin is enabled as `nixos` user, while passwordless +login as both `root` and `nixos` is possible. +Passwordless `sudo` is enabled too. +[wpa_supplicant](#opt-networking.wireless.enable) is +enabled, but configured to not autostart. + +It is explained how to login, start the ssh server, and if available, +how to start the display manager. + +Several settings are tweaked so that the installer has a better chance of +succeeding under low-memory environments. diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.xml deleted file mode 100644 index 192ae955b689..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/installation-device.xml +++ /dev/null @@ -1,36 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-installation-device"> - <title>Installation Device</title> - - <para> - Provides a basic configuration for installation devices like CDs. - This enables redistributable firmware, includes the - <link linkend="sec-profile-clone-config">Clone Config profile</link> - and a copy of the Nixpkgs channel, so <command>nixos-install</command> - works out of the box. - </para> - <para> - Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link> - and <link linkend="opt-documentation.nixos.enable">NixOS</link> are - forcefully enabled (to override the - <link linkend="sec-profile-minimal">Minimal profile</link> preference); the - NixOS manual is shown automatically on TTY 8, udisks is disabled. - Autologin is enabled as <literal>nixos</literal> user, while passwordless - login as both <literal>root</literal> and <literal>nixos</literal> is possible. - Passwordless <command>sudo</command> is enabled too. - <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is - enabled, but configured to not autostart. - </para> - <para> - It is explained how to login, start the ssh server, and if available, - how to start the display manager. - </para> - - <para> - Several settings are tweaked so that the installer has a better chance of - succeeding under low-memory environments. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.section.md new file mode 100644 index 000000000000..02a3b65ae422 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.section.md @@ -0,0 +1,9 @@ +# Minimal {#sec-profile-minimal} + +This profile defines a small NixOS configuration. It does not contain any +graphical stuff. It's a very short file that enables +[noXlibs](#opt-environment.noXlibs), sets +[](#opt-i18n.supportedLocales) to +only support the user-selected locale, +[disables packages' documentation](#opt-documentation.enable), +and [disables sound](#opt-sound.enable). diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.xml deleted file mode 100644 index 179f2d0be64b..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/minimal.xml +++ /dev/null @@ -1,17 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-minimal"> - <title>Minimal</title> - - <para> - This profile defines a small NixOS configuration. It does not contain any - graphical stuff. It's a very short file that enables - <link linkend="opt-environment.noXlibs">noXlibs</link>, sets - <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link> to - only support the user-selected locale, - <link linkend="opt-documentation.enable">disables packages' documentation - </link>, and <link linkend="opt-sound.enable">disables sound</link>. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.section.md b/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.section.md new file mode 100644 index 000000000000..d7e3cae9cb0f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.section.md @@ -0,0 +1,7 @@ +# QEMU Guest {#sec-profile-qemu-guest} + +This profile contains common configuration for virtual machines running under +QEMU (using virtio). + +It makes virtio modules available on the initrd and sets the system time from +the hardware clock to work around a bug in qemu-kvm. diff --git a/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml deleted file mode 100644 index 3ed97b94b510..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/profiles/qemu-guest.xml +++ /dev/null @@ -1,17 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-profile-qemu-guest"> - <title>QEMU Guest</title> - - <para> - This profile contains common configuration for virtual machines running under - QEMU (using virtio). - </para> - - <para> - It makes virtio modules available on the initrd and sets the system time from - the hardware clock to work around a bug in qemu-kvm. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.section.md b/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.section.md new file mode 100644 index 000000000000..b124e8303fee --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.section.md @@ -0,0 +1,51 @@ +# Renaming network interfaces {#sec-rename-ifs} + +NixOS uses the udev [predictable naming +scheme](https://systemd.io/PREDICTABLE_INTERFACE_NAMES/) to assign names +to network interfaces. This means that by default cards are not given +the traditional names like `eth0` or `eth1`, whose order can change +unpredictably across reboots. Instead, relying on physical locations and +firmware information, the scheme produces names like `ens1`, `enp2s0`, +etc. + +These names are predictable but less memorable and not necessarily +stable: for example installing new hardware or changing firmware +settings can result in a [name +change](https://github.com/systemd/systemd/issues/3715#issue-165347602). +If this is undesirable, for example if you have a single ethernet card, +you can revert to the traditional scheme by setting +[](#opt-networking.usePredictableInterfaceNames) +to `false`. + +## Assigning custom names {#sec-custom-ifnames} + +In case there are multiple interfaces of the same type, it's better to +assign custom names based on the device hardware address. For example, +we assign the name `wan` to the interface with MAC address +`52:54:00:12:01:01` using a netword link unit: + +```nix +systemd.network.links."10-wan" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "wan"; +}; +``` + +Note that links are directly read by udev, *not networkd*, and will work +even if networkd is disabled. + +Alternatively, we can use a plain old udev rule: + +```nix +services.udev.initrdRules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ + ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" +''; +``` + +::: {.warning} +The rule must be installed in the initrd using +`services.udev.initrdRules`, not the usual `services.udev.extraRules` +option. This is to avoid race conditions with other programs controlling +the interface. +::: diff --git a/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml b/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml deleted file mode 100644 index d760bb3a4dac..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml +++ /dev/null @@ -1,67 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-rename-ifs"> - <title>Renaming network interfaces</title> - - <para> - NixOS uses the udev - <link xlink:href="https://systemd.io/PREDICTABLE_INTERFACE_NAMES/">predictable naming scheme</link> - to assign names to network interfaces. This means that by default - cards are not given the traditional names like - <literal>eth0</literal> or <literal>eth1</literal>, whose order can - change unpredictably across reboots. Instead, relying on physical - locations and firmware information, the scheme produces names like - <literal>ens1</literal>, <literal>enp2s0</literal>, etc. - </para> - - <para> - These names are predictable but less memorable and not necessarily - stable: for example installing new hardware or changing firmware - settings can result in a - <link xlink:href="https://github.com/systemd/systemd/issues/3715#issue-165347602">name change</link>. - If this is undesirable, for example if you have a single ethernet - card, you can revert to the traditional scheme by setting - <xref linkend="opt-networking.usePredictableInterfaceNames"/> to - <literal>false</literal>. - </para> - - <section xml:id="sec-custom-ifnames"> - <title>Assigning custom names</title> - <para> - In case there are multiple interfaces of the same type, it’s better to - assign custom names based on the device hardware address. For - example, we assign the name <literal>wan</literal> to the interface - with MAC address <literal>52:54:00:12:01:01</literal> using a - netword link unit: - </para> - <programlisting> - <link linkend="opt-systemd.network.links">systemd.network.links."10-wan"</link> = { - matchConfig.MACAddress = "52:54:00:12:01:01"; - linkConfig.Name = "wan"; - }; - </programlisting> - <para> - Note that links are directly read by udev, <emphasis>not networkd</emphasis>, - and will work even if networkd is disabled. - </para> - <para> - Alternatively, we can use a plain old udev rule: - </para> - <programlisting> - <link linkend="opt-services.udev.initrdRules">services.udev.initrdRules</link> = '' - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ - ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" - ''; - </programlisting> - - <warning><para> - The rule must be installed in the initrd using - <literal>services.udev.initrdRules</literal>, not the usual - <literal>services.udev.extraRules</literal> option. This is to avoid race - conditions with other programs controlling the interface. - </para></warning> - </section> - -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/ssh.section.md b/nixpkgs/nixos/doc/manual/configuration/ssh.section.md new file mode 100644 index 000000000000..cba81eb43f49 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/ssh.section.md @@ -0,0 +1,19 @@ +# Secure Shell Access {#sec-ssh} + +Secure shell (SSH) access to your machine can be enabled by setting: + +```nix +services.openssh.enable = true; +``` + +By default, root logins using a password are disallowed. They can be +disabled entirely by setting +[](#opt-services.openssh.permitRootLogin) to `"no"`. + +You can declaratively specify authorised RSA/DSA public keys for a user +as follows: + +```nix +users.users.alice.openssh.authorizedKeys.keys = + [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/ssh.xml b/nixpkgs/nixos/doc/manual/configuration/ssh.xml deleted file mode 100644 index 95ad3edff935..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/ssh.xml +++ /dev/null @@ -1,27 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-ssh"> - <title>Secure Shell Access</title> - - <para> - Secure shell (SSH) access to your machine can be enabled by setting: -<programlisting> -<xref linkend="opt-services.openssh.enable"/> = true; -</programlisting> - By default, root logins using a password are disallowed. They can be disabled - entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to - <literal>"no"</literal>. - </para> - - <para> - You can declaratively specify authorised RSA/DSA public keys for a user as - follows: -<!-- FIXME: this might not work if the user is unmanaged. --> -<programlisting> -<link linkend="opt-users.users._name_.openssh.authorizedKeys.keys">users.users.alice.openssh.authorizedKeys.keys</link> = - [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; -</programlisting> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/sshfs-file-systems.section.md b/nixpkgs/nixos/doc/manual/configuration/sshfs-file-systems.section.md index 4625fce03d58..4dd1b203a249 100644 --- a/nixpkgs/nixos/doc/manual/configuration/sshfs-file-systems.section.md +++ b/nixpkgs/nixos/doc/manual/configuration/sshfs-file-systems.section.md @@ -34,7 +34,7 @@ SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation To keep the key safe, change the ownership to `root:root` and make sure the permissions are `600`: OpenSSH normally refuses to use the key if it's not well-protected. -The file system can be configured in NixOS via the usual [fileSystems](options.html#opt-fileSystems) option. +The file system can be configured in NixOS via the usual [fileSystems](#opt-fileSystems) option. Here's a typical setup: ```nix { diff --git a/nixpkgs/nixos/doc/manual/configuration/subversion.chapter.md b/nixpkgs/nixos/doc/manual/configuration/subversion.chapter.md new file mode 100644 index 000000000000..84f9c2703378 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/subversion.chapter.md @@ -0,0 +1,102 @@ +# Subversion {#module-services-subversion} + +[Subversion](https://subversion.apache.org/) is a centralized +version-control system. It can use a [variety of +protocols](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing) +for communication between client and server. + +## Subversion inside Apache HTTP {#module-services-subversion-apache-httpd} + +This section focuses on configuring a web-based server on top of the +Apache HTTP server, which uses +[WebDAV](http://www.webdav.org/)/[DeltaV](http://www.webdav.org/deltav/WWW10/deltav-intro.htm) +for communication. + +For more information on the general setup, please refer to the [the +appropriate section of the Subversion +book](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd). + +To configure, include in `/etc/nixos/configuration.nix` code to activate +Apache HTTP, setting [](#opt-services.httpd.adminAddr) +appropriately: + +```nix +services.httpd.enable = true; +services.httpd.adminAddr = ...; +networking.firewall.allowedTCPPorts = [ 80 443 ]; +``` + +For a simple Subversion server with basic authentication, configure the +Subversion module for Apache as follows, setting `hostName` and +`documentRoot` appropriately, and `SVNParentPath` to the parent +directory of the repositories, `AuthzSVNAccessFile` to the location of +the `.authz` file describing access permission, and `AuthUserFile` to +the password file. + +```nix +services.httpd.extraModules = [ + # note that order is *super* important here + { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } + { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } + ]; + services.httpd.virtualHosts = { + "svn" = { + hostName = HOSTNAME; + documentRoot = DOCUMENTROOT; + locations."/svn".extraConfig = '' + DAV svn + SVNParentPath REPO_PARENT + AuthzSVNAccessFile ACCESS_FILE + AuthName "SVN Repositories" + AuthType Basic + AuthUserFile PASSWORD_FILE + Require valid-user + ''; + } +``` + +The key `"svn"` is just a symbolic name identifying the virtual host. +The `"/svn"` in `locations."/svn".extraConfig` is the path underneath +which the repositories will be served. + +[This page](https://wiki.archlinux.org/index.php/Subversion) explains +how to set up the Subversion configuration itself. This boils down to +the following: + +Underneath `REPO_PARENT` repositories can be set up as follows: + +```ShellSession +$ svn create REPO_NAME +``` + +Repository files need to be accessible by `wwwrun`: + +```ShellSession +$ chown -R wwwrun:wwwrun REPO_PARENT +``` + +The password file `PASSWORD_FILE` can be created as follows: + +```ShellSession +$ htpasswd -cs PASSWORD_FILE USER_NAME +``` + +Additional users can be set up similarly, omitting the `c` flag: + +```ShellSession +$ htpasswd -s PASSWORD_FILE USER_NAME +``` + +The file describing access permissions `ACCESS_FILE` will look something +like the following: + +```nix +[/] +* = r + +[REPO_NAME:/] +USER_NAME = rw +``` + +The Subversion repositories will be accessible as +`http://HOSTNAME/svn/REPO_NAME`. diff --git a/nixpkgs/nixos/doc/manual/configuration/subversion.xml b/nixpkgs/nixos/doc/manual/configuration/subversion.xml deleted file mode 100644 index 940d63cc4e6d..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/subversion.xml +++ /dev/null @@ -1,140 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="module-services-subversion"> - <title>Subversion</title> - - <para> - <link xlink:href="https://subversion.apache.org/">Subversion</link> - is a centralized version-control system. It can use a <link - xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing">variety - of protocols</link> for communication between client and server. - </para> - <section xml:id="module-services-subversion-apache-httpd"> - <title>Subversion inside Apache HTTP</title> - - <para> - This section focuses on configuring a web-based server on top of - the Apache HTTP server, which uses - <link xlink:href="http://www.webdav.org/">WebDAV</link>/<link - xlink:href="http://www.webdav.org/deltav/WWW10/deltav-intro.htm">DeltaV</link> - for communication. - </para> - - <para>For more information on the general setup, please refer to - the <link - xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd">the - appropriate section of the Subversion book</link>. - </para> - - <para>To configure, include in - <literal>/etc/nixos/configuration.nix</literal> code to activate - Apache HTTP, setting <xref linkend="opt-services.httpd.adminAddr" /> - appropriately: - </para> - - <para> -<programlisting> - services.httpd.enable = true; - services.httpd.adminAddr = ...; - networking.firewall.allowedTCPPorts = [ 80 443 ]; -</programlisting> - </para> - - <para>For a simple Subversion server with basic authentication, - configure the Subversion module for Apache as follows, setting - <literal>hostName</literal> and <literal>documentRoot</literal> - appropriately, and <literal>SVNParentPath</literal> to the parent - directory of the repositories, - <literal>AuthzSVNAccessFile</literal> to the location of the - <code>.authz</code> file describing access permission, and - <literal>AuthUserFile</literal> to the password file. - </para> - <para> -<programlisting> -services.httpd.extraModules = [ - # note that order is *super* important here - { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } - { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } - ]; - services.httpd.virtualHosts = { - "svn" = { - hostName = HOSTNAME; - documentRoot = DOCUMENTROOT; - locations."/svn".extraConfig = '' - DAV svn - SVNParentPath REPO_PARENT - AuthzSVNAccessFile ACCESS_FILE - AuthName "SVN Repositories" - AuthType Basic - AuthUserFile PASSWORD_FILE - Require valid-user - ''; - } -</programlisting> - </para> - - <para> - The key <code>"svn"</code> is just a symbolic name identifying the - virtual host. The <code>"/svn"</code> in - <code>locations."/svn".extraConfig</code> is the path underneath - which the repositories will be served. - </para> - - <para><link - xlink:href="https://wiki.archlinux.org/index.php/Subversion">This - page</link> explains how to set up the Subversion configuration - itself. This boils down to the following: - </para> - <para> - Underneath <literal>REPO_PARENT</literal> repositories can be set up - as follows: - </para> - <para> -<screen> -<prompt>$ </prompt> svn create REPO_NAME -</screen> - </para> - <para>Repository files need to be accessible by - <literal>wwwrun</literal>: - </para> - <para> -<screen> -<prompt>$ </prompt> chown -R wwwrun:wwwrun REPO_PARENT -</screen> - </para> - <para> - The password file <literal>PASSWORD_FILE</literal> can be created as follows: - </para> - <para> -<screen> -<prompt>$ </prompt> htpasswd -cs PASSWORD_FILE USER_NAME -</screen> - </para> - <para> - Additional users can be set up similarly, omitting the - <code>c</code> flag: - </para> - <para> -<screen> -<prompt>$ </prompt> htpasswd -s PASSWORD_FILE USER_NAME -</screen> - </para> - <para> - The file describing access permissions - <literal>ACCESS_FILE</literal> will look something like - the following: - </para> - <para> -<programlisting> -[/] -* = r - -[REPO_NAME:/] -USER_NAME = rw -</programlisting> - </para> - <para>The Subversion repositories will be accessible as <code>http://HOSTNAME/svn/REPO_NAME</code>.</para> - </section> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/summary.section.md b/nixpkgs/nixos/doc/manual/configuration/summary.section.md new file mode 100644 index 000000000000..8abbbe257fd9 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/summary.section.md @@ -0,0 +1,46 @@ +# Syntax Summary {#sec-nix-syntax-summary} + +Below is a summary of the most important syntactic constructs in the Nix +expression language. It's not complete. In particular, there are many +other built-in functions. See the [Nix +manual](https://nixos.org/nix/manual/#chap-writing-nix-expressions) for +the rest. + +| Example | Description | +|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------| +| *Basic values* | | +| `"Hello world"` | A string | +| `"${pkgs.bash}/bin/sh"` | A string containing an expression (expands to `"/nix/store/hash-bash-version/bin/sh"`) | +| `true`, `false` | Booleans | +| `123` | An integer | +| `./foo.png` | A path (relative to the containing Nix expression) | +| *Compound values* | | +| `{ x = 1; y = 2; }` | A set with attributes named `x` and `y` | +| `{ foo.bar = 1; }` | A nested set, equivalent to `{ foo = { bar = 1; }; }` | +| `rec { x = "foo"; y = x + "bar"; }` | A recursive set, equivalent to `{ x = "foo"; y = "foobar"; }` | +| `[ "foo" "bar" ]` | A list with two elements | +| *Operators* | | +| `"foo" + "bar"` | String concatenation | +| `1 + 2` | Integer addition | +| `"foo" == "f" + "oo"` | Equality test (evaluates to `true`) | +| `"foo" != "bar"` | Inequality test (evaluates to `true`) | +| `!true` | Boolean negation | +| `{ x = 1; y = 2; }.x` | Attribute selection (evaluates to `1`) | +| `{ x = 1; y = 2; }.z or 3` | Attribute selection with default (evaluates to `3`) | +| `{ x = 1; y = 2; } // { z = 3; }` | Merge two sets (attributes in the right-hand set taking precedence) | +| *Control structures* | | +| `if 1 + 1 == 2 then "yes!" else "no!"` | Conditional expression | +| `assert 1 + 1 == 2; "yes!"` | Assertion check (evaluates to `"yes!"`). See [](#sec-assertions) for using assertions in modules | +| `let x = "foo"; y = "bar"; in x + y` | Variable definition | +| `with pkgs.lib; head [ 1 2 3 ]` | Add all attributes from the given set to the scope (evaluates to `1`) | +| *Functions (lambdas)* | | +| `x: x + 1` | A function that expects an integer and returns it increased by 1 | +| `(x: x + 1) 100` | A function call (evaluates to 101) | +| `let inc = x: x + 1; in inc (inc (inc 100))` | A function bound to a variable and subsequently called by name (evaluates to 103) | +| `{ x, y }: x + y` | A function that expects a set with required attributes `x` and `y` and concatenates them | +| `{ x, y ? "bar" }: x + y` | A function that expects a set with required attribute `x` and optional `y`, using `"bar"` as default value for `y` | +| `{ x, y, ... }: x + y` | A function that expects a set with required attributes `x` and `y` and ignores any other attributes | +| `{ x, y } @ args: x + y` | A function that expects a set with required attributes `x` and `y`, and binds the whole set to `args` | +| *Built-in functions* | | +| `import ./foo.nix` | Load and return Nix expression in given file | +| `map (x: x + x) [ 1 2 3 ]` | Apply a function to every element of a list (evaluates to `[ 2 4 6 ]`) | diff --git a/nixpkgs/nixos/doc/manual/configuration/summary.xml b/nixpkgs/nixos/doc/manual/configuration/summary.xml deleted file mode 100644 index 289face16de9..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/summary.xml +++ /dev/null @@ -1,227 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-nix-syntax-summary"> - <title>Syntax Summary</title> - - <para> - Below is a summary of the most important syntactic constructs in the Nix - expression language. It’s not complete. In particular, there are many other - built-in functions. See the - <link -xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix - manual</link> for the rest. - </para> - - <informaltable frame='none'> - <tgroup cols='2'> - <colspec colname='c1' rowsep='1' colsep='1' /> - <colspec colname='c2' rowsep='1' /> - <thead> - <row> - <entry>Example</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <row> - <entry namest="c1" nameend="c2"><emphasis>Basic values</emphasis> - </entry> - </row> - <row> - <entry><literal>"Hello world"</literal> - </entry> - <entry>A string</entry> - </row> - <row> - <entry><literal>"${pkgs.bash}/bin/sh"</literal> - </entry> - <entry>A string containing an expression (expands to <literal>"/nix/store/<replaceable>hash</replaceable>-bash-<replaceable>version</replaceable>/bin/sh"</literal>)</entry> - </row> - <row> - <entry><literal>true</literal>, <literal>false</literal> - </entry> - <entry>Booleans</entry> - </row> - <row> - <entry><literal>123</literal> - </entry> - <entry>An integer</entry> - </row> - <row> - <entry><literal>./foo.png</literal> - </entry> - <entry>A path (relative to the containing Nix expression)</entry> - </row> - <row> - <entry namest="c1" nameend="c2"><emphasis>Compound values</emphasis> - </entry> - </row> - <row> - <entry><literal>{ x = 1; y = 2; }</literal> - </entry> - <entry>A set with attributes named <literal>x</literal> and <literal>y</literal> - </entry> - </row> - <row> - <entry><literal>{ foo.bar = 1; }</literal> - </entry> - <entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal> - </entry> - </row> - <row> - <entry><literal>rec { x = "foo"; y = x + "bar"; }</literal> - </entry> - <entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal> - </entry> - </row> - <row> - <entry><literal>[ "foo" "bar" ]</literal> - </entry> - <entry>A list with two elements</entry> - </row> - <row> - <entry namest="c1" nameend="c2"><emphasis>Operators</emphasis> - </entry> - </row> - <row> - <entry><literal>"foo" + "bar"</literal> - </entry> - <entry>String concatenation</entry> - </row> - <row> - <entry><literal>1 + 2</literal> - </entry> - <entry>Integer addition</entry> - </row> - <row> - <entry><literal>"foo" == "f" + "oo"</literal> - </entry> - <entry>Equality test (evaluates to <literal>true</literal>)</entry> - </row> - <row> - <entry><literal>"foo" != "bar"</literal> - </entry> - <entry>Inequality test (evaluates to <literal>true</literal>)</entry> - </row> - <row> - <entry><literal>!true</literal> - </entry> - <entry>Boolean negation</entry> - </row> - <row> - <entry><literal>{ x = 1; y = 2; }.x</literal> - </entry> - <entry>Attribute selection (evaluates to <literal>1</literal>)</entry> - </row> - <row> - <entry><literal>{ x = 1; y = 2; }.z or 3</literal> - </entry> - <entry>Attribute selection with default (evaluates to <literal>3</literal>)</entry> - </row> - <row> - <entry><literal>{ x = 1; y = 2; } // { z = 3; }</literal> - </entry> - <entry>Merge two sets (attributes in the right-hand set taking precedence)</entry> - </row> - <row> - <entry namest="c1" nameend="c2"><emphasis>Control structures</emphasis> - </entry> - </row> - <row> - <entry><literal>if 1 + 1 == 2 then "yes!" else "no!"</literal> - </entry> - <entry>Conditional expression</entry> - </row> - <row> - <entry><literal>assert 1 + 1 == 2; "yes!"</literal> - </entry> - <entry>Assertion check (evaluates to <literal>"yes!"</literal>). See <xref - linkend="sec-assertions"/> for using assertions in modules</entry> - </row> - <row> - <entry><literal>let x = "foo"; y = "bar"; in x + y</literal> - </entry> - <entry>Variable definition</entry> - </row> - <row> - <entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal> - </entry> - <entry>Add all attributes from the given set to the scope - (evaluates to <literal>1</literal>)</entry> - </row> - <row> - <entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis> - </entry> - </row> - <row> - <entry><literal>x: x + 1</literal> - </entry> - <entry>A function that expects an integer and returns it increased by 1</entry> - </row> - <row> - <entry><literal>(x: x + 1) 100</literal> - </entry> - <entry>A function call (evaluates to 101)</entry> - </row> - <row> - <entry><literal>let inc = x: x + 1; in inc (inc (inc 100))</literal> - </entry> - <entry>A function bound to a variable and subsequently called by name (evaluates to 103)</entry> - </row> - <row> - <entry><literal>{ x, y }: x + y</literal> - </entry> - <entry>A function that expects a set with required attributes - <literal>x</literal> and <literal>y</literal> and concatenates - them</entry> - </row> - <row> - <entry><literal>{ x, y ? "bar" }: x + y</literal> - </entry> - <entry>A function that expects a set with required attribute - <literal>x</literal> and optional <literal>y</literal>, using - <literal>"bar"</literal> as default value for - <literal>y</literal> - </entry> - </row> - <row> - <entry><literal>{ x, y, ... }: x + y</literal> - </entry> - <entry>A function that expects a set with required attributes - <literal>x</literal> and <literal>y</literal> and ignores any - other attributes</entry> - </row> - <row> - <entry><literal>{ x, y } @ args: x + y</literal> - </entry> - <entry>A function that expects a set with required attributes - <literal>x</literal> and <literal>y</literal>, and binds the - whole set to <literal>args</literal> - </entry> - </row> - <row> - <entry namest="c1" nameend="c2"><emphasis>Built-in functions</emphasis> - </entry> - </row> - <row> - <entry><literal>import ./foo.nix</literal> - </entry> - <entry>Load and return Nix expression in given file</entry> - </row> - <row> - <entry><literal>map (x: x + x) [ 1 2 3 ]</literal> - </entry> - <entry>Apply a function to every element of a list (evaluates to <literal>[ 2 4 6 ]</literal>)</entry> - </row> -<!-- - <row> - <entry><literal>throw "Urgh"</literal></entry> - <entry>Raise an error condition</entry> - </row> - --> - </tbody> - </tgroup> - </informaltable> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixpkgs/nixos/doc/manual/configuration/user-mgmt.chapter.md new file mode 100644 index 000000000000..37990664a8f1 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/user-mgmt.chapter.md @@ -0,0 +1,92 @@ +# User Management {#sec-user-management} + +NixOS supports both declarative and imperative styles of user +management. In the declarative style, users are specified in +`configuration.nix`. For instance, the following states that a user +account named `alice` shall exist: + +```nix +users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; +``` + +Note that `alice` is a member of the `wheel` and `networkmanager` +groups, which allows her to use `sudo` to execute commands as `root` and +to configure the network, respectively. Also note the SSH public key +that allows remote logins with the corresponding private key. Users +created in this way do not have a password by default, so they cannot +log in via mechanisms that require a password. However, you can use the +`passwd` program to set a password, which is retained across invocations +of `nixos-rebuild`. + +If you set [](#opt-users.mutableUsers) to +false, then the contents of `/etc/passwd` and `/etc/group` will be congruent +to your NixOS configuration. For instance, if you remove a user from +[](#opt-users.users) and run nixos-rebuild, the user +account will cease to exist. Also, imperative commands for managing users and +groups, such as useradd, are no longer available. Passwords may still be +assigned by setting the user\'s +[hashedPassword](#opt-users.users._name_.hashedPassword) option. A +hashed password can be generated using `mkpasswd -m + sha-512`. + +A user ID (uid) is assigned automatically. You can also specify a uid +manually by adding + +```nix +uid = 1000; +``` + +to the user specification. + +Groups can be specified similarly. The following states that a group +named `students` shall exist: + +```nix +users.groups.students.gid = 1000; +``` + +As with users, the group ID (gid) is optional and will be assigned +automatically if it's missing. + +In the imperative style, users and groups are managed by commands such +as `useradd`, `groupmod` and so on. For instance, to create a user +account named `alice`: + +```ShellSession +# useradd -m alice +``` + +To make all nix tools available to this new user use \`su - USER\` which +opens a login shell (==shell that loads the profile) for given user. +This will create the \~/.nix-defexpr symlink. So run: + +```ShellSession +# su - alice -c "true" +``` + +The flag `-m` causes the creation of a home directory for the new user, +which is generally what you want. The user does not have an initial +password and therefore cannot log in. A password can be set using the +`passwd` utility: + +```ShellSession +# passwd alice +Enter new UNIX password: *** +Retype new UNIX password: *** +``` + +A user can be deleted using `userdel`: + +```ShellSession +# userdel -r alice +``` + +The flag `-r` deletes the user's home directory. Accounts can be +modified using `usermod`. Unix groups can be managed using `groupadd`, +`groupmod` and `groupdel`. diff --git a/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml b/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml deleted file mode 100644 index e83e7b75ef54..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml +++ /dev/null @@ -1,88 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-user-management"> - <title>User Management</title> - <para> - NixOS supports both declarative and imperative styles of user management. In - the declarative style, users are specified in - <filename>configuration.nix</filename>. For instance, the following states - that a user account named <literal>alice</literal> shall exist: -<programlisting> -<xref linkend="opt-users.users"/>.alice = { - <link linkend="opt-users.users._name_.isNormalUser">isNormalUser</link> = true; - <link linkend="opt-users.users._name_.home">home</link> = "/home/alice"; - <link linkend="opt-users.users._name_.description">description</link> = "Alice Foobar"; - <link linkend="opt-users.users._name_.extraGroups">extraGroups</link> = [ "wheel" "networkmanager" ]; - <link linkend="opt-users.users._name_.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; -}; -</programlisting> - Note that <literal>alice</literal> is a member of the - <literal>wheel</literal> and <literal>networkmanager</literal> groups, which - allows her to use <command>sudo</command> to execute commands as - <literal>root</literal> and to configure the network, respectively. Also note - the SSH public key that allows remote logins with the corresponding private - key. Users created in this way do not have a password by default, so they - cannot log in via mechanisms that require a password. However, you can use - the <command>passwd</command> program to set a password, which is retained - across invocations of <command>nixos-rebuild</command>. - </para> - <para> - If you set <xref linkend="opt-users.mutableUsers"/> to false, then the - contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal> - will be congruent to your NixOS configuration. For instance, if you remove a - user from <xref linkend="opt-users.users"/> and run nixos-rebuild, the user - account will cease to exist. Also, imperative commands for managing users and - groups, such as useradd, are no longer available. Passwords may still be - assigned by setting the user's - <link linkend="opt-users.users._name_.hashedPassword">hashedPassword</link> - option. A hashed password can be generated using <command>mkpasswd -m - sha-512</command>. - </para> - <para> - A user ID (uid) is assigned automatically. You can also specify a uid - manually by adding -<programlisting> -uid = 1000; -</programlisting> - to the user specification. - </para> - <para> - Groups can be specified similarly. The following states that a group named - <literal>students</literal> shall exist: -<programlisting> -<xref linkend="opt-users.groups"/>.students.gid = 1000; -</programlisting> - As with users, the group ID (gid) is optional and will be assigned - automatically if it’s missing. - </para> - <para> - In the imperative style, users and groups are managed by commands such as - <command>useradd</command>, <command>groupmod</command> and so on. For - instance, to create a user account named <literal>alice</literal>: -<screen> -<prompt># </prompt>useradd -m <replaceable>alice</replaceable></screen> - To make all nix tools available to this new user use `su - USER` which opens - a login shell (==shell that loads the profile) for given user. This will - create the ~/.nix-defexpr symlink. So run: -<screen> -<prompt># </prompt>su - <replaceable>alice</replaceable> -c "true"</screen> - The flag <option>-m</option> causes the creation of a home directory for the - new user, which is generally what you want. The user does not have an initial - password and therefore cannot log in. A password can be set using the - <command>passwd</command> utility: -<screen> -<prompt># </prompt>passwd <replaceable>alice</replaceable> -Enter new UNIX password: *** -Retype new UNIX password: *** -</screen> - A user can be deleted using <command>userdel</command>: -<screen> -<prompt># </prompt>userdel -r <replaceable>alice</replaceable></screen> - The flag <option>-r</option> deletes the user’s home directory. Accounts - can be modified using <command>usermod</command>. Unix groups can be managed - using <command>groupadd</command>, <command>groupmod</command> and - <command>groupdel</command>. - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/wayland.chapter.md b/nixpkgs/nixos/doc/manual/configuration/wayland.chapter.md new file mode 100644 index 000000000000..a3a46aa3da6f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/wayland.chapter.md @@ -0,0 +1,27 @@ +# Wayland {#sec-wayland} + +While X11 (see [](#sec-x11)) is still the primary display technology +on NixOS, Wayland support is steadily improving. Where X11 separates the +X Server and the window manager, on Wayland those are combined: a +Wayland Compositor is like an X11 window manager, but also embeds the +Wayland \'Server\' functionality. This means it is sufficient to install +a Wayland Compositor such as sway without separately enabling a Wayland +server: + +```nix +programs.sway.enable = true; +``` + +This installs the sway compositor along with some essential utilities. +Now you can start sway from the TTY console. + +If you are using a wlroots-based compositor, like sway, and want to be +able to share your screen, you might want to activate this option: + +```nix +xdg.portal.wlr.enable = true; +``` + +and configure Pipewire using +[](#opt-services.pipewire.enable) +and related options. diff --git a/nixpkgs/nixos/doc/manual/configuration/wayland.xml b/nixpkgs/nixos/doc/manual/configuration/wayland.xml deleted file mode 100644 index 2aefda3e22c0..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/wayland.xml +++ /dev/null @@ -1,33 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-wayland"> - <title>Wayland</title> - - <para> - While X11 (see <xref linkend="sec-x11"/>) is still the primary display - technology on NixOS, Wayland support is steadily improving. - Where X11 separates the X Server and the window manager, on Wayland those - are combined: a Wayland Compositor is like an X11 window manager, but also - embeds the Wayland 'Server' functionality. This means it is sufficient to - install a Wayland Compositor such as <package>sway</package> without - separately enabling a Wayland server: -<programlisting> -<xref linkend="opt-programs.sway.enable"/> = true; -</programlisting> - This installs the <package>sway</package> compositor along with some - essential utilities. Now you can start <package>sway</package> from the TTY - console. - </para> - - <para> - If you are using a wlroots-based compositor, like sway, and want to be able to - share your screen, you might want to activate this option: -<programlisting> -<xref linkend="opt-xdg.portal.wlr.enable"/> = true; -</programlisting> - and configure Pipewire using <xref linkend="opt-services.pipewire.enable"/> - and related options. - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/wireless.section.md b/nixpkgs/nixos/doc/manual/configuration/wireless.section.md new file mode 100644 index 000000000000..6b223d843ac5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/wireless.section.md @@ -0,0 +1,67 @@ +# Wireless Networks {#sec-wireless} + +For a desktop installation using NetworkManager (e.g., GNOME), you just +have to make sure the user is in the `networkmanager` group and you can +skip the rest of this section on wireless networks. + +NixOS will start wpa_supplicant for you if you enable this setting: + +```nix +networking.wireless.enable = true; +``` + +NixOS lets you specify networks for wpa_supplicant declaratively: + +```nix +networking.wireless.networks = { + echelon = { # SSID with no spaces or special characters + psk = "abcdefgh"; + }; + "echelon's AP" = { # SSID with spaces and/or special characters + psk = "ijklmnop"; + }; + echelon = { # Hidden SSID + hidden = true; + psk = "qrstuvwx"; + }; + free.wifi = {}; # Public wireless network +}; +``` + +Be aware that keys will be written to the nix store in plaintext! When +no networks are set, it will default to using a configuration file at +`/etc/wpa_supplicant.conf`. You should edit this file yourself to define +wireless networks, WPA keys and so on (see wpa_supplicant.conf(5)). + +If you are using WPA2 you can generate pskRaw key using +`wpa_passphrase`: + +```ShellSession +$ wpa_passphrase ESSID PSK +network={ + ssid="echelon" + #psk="abcdefgh" + psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 +} +``` + +```nix +networking.wireless.networks = { + echelon = { + pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; + }; +} +``` + +or you can use it to directly generate the `wpa_supplicant.conf`: + +```ShellSession +# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf +``` + +After you have edited the `wpa_supplicant.conf`, you need to restart the +wpa_supplicant service. + +```ShellSession +# systemctl restart wpa_supplicant.service +``` diff --git a/nixpkgs/nixos/doc/manual/configuration/wireless.xml b/nixpkgs/nixos/doc/manual/configuration/wireless.xml deleted file mode 100644 index 247d29d58314..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/wireless.xml +++ /dev/null @@ -1,70 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-wireless"> - <title>Wireless Networks</title> - - <para> - For a desktop installation using NetworkManager (e.g., GNOME), you just have - to make sure the user is in the <code>networkmanager</code> group and you can - skip the rest of this section on wireless networks. - </para> - - <para> - NixOS will start wpa_supplicant for you if you enable this setting: -<programlisting> -<xref linkend="opt-networking.wireless.enable"/> = true; -</programlisting> - NixOS lets you specify networks for wpa_supplicant declaratively: -<programlisting> -<xref linkend="opt-networking.wireless.networks"/> = { - echelon = { # SSID with no spaces or special characters - psk = "abcdefgh"; - }; - "echelon's AP" = { # SSID with spaces and/or special characters - psk = "ijklmnop"; - }; - echelon = { # Hidden SSID - hidden = true; - psk = "qrstuvwx"; - }; - free.wifi = {}; # Public wireless network -}; -</programlisting> - Be aware that keys will be written to the nix store in plaintext! When no - networks are set, it will default to using a configuration file at - <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file - yourself to define wireless networks, WPA keys and so on (see <citerefentry> - <refentrytitle>wpa_supplicant.conf</refentrytitle> - <manvolnum>5</manvolnum> </citerefentry>). - </para> - - <para> - If you are using WPA2 you can generate pskRaw key using - <command>wpa_passphrase</command>: -<screen> -<prompt>$ </prompt>wpa_passphrase ESSID PSK -network={ - ssid="echelon" - #psk="abcdefgh" - psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 -} -</screen> -<programlisting> -<xref linkend="opt-networking.wireless.networks"/> = { - echelon = { - pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; - }; -} -</programlisting> - or you can use it to directly generate the - <literal>wpa_supplicant.conf</literal>: -<screen> -<prompt># </prompt>wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen> - After you have edited the <literal>wpa_supplicant.conf</literal>, you need to - restart the wpa_supplicant service. -<screen> -<prompt># </prompt>systemctl restart wpa_supplicant.service</screen> - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md b/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md new file mode 100644 index 000000000000..2c80b786b267 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md @@ -0,0 +1,337 @@ +# X Window System {#sec-x11} + +The X Window System (X11) provides the basis of NixOS' graphical user +interface. It can be enabled as follows: + +```nix +services.xserver.enable = true; +``` + +The X server will automatically detect and use the appropriate video +driver from a set of X.org drivers (such as `vesa` and `intel`). You can +also specify a driver manually, e.g. + +```nix +services.xserver.videoDrivers = [ "r128" ]; +``` + +to enable X.org's `xf86-video-r128` driver. + +You also need to enable at least one desktop or window manager. +Otherwise, you can only log into a plain undecorated `xterm` window. +Thus you should pick one or more of the following lines: + +```nix +services.xserver.desktopManager.plasma5.enable = true; +services.xserver.desktopManager.xfce.enable = true; +services.xserver.desktopManager.gnome.enable = true; +services.xserver.desktopManager.mate.enable = true; +services.xserver.windowManager.xmonad.enable = true; +services.xserver.windowManager.twm.enable = true; +services.xserver.windowManager.icewm.enable = true; +services.xserver.windowManager.i3.enable = true; +services.xserver.windowManager.herbstluftwm.enable = true; +``` + +NixOS's default *display manager* (the program that provides a graphical +login prompt and manages the X server) is LightDM. You can select an +alternative one by picking one of the following lines: + +```nix +services.xserver.displayManager.sddm.enable = true; +services.xserver.displayManager.gdm.enable = true; +``` + +You can set the keyboard layout (and optionally the layout variant): + +```nix +services.xserver.layout = "de"; +services.xserver.xkbVariant = "neo"; +``` + +The X server is started automatically at boot time. If you don't want +this to happen, you can set: + +```nix +services.xserver.autorun = false; +``` + +The X server can then be started manually: + +```ShellSession +# systemctl start display-manager.service +``` + +On 64-bit systems, if you want OpenGL for 32-bit programs such as in +Wine, you should also set the following: + +```nix +hardware.opengl.driSupport32Bit = true; +``` + +## Auto-login {#sec-x11-auto-login .unnumbered} + +The x11 login screen can be skipped entirely, automatically logging you +into your window manager and desktop environment when you boot your +computer. + +This is especially helpful if you have disk encryption enabled. Since +you already have to provide a password to decrypt your disk, entering a +second password to login can be redundant. + +To enable auto-login, you need to define your default window manager and +desktop environment. If you wanted no desktop environment and i3 as your +your window manager, you\'d define: + +```nix +services.xserver.displayManager.defaultSession = "none+i3"; +``` + +Every display manager in NixOS supports auto-login, here is an example +using lightdm for a user `alice`: + +```nix +services.xserver.displayManager.lightdm.enable = true; +services.xserver.displayManager.autoLogin.enable = true; +services.xserver.displayManager.autoLogin.user = "alice"; +``` + +## Intel Graphics drivers {#sec-x11--graphics-cards-intel .unnumbered} + +There are two choices for Intel Graphics drivers in X.org: `modesetting` +(included in the xorg-server itself) and `intel` (provided by the +package xf86-video-intel). + +The default and recommended is `modesetting`. It is a generic driver +which uses the kernel [mode +setting](https://en.wikipedia.org/wiki/Mode_setting) (KMS) mechanism. It +supports Glamor (2D graphics acceleration via OpenGL) and is actively +maintained but may perform worse in some cases (like in old chipsets). + +The second driver, `intel`, is specific to Intel GPUs, but not +recommended by most distributions: it lacks several modern features (for +example, it doesn\'t support Glamor) and the package hasn\'t been +officially updated since 2015. + +The results vary depending on the hardware, so you may have to try both +drivers. Use the option +[](#opt-services.xserver.videoDrivers) +to set one. The recommended configuration for modern systems is: + +```nix +services.xserver.videoDrivers = [ "modesetting" ]; +services.xserver.useGlamor = true; +``` + +If you experience screen tearing no matter what, this configuration was +reported to resolve the issue: + +```nix +services.xserver.videoDrivers = [ "intel" ]; +services.xserver.deviceSection = '' + Option "DRI" "2" + Option "TearFree" "true" +''; +``` + +Note that this will likely downgrade the performance compared to +`modesetting` or `intel` with DRI 3 (default). + +## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia .unnumbered} + +NVIDIA provides a proprietary driver for its graphics cards that has +better 3D performance than the X.org drivers. It is not enabled by +default because it's not free software. You can enable it as follows: + +```nix +services.xserver.videoDrivers = [ "nvidia" ]; +``` + +Or if you have an older card, you may have to use one of the legacy +drivers: + +```nix +services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; +``` + +You may need to reboot after enabling this driver to prevent a clash +with other kernel modules. + +## Proprietary AMD drivers {#sec-x11--graphics-cards-amd .unnumbered} + +AMD provides a proprietary driver for its graphics cards that is not +enabled by default because it's not Free Software, is often broken in +nixpkgs and as of this writing doesn\'t offer more features or +performance. If you still want to use it anyway, you need to explicitly +set: + +```nix +services.xserver.videoDrivers = [ "amdgpu-pro" ]; +``` + +You will need to reboot after enabling this driver to prevent a clash +with other kernel modules. + +## Touchpads {#sec-x11-touchpads .unnumbered} + +Support for Synaptics touchpads (found in many laptops such as the Dell +Latitude series) can be enabled as follows: + +```nix +services.xserver.libinput.enable = true; +``` + +The driver has many options (see [](#ch-options)). +For instance, the following disables tap-to-click behavior: + +```nix +services.xserver.libinput.touchpad.tapping = false; +``` + +Note: the use of `services.xserver.synaptics` is deprecated since NixOS +17.09. + +## GTK/Qt themes {#sec-x11-gtk-and-qt-themes .unnumbered} + +GTK themes can be installed either to user profile or system-wide (via +`environment.systemPackages`). To make Qt 5 applications look similar to +GTK ones, you can use the following configuration: + +```nix +qt5.enable = true; +qt5.platformTheme = "gtk2"; +qt5.style = "gtk2"; +``` + +## Custom XKB layouts {#custom-xkb-layouts .unnumbered} + +It is possible to install custom [ XKB +](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts +using the option `services.xserver.extraLayouts`. + +As a first example, we are going to create a layout based on the basic +US layout, with an additional layer to type some greek symbols by +pressing the right-alt key. + +Create a file called `us-greek` with the following content (under a +directory called `symbols`; it\'s an XKB peculiarity that will help with +testing): + +```nix +xkb_symbols "us-greek" +{ + include "us(basic)" // includes the base US keys + include "level3(ralt_switch)" // configures right alt as a third level switch + + key <LatA> { [ a, A, Greek_alpha ] }; + key <LatB> { [ b, B, Greek_beta ] }; + key <LatG> { [ g, G, Greek_gamma ] }; + key <LatD> { [ d, D, Greek_delta ] }; + key <LatZ> { [ z, Z, Greek_zeta ] }; +}; +``` + +A minimal layout specification must include the following: + +```nix +services.xserver.extraLayouts.us-greek = { + description = "US layout with alt-gr greek"; + languages = [ "eng" ]; + symbolsFile = /yourpath/symbols/us-greek; +}; +``` + +::: {.note} +The name (after `extraLayouts.`) should match the one given to the +`xkb_symbols` block. +::: + +Applying this customization requires rebuilding several packages, and a +broken XKB file can lead to the X session crashing at login. Therefore, +you\'re strongly advised to **test your layout before applying it**: + +```ShellSession +$ nix-shell -p xorg.xkbcomp +$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY +``` + +You can inspect the predefined XKB files for examples: + +```ShellSession +$ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" +``` + +Once the configuration is applied, and you did a logout/login cycle, the +layout should be ready to use. You can try it by e.g. running +`setxkbmap us-greek` and then type `<alt>+a` (it may not get applied in +your terminal straight away). To change the default, the usual +`services.xserver.layout` option can still be used. + +A layout can have several other components besides `xkb_symbols`, for +example we will define new keycodes for some multimedia key and bind +these to some symbol. + +Use the *xev* utility from `pkgs.xorg.xev` to find the codes of the keys +of interest, then create a `media-key` file to hold the keycodes +definitions + +```nix +xkb_keycodes "media" +{ + <volUp> = 123; + <volDown> = 456; +} +``` + +Now use the newly define keycodes in `media-sym`: + +```nix +xkb_symbols "media" +{ + key.type = "ONE_LEVEL"; + key <volUp> { [ XF86AudioLowerVolume ] }; + key <volDown> { [ XF86AudioRaiseVolume ] }; +} +``` + +As before, to install the layout do + +```nix +services.xserver.extraLayouts.media = { + description = "Multimedia keys remapping"; + languages = [ "eng" ]; + symbolsFile = /path/to/media-key; + keycodesFile = /path/to/media-sym; +}; +``` + +::: {.note} +The function `pkgs.writeText <filename> <content>` can be useful if you +prefer to keep the layout definitions inside the NixOS configuration. +::: + +Unfortunately, the Xorg server does not (currently) support setting a +keymap directly but relies instead on XKB rules to select the matching +components (keycodes, types, \...) of a layout. This means that +components other than symbols won\'t be loaded by default. As a +workaround, you can set the keymap using `setxkbmap` at the start of the +session with: + +```nix +services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; +``` + +If you are manually starting the X server, you should set the argument +`-xkbdir /etc/X11/xkb`, otherwise X won\'t find your layout files. For +example with `xinit` run + +```ShellSession +$ xinit -- -xkbdir /etc/X11/xkb +``` + +To learn how to write layouts take a look at the XKB [documentation +](https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts). +More example layouts can also be found [here +](https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples). diff --git a/nixpkgs/nixos/doc/manual/configuration/x-windows.xml b/nixpkgs/nixos/doc/manual/configuration/x-windows.xml deleted file mode 100644 index f9121508d7d4..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/x-windows.xml +++ /dev/null @@ -1,355 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-x11"> - <title>X Window System</title> - <para> - The X Window System (X11) provides the basis of NixOS’ graphical user - interface. It can be enabled as follows: -<programlisting> -<xref linkend="opt-services.xserver.enable"/> = true; -</programlisting> - The X server will automatically detect and use the appropriate video driver - from a set of X.org drivers (such as <literal>vesa</literal> and - <literal>intel</literal>). You can also specify a driver manually, e.g. -<programlisting> -<xref linkend="opt-services.xserver.videoDrivers"/> = [ "r128" ]; -</programlisting> - to enable X.org’s <literal>xf86-video-r128</literal> driver. - </para> - <para> - You also need to enable at least one desktop or window manager. Otherwise, - you can only log into a plain undecorated <command>xterm</command> window. - Thus you should pick one or more of the following lines: -<programlisting> -<xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true; -<xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true; -<xref linkend="opt-services.xserver.desktopManager.gnome.enable"/> = true; -<xref linkend="opt-services.xserver.desktopManager.mate.enable"/> = true; -<xref linkend="opt-services.xserver.windowManager.xmonad.enable"/> = true; -<xref linkend="opt-services.xserver.windowManager.twm.enable"/> = true; -<xref linkend="opt-services.xserver.windowManager.icewm.enable"/> = true; -<xref linkend="opt-services.xserver.windowManager.i3.enable"/> = true; -<xref linkend="opt-services.xserver.windowManager.herbstluftwm.enable"/> = true; -</programlisting> - </para> - <para> - NixOS’s default <emphasis>display manager</emphasis> (the program that - provides a graphical login prompt and manages the X server) is LightDM. You - can select an alternative one by picking one of the following lines: -<programlisting> -<xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true; -<xref linkend="opt-services.xserver.displayManager.gdm.enable"/> = true; -</programlisting> - </para> - <para> - You can set the keyboard layout (and optionally the layout variant): -<programlisting> -<xref linkend="opt-services.xserver.layout"/> = "de"; -<xref linkend="opt-services.xserver.xkbVariant"/> = "neo"; -</programlisting> - </para> - <para> - The X server is started automatically at boot time. If you don’t want this - to happen, you can set: -<programlisting> -<xref linkend="opt-services.xserver.autorun"/> = false; -</programlisting> - The X server can then be started manually: -<screen> -<prompt># </prompt>systemctl start display-manager.service -</screen> - </para> - <para> - On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, - you should also set the following: -<programlisting> -<xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true; -</programlisting> - </para> - <simplesect xml:id="sec-x11-auto-login"> - <title>Auto-login</title> - <para> - The x11 login screen can be skipped entirely, automatically logging you into - your window manager and desktop environment when you boot your computer. - </para> - <para> - This is especially helpful if you have disk encryption enabled. Since you - already have to provide a password to decrypt your disk, entering a second - password to login can be redundant. - </para> - <para> - To enable auto-login, you need to define your default window manager and - desktop environment. If you wanted no desktop environment and i3 as your your - window manager, you'd define: -<programlisting> -<xref linkend="opt-services.xserver.displayManager.defaultSession"/> = "none+i3"; -</programlisting> - Every display manager in NixOS supports auto-login, here is an example - using lightdm for a user <literal>alice</literal>: -<programlisting> -<xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = true; -<xref linkend="opt-services.xserver.displayManager.autoLogin.enable"/> = true; -<xref linkend="opt-services.xserver.displayManager.autoLogin.user"/> = "alice"; -</programlisting> - </para> - </simplesect> - <simplesect xml:id="sec-x11--graphics-cards-intel"> - <title>Intel Graphics drivers</title> - <para> - There are two choices for Intel Graphics drivers in X.org: - <literal>modesetting</literal> (included in the <package>xorg-server</package> itself) - and <literal>intel</literal> (provided by the package <package>xf86-video-intel</package>). - </para> - <para> - The default and recommended is <literal>modesetting</literal>. - It is a generic driver which uses the kernel - <link xlink:href="https://en.wikipedia.org/wiki/Mode_setting">mode setting</link> - (KMS) mechanism. It supports Glamor (2D graphics acceleration via OpenGL) - and is actively maintained but may perform worse in some cases (like in old chipsets). - </para> - <para> - The second driver, <literal>intel</literal>, is specific to Intel GPUs, - but not recommended by most distributions: it lacks several modern features - (for example, it doesn't support Glamor) and the package hasn't been officially - updated since 2015. - </para> - <para> - The results vary depending on the hardware, so you may have to try both drivers. - Use the option <xref linkend="opt-services.xserver.videoDrivers"/> to set one. - The recommended configuration for modern systems is: -<programlisting> - <xref linkend="opt-services.xserver.videoDrivers"/> = [ "modesetting" ]; - <xref linkend="opt-services.xserver.useGlamor"/> = true; -</programlisting> - If you experience screen tearing no matter what, this configuration was - reported to resolve the issue: -<programlisting> - <xref linkend="opt-services.xserver.videoDrivers"/> = [ "intel" ]; - <xref linkend="opt-services.xserver.deviceSection"/> = '' - Option "DRI" "2" - Option "TearFree" "true" - ''; -</programlisting> - Note that this will likely downgrade the performance compared to - <literal>modesetting</literal> or <literal>intel</literal> with DRI 3 (default). - </para> - </simplesect> - <simplesect xml:id="sec-x11-graphics-cards-nvidia"> - <title>Proprietary NVIDIA drivers</title> - <para> - NVIDIA provides a proprietary driver for its graphics cards that has better - 3D performance than the X.org drivers. It is not enabled by default because - it’s not free software. You can enable it as follows: -<programlisting> -<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidia" ]; -</programlisting> - Or if you have an older card, you may have to use one of the legacy drivers: -<programlisting> -<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy390" ]; -<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy340" ]; -<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy304" ]; -</programlisting> - You may need to reboot after enabling this driver to prevent a clash with - other kernel modules. - </para> - </simplesect> - <simplesect xml:id="sec-x11--graphics-cards-amd"> - <title>Proprietary AMD drivers</title> - <para> - AMD provides a proprietary driver for its graphics cards that is not - enabled by default because it’s not Free Software, is often broken - in nixpkgs and as of this writing doesn't offer more features or - performance. If you still want to use it anyway, you need to explicitly set: -<programlisting> -<xref linkend="opt-services.xserver.videoDrivers"/> = [ "amdgpu-pro" ]; -</programlisting> - You will need to reboot after enabling this driver to prevent a clash with - other kernel modules. - </para> - </simplesect> - <simplesect xml:id="sec-x11-touchpads"> - <title>Touchpads</title> - <para> - Support for Synaptics touchpads (found in many laptops such as the Dell - Latitude series) can be enabled as follows: -<programlisting> -<xref linkend="opt-services.xserver.libinput.enable"/> = true; -</programlisting> - The driver has many options (see <xref linkend="ch-options"/>). For - instance, the following disables tap-to-click behavior: -<programlisting> -<xref linkend="opt-services.xserver.libinput.touchpad.tapping"/> = false; -</programlisting> - Note: the use of <literal>services.xserver.synaptics</literal> is deprecated - since NixOS 17.09. - </para> - </simplesect> - <simplesect xml:id="sec-x11-gtk-and-qt-themes"> - <title>GTK/Qt themes</title> - <para> - GTK themes can be installed either to user profile or system-wide (via - <literal>environment.systemPackages</literal>). To make Qt 5 applications - look similar to GTK ones, you can use the following configuration: -<programlisting> -<xref linkend="opt-qt5.enable"/> = true; -<xref linkend="opt-qt5.platformTheme"/> = "gtk2"; -<xref linkend="opt-qt5.style"/> = "gtk2"; -</programlisting> - </para> - </simplesect> - <simplesect xml:id="custom-xkb-layouts"> - <title>Custom XKB layouts</title> - <para> - It is possible to install custom - <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension"> - XKB - </link> - keyboard layouts using the option - <option><link linkend="opt-services.xserver.extraLayouts"> - services.xserver.extraLayouts</link></option>. - </para> - <para> - As a first example, we are going to create a layout based on the basic US - layout, with an additional layer to type some greek symbols by pressing the - right-alt key. - </para> - <para> - Create a file called <literal>us-greek</literal> with the following - content (under a directory called <literal>symbols</literal>; it's - an XKB peculiarity that will help with testing): - </para> -<programlisting> -xkb_symbols "us-greek" -{ - include "us(basic)" // includes the base US keys - include "level3(ralt_switch)" // configures right alt as a third level switch - - key <LatA> { [ a, A, Greek_alpha ] }; - key <LatB> { [ b, B, Greek_beta ] }; - key <LatG> { [ g, G, Greek_gamma ] }; - key <LatD> { [ d, D, Greek_delta ] }; - key <LatZ> { [ z, Z, Greek_zeta ] }; -}; -</programlisting> - <para> - A minimal layout specification must include the following: - </para> -<programlisting> -<xref linkend="opt-services.xserver.extraLayouts"/>.us-greek = { - description = "US layout with alt-gr greek"; - languages = [ "eng" ]; - symbolsFile = /yourpath/symbols/us-greek; -}; -</programlisting> - <note> - <para> - The name (after <literal>extraLayouts.</literal>) should match the one given to the - <literal>xkb_symbols</literal> block. - </para> - </note> - <para> - Applying this customization requires rebuilding several packages, - and a broken XKB file can lead to the X session crashing at login. - Therefore, you're strongly advised to <emphasis role="strong">test - your layout before applying it</emphasis>: -<screen> -<prompt>$ </prompt>nix-shell -p xorg.xkbcomp -<prompt>$ </prompt>setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY -</screen> - </para> - <para> - You can inspect the predefined XKB files for examples: -<screen> -<prompt>$ </prompt>echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" -</screen> - </para> - <para> - Once the configuration is applied, and you did a logout/login - cycle, the layout should be ready to use. You can try it by e.g. - running <literal>setxkbmap us-greek</literal> and then type - <literal><alt>+a</literal> (it may not get applied in your - terminal straight away). To change the default, the usual - <option> - <link linkend="opt-services.xserver.layout"> - services.xserver.layout - </link> - </option> - option can still be used. - </para> - <para> - A layout can have several other components besides - <literal>xkb_symbols</literal>, for example we will define new - keycodes for some multimedia key and bind these to some symbol. - </para> - <para> - Use the <emphasis>xev</emphasis> utility from - <literal>pkgs.xorg.xev</literal> to find the codes of the keys of - interest, then create a <literal>media-key</literal> file to hold - the keycodes definitions - </para> -<programlisting> -xkb_keycodes "media" -{ - <volUp> = 123; - <volDown> = 456; -} -</programlisting> - <para> - Now use the newly define keycodes in <literal>media-sym</literal>: - </para> -<programlisting> -xkb_symbols "media" -{ - key.type = "ONE_LEVEL"; - key <volUp> { [ XF86AudioLowerVolume ] }; - key <volDown> { [ XF86AudioRaiseVolume ] }; -} -</programlisting> - <para> - As before, to install the layout do - </para> -<programlisting> -<xref linkend="opt-services.xserver.extraLayouts"/>.media = { - description = "Multimedia keys remapping"; - languages = [ "eng" ]; - symbolsFile = /path/to/media-key; - keycodesFile = /path/to/media-sym; -}; -</programlisting> - <note> - <para> - The function <literal>pkgs.writeText <filename> <content> - </literal> can be useful if you prefer to keep the layout definitions - inside the NixOS configuration. - </para> - </note> - <para> - Unfortunately, the Xorg server does not (currently) support setting a - keymap directly but relies instead on XKB rules to select the matching - components (keycodes, types, ...) of a layout. This means that components - other than symbols won't be loaded by default. As a workaround, you - can set the keymap using <literal>setxkbmap</literal> at the start of the - session with: - </para> -<programlisting> -<xref linkend="opt-services.xserver.displayManager.sessionCommands"/> = "setxkbmap -keycodes media"; -</programlisting> - <para> - If you are manually starting the X server, you should set the argument - <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X won't find your layout files. - For example with <command>xinit</command> run - <screen><prompt>$ </prompt>xinit -- -xkbdir /etc/X11/xkb</screen> - </para> - <para> - To learn how to write layouts take a look at the XKB - <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts"> - documentation - </link>. More example layouts can also be found - <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples"> - here - </link>. - </para> -</simplesect> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md b/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md new file mode 100644 index 000000000000..b0ef6682aae8 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md @@ -0,0 +1,52 @@ +# Xfce Desktop Environment {#sec-xfce} + +To enable the Xfce Desktop Environment, set + +```nix +services.xserver.desktopManager.xfce.enable = true; +services.xserver.displayManager.defaultSession = "xfce"; +``` + +Optionally, *picom* can be enabled for nice graphical effects, some +example settings: + +```nix +services.picom = { + enable = true; + fade = true; + inactiveOpacity = 0.9; + shadow = true; + fadeDelta = 4; +}; +``` + +Some Xfce programs are not installed automatically. To install them +manually (system wide), put them into your +[](#opt-environment.systemPackages) from `pkgs.xfce`. + +## Thunar Plugins {#sec-xfce-thunar-plugins .unnumbered} + +If you\'d like to add extra plugins to Thunar, add them to +[](#opt-services.xserver.desktopManager.xfce.thunarPlugins). +You shouldn\'t just add them to [](#opt-environment.systemPackages). + +## Troubleshooting {#sec-xfce-troubleshooting .unnumbered} + +Even after enabling udisks2, volume management might not work. Thunar +and/or the desktop takes time to show up. Thunar will spit out this kind +of message on start (look at `journalctl --user -b`). + +```plain +Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported +``` + +This is caused by some needed GNOME services not running. This is all +fixed by enabling \"Launch GNOME services on startup\" in the Advanced +tab of the Session and Startup settings panel. Alternatively, you can +run this command to do the same thing. + +```ShellSession +$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true +``` + +A log-out and re-log will be needed for this to take effect. diff --git a/nixpkgs/nixos/doc/manual/configuration/xfce.xml b/nixpkgs/nixos/doc/manual/configuration/xfce.xml deleted file mode 100644 index abcf5f648a48..000000000000 --- a/nixpkgs/nixos/doc/manual/configuration/xfce.xml +++ /dev/null @@ -1,59 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-xfce"> - <title>Xfce Desktop Environment</title> - <para> - To enable the Xfce Desktop Environment, set -<programlisting> -<xref linkend="opt-services.xserver.desktopManager.xfce.enable" /> = true; -<xref linkend="opt-services.xserver.displayManager.defaultSession" /> = "xfce"; -</programlisting> - </para> - <para> - Optionally, <emphasis>picom</emphasis> can be enabled for nice graphical - effects, some example settings: -<programlisting> -<link linkend="opt-services.picom.enable">services.picom</link> = { - <link linkend="opt-services.picom.enable">enable</link> = true; - <link linkend="opt-services.picom.fade">fade</link> = true; - <link linkend="opt-services.picom.inactiveOpacity">inactiveOpacity</link> = 0.9; - <link linkend="opt-services.picom.shadow">shadow</link> = true; - <link linkend="opt-services.picom.fadeDelta">fadeDelta</link> = 4; -}; -</programlisting> - </para> - <para> - Some Xfce programs are not installed automatically. To install them manually - (system wide), put them into your - <xref linkend="opt-environment.systemPackages"/> from <literal>pkgs.xfce</literal>. - </para> - <simplesect xml:id="sec-xfce-thunar-plugins"> - <title>Thunar Plugins</title> - <para> - If you'd like to add extra plugins to Thunar, add them to - <xref linkend="opt-services.xserver.desktopManager.xfce.thunarPlugins"/>. - You shouldn't just add them to <xref linkend="opt-environment.systemPackages"/>. - </para> - </simplesect> - <simplesect xml:id="sec-xfce-troubleshooting"> - <title>Troubleshooting</title> - <para> - Even after enabling udisks2, volume management might not work. Thunar and/or - the desktop takes time to show up. Thunar will spit out this kind of message - on start (look at <command>journalctl --user -b</command>). -<programlisting> -Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported -</programlisting> - This is caused by some needed GNOME services not running. This is all fixed - by enabling "Launch GNOME services on startup" in the Advanced tab of the - Session and Startup settings panel. Alternatively, you can run this command - to do the same thing. -<programlisting> -<prompt>$ </prompt>xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true -</programlisting> - A log-out and re-log will be needed for this to take effect. - </para> - </simplesect> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/development/building-parts.chapter.md b/nixpkgs/nixos/doc/manual/development/building-parts.chapter.md new file mode 100644 index 000000000000..79ddaa37140b --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/building-parts.chapter.md @@ -0,0 +1,74 @@ +# Building Specific Parts of NixOS {#sec-building-parts} + +With the command `nix-build`, you can build specific parts of your NixOS +configuration. This is done as follows: + +```ShellSession +$ cd /path/to/nixpkgs/nixos +$ nix-build -A config.option +``` + +where `option` is a NixOS option with type "derivation" (i.e. something +that can be built). Attributes of interest include: + +`system.build.toplevel` + +: The top-level option that builds the entire NixOS system. Everything + else in your configuration is indirectly pulled in by this option. + This is what `nixos-rebuild` builds and what `/run/current-system` + points to afterwards. + + A shortcut to build this is: + + ```ShellSession + $ nix-build -A system + ``` + +`system.build.manual.manualHTML` + +: The NixOS manual. + +`system.build.etc` + +: A tree of symlinks that form the static parts of `/etc`. + +`system.build.initialRamdisk` , `system.build.kernel` + +: The initial ramdisk and kernel of the system. This allows a quick + way to test whether the kernel and the initial ramdisk boot + correctly, by using QEMU's `-kernel` and `-initrd` options: + + ```ShellSession + $ nix-build -A config.system.build.initialRamdisk -o initrd + $ nix-build -A config.system.build.kernel -o kernel + $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null + ``` + +`system.build.nixos-rebuild` , `system.build.nixos-install` , `system.build.nixos-generate-config` + +: These build the corresponding NixOS commands. + +`systemd.units.unit-name.unit` + +: This builds the unit with the specified name. Note that since unit + names contain dots (e.g. `httpd.service`), you need to put them + between quotes, like this: + + ```ShellSession + $ nix-build -A 'config.systemd.units."httpd.service".unit' + ``` + + You can also test individual units, without rebuilding the whole + system, by putting them in `/run/systemd/system`: + + ```ShellSession + $ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ + /run/systemd/system/tmp-httpd.service + # systemctl daemon-reload + # systemctl start tmp-httpd.service + ``` + + Note that the unit must not have the same name as any unit in + `/etc/systemd/system` since those take precedence over + `/run/systemd/system`. That's why the unit is installed as + `tmp-httpd.service` here. diff --git a/nixpkgs/nixos/doc/manual/development/building-parts.xml b/nixpkgs/nixos/doc/manual/development/building-parts.xml deleted file mode 100644 index 88369fb891b3..000000000000 --- a/nixpkgs/nixos/doc/manual/development/building-parts.xml +++ /dev/null @@ -1,121 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-building-parts"> - <title>Building Specific Parts of NixOS</title> - <para> - With the command <command>nix-build</command>, you can build specific parts - of your NixOS configuration. This is done as follows: -<screen> -<prompt>$ </prompt>cd <replaceable>/path/to/nixpkgs/nixos</replaceable> -<prompt>$ </prompt>nix-build -A config.<replaceable>option</replaceable></screen> - where <replaceable>option</replaceable> is a NixOS option with type - “derivation” (i.e. something that can be built). Attributes of interest - include: - <variablelist> - <varlistentry> - <term> - <varname>system.build.toplevel</varname> - </term> - <listitem> - <para> - The top-level option that builds the entire NixOS system. Everything else - in your configuration is indirectly pulled in by this option. This is - what <command>nixos-rebuild</command> builds and what - <filename>/run/current-system</filename> points to afterwards. - </para> - <para> - A shortcut to build this is: -<screen> -<prompt>$ </prompt>nix-build -A system</screen> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>system.build.manual.manualHTML</varname> - </term> - <listitem> - <para> - The NixOS manual. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>system.build.etc</varname> - </term> - <listitem> - <para> - A tree of symlinks that form the static parts of - <filename>/etc</filename>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>system.build.initialRamdisk</varname> - </term> - <term> - <varname>system.build.kernel</varname> - </term> - <listitem> - <para> - The initial ramdisk and kernel of the system. This allows a quick way to - test whether the kernel and the initial ramdisk boot correctly, by using - QEMU’s <option>-kernel</option> and <option>-initrd</option> options: -<screen> -<prompt>$ </prompt>nix-build -A config.system.build.initialRamdisk -o initrd -<prompt>$ </prompt>nix-build -A config.system.build.kernel -o kernel -<prompt>$ </prompt>qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null -</screen> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>system.build.nixos-rebuild</varname> - </term> - <term> - <varname>system.build.nixos-install</varname> - </term> - <term> - <varname>system.build.nixos-generate-config</varname> - </term> - <listitem> - <para> - These build the corresponding NixOS commands. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname> - </term> - <listitem> - <para> - This builds the unit with the specified name. Note that since unit names - contain dots (e.g. <literal>httpd.service</literal>), you need to put - them between quotes, like this: -<screen> -<prompt>$ </prompt>nix-build -A 'config.systemd.units."httpd.service".unit' -</screen> - You can also test individual units, without rebuilding the whole system, - by putting them in <filename>/run/systemd/system</filename>: -<screen> -<prompt>$ </prompt>cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ - /run/systemd/system/tmp-httpd.service -<prompt># </prompt>systemctl daemon-reload -<prompt># </prompt>systemctl start tmp-httpd.service -</screen> - Note that the unit must not have the same name as any unit in - <filename>/etc/systemd/system</filename> since those take precedence over - <filename>/run/systemd/system</filename>. That’s why the unit is - installed as <filename>tmp-httpd.service</filename> here. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/development/development.xml b/nixpkgs/nixos/doc/manual/development/development.xml index eb505567962c..0b2ad60a878b 100644 --- a/nixpkgs/nixos/doc/manual/development/development.xml +++ b/nixpkgs/nixos/doc/manual/development/development.xml @@ -9,11 +9,11 @@ This chapter describes how you can modify and extend NixOS. </para> </partintro> - <xi:include href="sources.xml" /> - <xi:include href="writing-modules.xml" /> - <xi:include href="building-parts.xml" /> - <xi:include href="writing-documentation.xml" /> + <xi:include href="../from_md/development/sources.chapter.xml" /> + <xi:include href="../from_md/development/writing-modules.chapter.xml" /> + <xi:include href="../from_md/development/building-parts.chapter.xml" /> + <xi:include href="../from_md/development/writing-documentation.chapter.xml" /> <xi:include href="../from_md/development/building-nixos.chapter.xml" /> - <xi:include href="nixos-tests.xml" /> - <xi:include href="testing-installer.xml" /> + <xi:include href="../from_md/development/nixos-tests.chapter.xml" /> + <xi:include href="../from_md/development/testing-installer.chapter.xml" /> </part> diff --git a/nixpkgs/nixos/doc/manual/development/freeform-modules.section.md b/nixpkgs/nixos/doc/manual/development/freeform-modules.section.md new file mode 100644 index 000000000000..10e876b96d59 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/freeform-modules.section.md @@ -0,0 +1,79 @@ +# Freeform modules {#sec-freeform-modules} + +Freeform modules allow you to define values for option paths that have +not been declared explicitly. This can be used to add attribute-specific +types to what would otherwise have to be `attrsOf` options in order to +accept all attribute names. + +This feature can be enabled by using the attribute `freeformType` to +define a freeform type. By doing this, all assignments without an +associated option will be merged using the freeform type and combined +into the resulting `config` set. Since this feature nullifies name +checking for entire option trees, it is only recommended for use in +submodules. + +::: {#ex-freeform-module .example} +::: {.title} +**Example: Freeform submodule** +::: +The following shows a submodule assigning a freeform type that allows +arbitrary attributes with `str` values below `settings`, but also +declares an option for the `settings.port` attribute to have it +type-checked and assign a default value. See +[Example: Declaring a type-checked `settings` attribute](#ex-settings-typed-attrs) +for a more complete example. + +```nix +{ lib, config, ... }: { + + options.settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = with lib.types; attrsOf str; + + # We want this attribute to be checked for the correct type + options.port = lib.mkOption { + type = lib.types.port; + # Declaring the option also allows defining a default value + default = 8080; + }; + + }; + }; +} +``` + +And the following shows what such a module then allows + +```nix +{ + # Not a declared option, but the freeform type allows this + settings.logLevel = "debug"; + + # Not allowed because the the freeform type only allows strings + # settings.enable = true; + + # Allowed because there is a port option declared + settings.port = 80; + + # Not allowed because the port option doesn't allow strings + # settings.port = "443"; +} +``` +::: + +::: {.note} +Freeform attributes cannot depend on other attributes of the same set +without infinite recursion: + +```nix +{ + # This throws infinite recursion encountered + settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; +} +``` + +To prevent this, declare options for all attributes that need to depend +on others. For above example this means to declare `logLevel` to be an +option. +::: diff --git a/nixpkgs/nixos/doc/manual/development/freeform-modules.xml b/nixpkgs/nixos/doc/manual/development/freeform-modules.xml deleted file mode 100644 index 257e6b11bf01..000000000000 --- a/nixpkgs/nixos/doc/manual/development/freeform-modules.xml +++ /dev/null @@ -1,68 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-freeform-modules"> - <title>Freeform modules</title> - <para> - Freeform modules allow you to define values for option paths that have not been declared explicitly. This can be used to add attribute-specific types to what would otherwise have to be <literal>attrsOf</literal> options in order to accept all attribute names. - </para> - <para> - This feature can be enabled by using the attribute <literal>freeformType</literal> to define a freeform type. By doing this, all assignments without an associated option will be merged using the freeform type and combined into the resulting <literal>config</literal> set. Since this feature nullifies name checking for entire option trees, it is only recommended for use in submodules. - </para> - <example xml:id="ex-freeform-module"> - <title>Freeform submodule</title> - <para> - The following shows a submodule assigning a freeform type that allows arbitrary attributes with <literal>str</literal> values below <literal>settings</literal>, but also declares an option for the <literal>settings.port</literal> attribute to have it type-checked and assign a default value. See <xref linkend="ex-settings-typed-attrs"/> for a more complete example. - </para> - <programlisting> -{ lib, config, ... }: { - - options.settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = with lib.types; attrsOf str; - - # We want this attribute to be checked for the correct type - options.port = lib.mkOption { - type = lib.types.port; - # Declaring the option also allows defining a default value - default = 8080; - }; - - }; - }; -} - </programlisting> - <para> - And the following shows what such a module then allows - </para> - <programlisting> -{ - # Not a declared option, but the freeform type allows this - settings.logLevel = "debug"; - - # Not allowed because the the freeform type only allows strings - # settings.enable = true; - - # Allowed because there is a port option declared - settings.port = 80; - - # Not allowed because the port option doesn't allow strings - # settings.port = "443"; -} - </programlisting> - </example> - <note> - <para> - Freeform attributes cannot depend on other attributes of the same set without infinite recursion: -<programlisting> -{ - # This throws infinite recursion encountered - settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; -} -</programlisting> - To prevent this, declare options for all attributes that need to depend on others. For above example this means to declare <literal>logLevel</literal> to be an option. - </para> - </note> -</section> diff --git a/nixpkgs/nixos/doc/manual/development/importing-modules.section.md b/nixpkgs/nixos/doc/manual/development/importing-modules.section.md new file mode 100644 index 000000000000..65d78959b8e0 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/importing-modules.section.md @@ -0,0 +1,46 @@ +# Importing Modules {#sec-importing-modules} + +Sometimes NixOS modules need to be used in configuration but exist +outside of Nixpkgs. These modules can be imported: + +```nix +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} +``` + +The environment variable `NIXOS_EXTRA_MODULE_PATH` is an absolute path +to a NixOS module that is included alongside the Nixpkgs NixOS modules. +Like any NixOS module, this module can import additional modules: + +```nix +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] +``` + +```nix +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } +``` + +```nix +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} +``` diff --git a/nixpkgs/nixos/doc/manual/development/importing-modules.xml b/nixpkgs/nixos/doc/manual/development/importing-modules.xml deleted file mode 100644 index 1c6a5671eda8..000000000000 --- a/nixpkgs/nixos/doc/manual/development/importing-modules.xml +++ /dev/null @@ -1,56 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-importing-modules"> - <title>Importing Modules</title> - - <para> - Sometimes NixOS modules need to be used in configuration but exist outside of - Nixpkgs. These modules can be imported: - </para> - -<programlisting> -{ config, lib, pkgs, ... }: - -{ - imports = - [ # Use a locally-available module definition in - # ./example-module/default.nix - ./example-module - ]; - - services.exampleModule.enable = true; -} -</programlisting> - - <para> - The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is an - absolute path to a NixOS module that is included alongside the Nixpkgs NixOS - modules. Like any NixOS module, this module can import additional modules: - </para> - -<programlisting> -# ./module-list/default.nix -[ - ./example-module1 - ./example-module2 -] -</programlisting> - -<programlisting> -# ./extra-module/default.nix -{ imports = import ./module-list.nix; } -</programlisting> - -<programlisting> -# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module -{ config, lib, pkgs, ... }: - -{ - # No `imports` needed - - services.exampleModule1.enable = true; -} -</programlisting> -</section> diff --git a/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md b/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md new file mode 100644 index 000000000000..ca4ba007f7dc --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md @@ -0,0 +1,40 @@ +# Meta Attributes {#sec-meta-attributes} + +Like Nix packages, NixOS modules can declare meta-attributes to provide +extra information. Module meta attributes are defined in the `meta.nix` +special module. + +`meta` is a top level attribute like `options` and `config`. Available +meta-attributes are `maintainers` and `doc`. + +Each of the meta-attributes must be defined at most once per module +file. + +```nix +{ config, lib, pkgs, ... }: +{ + options = { + ... + }; + + config = { + ... + }; + + meta = { + maintainers = with lib.maintainers; [ ericsagnes ]; + doc = ./default.xml; + }; +} +``` + +- `maintainers` contains a list of the module maintainers. + +- `doc` points to a valid DocBook file containing the module + documentation. Its contents is automatically added to + [](#ch-configuration). Changes to a module documentation have to + be checked to not break building the NixOS manual: + + ```ShellSession + $ nix-build nixos/release.nix -A manual.x86_64-linux + ``` diff --git a/nixpkgs/nixos/doc/manual/development/meta-attributes.xml b/nixpkgs/nixos/doc/manual/development/meta-attributes.xml deleted file mode 100644 index c40be0a50c36..000000000000 --- a/nixpkgs/nixos/doc/manual/development/meta-attributes.xml +++ /dev/null @@ -1,63 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-meta-attributes"> - <title>Meta Attributes</title> - - <para> - Like Nix packages, NixOS modules can declare meta-attributes to provide extra - information. Module meta attributes are defined in the - <filename - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename> - special module. - </para> - - <para> - <literal>meta</literal> is a top level attribute like - <literal>options</literal> and <literal>config</literal>. Available - meta-attributes are <literal>maintainers</literal> and - <literal>doc</literal>. - </para> - - <para> - Each of the meta-attributes must be defined at most once per module file. - </para> - -<programlisting> -{ config, lib, pkgs, ... }: -{ - options = { - ... - }; - - config = { - ... - }; - - meta = { - maintainers = with lib.maintainers; [ ericsagnes ]; <co - xml:id='modules-meta-1' /> - doc = ./default.xml; <co xml:id='modules-meta-2' /> - }; -} -</programlisting> - - <calloutlist> - <callout arearefs='modules-meta-1'> - <para> - <varname>maintainers</varname> contains a list of the module maintainers. - </para> - </callout> - <callout arearefs='modules-meta-2'> - <para> - <varname>doc</varname> points to a valid DocBook file containing the module - documentation. Its contents is automatically added to - <xref - linkend="ch-configuration"/>. Changes to a module documentation - have to be checked to not break building the NixOS manual: - </para> -<screen><prompt>$ </prompt>nix-build nixos/release.nix -A manual.x86_64-linux</screen> - </callout> - </calloutlist> -</section> diff --git a/nixpkgs/nixos/doc/manual/development/nixos-tests.chapter.md b/nixpkgs/nixos/doc/manual/development/nixos-tests.chapter.md new file mode 100644 index 000000000000..2a4fdddeaa66 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/nixos-tests.chapter.md @@ -0,0 +1,13 @@ +# NixOS Tests {#sec-nixos-tests} + +When you add some feature to NixOS, you should write a test for it. +NixOS tests are kept in the directory `nixos/tests`, and are executed +(using Nix) by a testing framework that automatically starts one or more +virtual machines containing the NixOS system(s) required for the test. + +```{=docbook} +<xi:include href="writing-nixos-tests.section.xml" /> +<xi:include href="running-nixos-tests.section.xml" /> +<xi:include href="running-nixos-tests-interactively.section.xml" /> +<xi:include href="linking-nixos-tests-to-packages.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/development/nixos-tests.xml b/nixpkgs/nixos/doc/manual/development/nixos-tests.xml deleted file mode 100644 index 67dc09fc715f..000000000000 --- a/nixpkgs/nixos/doc/manual/development/nixos-tests.xml +++ /dev/null @@ -1,20 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-nixos-tests"> - <title>NixOS Tests</title> - <para> - When you add some feature to NixOS, you should write a test for it. NixOS - tests are kept in the directory - <filename -xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>, - and are executed (using Nix) by a testing framework that automatically starts - one or more virtual machines containing the NixOS system(s) required for the - test. - </para> - <xi:include href="../from_md/development/writing-nixos-tests.section.xml" /> - <xi:include href="../from_md/development/running-nixos-tests.section.xml" /> - <xi:include href="../from_md/development/running-nixos-tests-interactively.section.xml" /> - <xi:include href="../from_md/development/linking-nixos-tests-to-packages.section.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/nixpkgs/nixos/doc/manual/development/option-declarations.section.md new file mode 100644 index 000000000000..819c23684cdf --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/option-declarations.section.md @@ -0,0 +1,136 @@ +# Option Declarations {#sec-option-declarations} + +An option declaration specifies the name, type and description of a +NixOS configuration option. It is invalid to define an option that +hasn't been declared in any module. An option declaration generally +looks like this: + +```nix +options = { + name = mkOption { + type = type specification; + default = default value; + example = example value; + description = "Description for use in the NixOS manual."; + }; +}; +``` + +The attribute names within the `name` attribute path must be camel +cased in general but should, as an exception, match the [ package +attribute name](https://nixos.org/nixpkgs/manual/#sec-package-naming) +when referencing a Nixpkgs package. For example, the option +`services.nix-serve.bindAddress` references the `nix-serve` Nixpkgs +package. + +The function `mkOption` accepts the following arguments. + +`type` + +: The type of the option (see [](#sec-option-types)). It may be + omitted, but that's not advisable since it may lead to errors that + are hard to diagnose. + +`default` + +: The default value used if no value is defined by any module. A + default is not required; but if a default is not given, then users + of the module will have to define the value of the option, otherwise + an error will be thrown. + +`example` + +: An example value that will be shown in the NixOS manual. + +`description` + +: A textual description of the option, in DocBook format, that will be + included in the NixOS manual. + +## Extensible Option Types {#sec-option-declarations-eot} + +Extensible option types is a feature that allow to extend certain types +declaration through multiple module files. This feature only work with a +restricted set of types, namely `enum` and `submodules` and any composed +forms of them. + +Extensible option types can be used for `enum` options that affects +multiple modules, or as an alternative to related `enable` options. + +As an example, we will take the case of display managers. There is a +central display manager module for generic display manager options and a +module file per display manager backend (sddm, gdm \...). + +There are two approach to this module structure: + +- Managing the display managers independently by adding an enable + option to every display manager module backend. (NixOS) + +- Managing the display managers in the central module by adding an + option to select which display manager backend to use. + +Both approaches have problems. + +Making backends independent can quickly become hard to manage. For +display managers, there can be only one enabled at a time, but the type +system can not enforce this restriction as there is no relation between +each backend `enable` option. As a result, this restriction has to be +done explicitely by adding assertions in each display manager backend +module. + +On the other hand, managing the display managers backends in the central +module will require to change the central module option every time a new +backend is added or removed. + +By using extensible option types, it is possible to create a placeholder +option in the central module +([Example: Extensible type placeholder in the service module](#ex-option-declaration-eot-service)), +and to extend it in each backend module +([Example: Extending `services.xserver.displayManager.enable` in the `gdm` module](#ex-option-declaration-eot-backend-gdm), +[Example: Extending `services.xserver.displayManager.enable` in the `sddm` module](#ex-option-declaration-eot-backend-sddm)). + +As a result, `displayManager.enable` option values can be added without +changing the main service module file and the type system automatically +enforce that there can only be a single display manager enabled. + +::: {#ex-option-declaration-eot-service .example} +::: {.title} +**Example: Extensible type placeholder in the service module** +::: +```nix +services.xserver.displayManager.enable = mkOption { + description = "Display manager to use"; + type = with types; nullOr (enum [ ]); +}; +``` +::: + +::: {#ex-option-declaration-eot-backend-gdm .example} +::: {.title} +**Example: Extending `services.xserver.displayManager.enable` in the `gdm` module** +::: +```nix +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "gdm" ]); +}; +``` +::: + +::: {#ex-option-declaration-eot-backend-sddm .example} +::: {.title} +**Example: Extending `services.xserver.displayManager.enable` in the `sddm` module** +::: +```nix +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "sddm" ]); +}; +``` +::: + +The placeholder declaration is a standard `mkOption` declaration, but it +is important that extensible option declarations only use the `type` +argument. + +Extensible option types work with any of the composed variants of `enum` +such as `with types; nullOr (enum [ "foo" "bar" ])` or `with types; +listOf (enum [ "foo" "bar" ])`. diff --git a/nixpkgs/nixos/doc/manual/development/option-declarations.xml b/nixpkgs/nixos/doc/manual/development/option-declarations.xml deleted file mode 100644 index 56ebf4816306..000000000000 --- a/nixpkgs/nixos/doc/manual/development/option-declarations.xml +++ /dev/null @@ -1,199 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-option-declarations"> - <title>Option Declarations</title> - - <para> - An option declaration specifies the name, type and description of a NixOS - configuration option. It is invalid to define an option that hasn’t been - declared in any module. An option declaration generally looks like this: -<programlisting> -options = { - <replaceable>name</replaceable> = mkOption { - type = <replaceable>type specification</replaceable>; - default = <replaceable>default value</replaceable>; - example = <replaceable>example value</replaceable>; - description = "<replaceable>Description for use in the NixOS manual.</replaceable>"; - }; -}; -</programlisting> - The attribute names within the <replaceable>name</replaceable> attribute path - must be camel cased in general but should, as an exception, match the - <link -xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> - package attribute name</link> when referencing a Nixpkgs package. For - example, the option <varname>services.nix-serve.bindAddress</varname> - references the <varname>nix-serve</varname> Nixpkgs package. - </para> - - <para> - The function <varname>mkOption</varname> accepts the following arguments. - <variablelist> - <varlistentry> - <term> - <varname>type</varname> - </term> - <listitem> - <para> - The type of the option (see <xref linkend='sec-option-types' />). It may - be omitted, but that’s not advisable since it may lead to errors that - are hard to diagnose. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>default</varname> - </term> - <listitem> - <para> - The default value used if no value is defined by any module. A default is - not required; but if a default is not given, then users of the module - will have to define the value of the option, otherwise an error will be - thrown. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>example</varname> - </term> - <listitem> - <para> - An example value that will be shown in the NixOS manual. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>description</varname> - </term> - <listitem> - <para> - A textual description of the option, in DocBook format, that will be - included in the NixOS manual. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - - <section xml:id="sec-option-declarations-eot"> - <title>Extensible Option Types</title> - - <para> - Extensible option types is a feature that allow to extend certain types - declaration through multiple module files. This feature only work with a - restricted set of types, namely <literal>enum</literal> and - <literal>submodules</literal> and any composed forms of them. - </para> - - <para> - Extensible option types can be used for <literal>enum</literal> options that - affects multiple modules, or as an alternative to related - <literal>enable</literal> options. - </para> - - <para> - As an example, we will take the case of display managers. There is a central - display manager module for generic display manager options and a module file - per display manager backend (sddm, gdm ...). - </para> - - <para> - There are two approach to this module structure: - <itemizedlist> - <listitem> - <para> - Managing the display managers independently by adding an enable option to - every display manager module backend. (NixOS) - </para> - </listitem> - <listitem> - <para> - Managing the display managers in the central module by adding an option - to select which display manager backend to use. - </para> - </listitem> - </itemizedlist> - </para> - - <para> - Both approaches have problems. - </para> - - <para> - Making backends independent can quickly become hard to manage. For display - managers, there can be only one enabled at a time, but the type system can - not enforce this restriction as there is no relation between each backend - <literal>enable</literal> option. As a result, this restriction has to be - done explicitely by adding assertions in each display manager backend - module. - </para> - - <para> - On the other hand, managing the display managers backends in the central - module will require to change the central module option every time a new - backend is added or removed. - </para> - - <para> - By using extensible option types, it is possible to create a placeholder - option in the central module - (<xref linkend='ex-option-declaration-eot-service' - />), and to extend - it in each backend module - (<xref - linkend='ex-option-declaration-eot-backend-gdm' />, - <xref - linkend='ex-option-declaration-eot-backend-sddm' />). - </para> - - <para> - As a result, <literal>displayManager.enable</literal> option values can be - added without changing the main service module file and the type system - automatically enforce that there can only be a single display manager - enabled. - </para> - - <example xml:id='ex-option-declaration-eot-service'> - <title>Extensible type placeholder in the service module</title> -<screen> -services.xserver.displayManager.enable = mkOption { - description = "Display manager to use"; - type = with types; nullOr (enum [ ]); -};</screen> - </example> - - <example xml:id='ex-option-declaration-eot-backend-gdm'> - <title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>gdm</literal> module</title> -<screen> -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "gdm" ]); -};</screen> - </example> - - <example xml:id='ex-option-declaration-eot-backend-sddm'> - <title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>sddm</literal> module</title> -<screen> -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "sddm" ]); -};</screen> - </example> - - <para> - The placeholder declaration is a standard <literal>mkOption</literal> - declaration, but it is important that extensible option declarations only - use the <literal>type</literal> argument. - </para> - - <para> - Extensible option types work with any of the composed variants of - <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo" - "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar" - ])</literal>. - </para> - </section> -</section> diff --git a/nixpkgs/nixos/doc/manual/development/option-def.section.md b/nixpkgs/nixos/doc/manual/development/option-def.section.md new file mode 100644 index 000000000000..91b24cd4a3a1 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/option-def.section.md @@ -0,0 +1,91 @@ +# Option Definitions {#sec-option-definitions} + +Option definitions are generally straight-forward bindings of values to +option names, like + +```nix +config = { + services.httpd.enable = true; +}; +``` + +However, sometimes you need to wrap an option definition or set of +option definitions in a *property* to achieve certain effects: + +## Delaying Conditionals {#sec-option-definitions-delaying-conditionals .unnumbered} + +If a set of option definitions is conditional on the value of another +option, you may need to use `mkIf`. Consider, for instance: + +```nix +config = if config.services.httpd.enable then { + environment.systemPackages = [ ... ]; + ... +} else {}; +``` + +This definition will cause Nix to fail with an "infinite recursion" +error. Why? Because the value of `config.services.httpd.enable` depends +on the value being constructed here. After all, you could also write the +clearly circular and contradictory: + +```nix +config = if config.services.httpd.enable then { + services.httpd.enable = false; +} else { + services.httpd.enable = true; +}; +``` + +The solution is to write: + +```nix +config = mkIf config.services.httpd.enable { + environment.systemPackages = [ ... ]; + ... +}; +``` + +The special function `mkIf` causes the evaluation of the conditional to +be "pushed down" into the individual definitions, as if you had written: + +```nix +config = { + environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; + ... +}; +``` + +## Setting Priorities {#sec-option-definitions-setting-priorities .unnumbered} + +A module can override the definitions of an option in other modules by +setting a *priority*. All option definitions that do not have the lowest +priority value are discarded. By default, option definitions have +priority 1000. You can specify an explicit priority by using +`mkOverride`, e.g. + +```nix +services.openssh.enable = mkOverride 10 false; +``` + +This definition causes all other definitions with priorities above 10 to +be discarded. The function `mkForce` is equal to `mkOverride 50`. + +## Merging Configurations {#sec-option-definitions-merging .unnumbered} + +In conjunction with `mkIf`, it is sometimes useful for a module to +return multiple sets of option definitions, to be merged together as if +they were declared in separate modules. This can be done using +`mkMerge`: + +```nix +config = mkMerge + [ # Unconditional stuff. + { environment.systemPackages = [ ... ]; + } + # Conditional stuff. + (mkIf config.services.bla.enable { + environment.systemPackages = [ ... ]; + }) + ]; +``` diff --git a/nixpkgs/nixos/doc/manual/development/option-def.xml b/nixpkgs/nixos/doc/manual/development/option-def.xml deleted file mode 100644 index 50a705d0cb8e..000000000000 --- a/nixpkgs/nixos/doc/manual/development/option-def.xml +++ /dev/null @@ -1,99 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-option-definitions"> - <title>Option Definitions</title> - - <para> - Option definitions are generally straight-forward bindings of values to - option names, like -<programlisting> -config = { - services.httpd.enable = true; -}; -</programlisting> - However, sometimes you need to wrap an option definition or set of option - definitions in a <emphasis>property</emphasis> to achieve certain effects: - </para> - - <simplesect xml:id="sec-option-definitions-delaying-conditionals"> - <title>Delaying Conditionals</title> - <para> - If a set of option definitions is conditional on the value of another - option, you may need to use <varname>mkIf</varname>. Consider, for instance: -<programlisting> -config = if config.services.httpd.enable then { - environment.systemPackages = [ <replaceable>...</replaceable> ]; - <replaceable>...</replaceable> -} else {}; -</programlisting> - This definition will cause Nix to fail with an “infinite recursion” - error. Why? Because the value of - <option>config.services.httpd.enable</option> depends on the value being - constructed here. After all, you could also write the clearly circular and - contradictory: -<programlisting> -config = if config.services.httpd.enable then { - services.httpd.enable = false; -} else { - services.httpd.enable = true; -}; -</programlisting> - The solution is to write: -<programlisting> -config = mkIf config.services.httpd.enable { - environment.systemPackages = [ <replaceable>...</replaceable> ]; - <replaceable>...</replaceable> -}; -</programlisting> - The special function <varname>mkIf</varname> causes the evaluation of the - conditional to be “pushed down” into the individual definitions, as if - you had written: -<programlisting> -config = { - environment.systemPackages = if config.services.httpd.enable then [ <replaceable>...</replaceable> ] else []; - <replaceable>...</replaceable> -}; -</programlisting> - </para> - </simplesect> - - <simplesect xml:id="sec-option-definitions-setting-priorities"> - <title>Setting Priorities</title> - <para> - A module can override the definitions of an option in other modules by - setting a <emphasis>priority</emphasis>. All option definitions that do not - have the lowest priority value are discarded. By default, option definitions - have priority 1000. You can specify an explicit priority by using - <varname>mkOverride</varname>, e.g. -<programlisting> -services.openssh.enable = mkOverride 10 false; -</programlisting> - This definition causes all other definitions with priorities above 10 to be - discarded. The function <varname>mkForce</varname> is equal to - <varname>mkOverride 50</varname>. - </para> - </simplesect> - - <simplesect xml:id="sec-option-definitions-merging"> - <title>Merging Configurations</title> - <para> - In conjunction with <literal>mkIf</literal>, it is sometimes useful for a - module to return multiple sets of option definitions, to be merged together - as if they were declared in separate modules. This can be done using - <varname>mkMerge</varname>: -<programlisting> -config = mkMerge - [ # Unconditional stuff. - { environment.systemPackages = [ <replaceable>...</replaceable> ]; - } - # Conditional stuff. - (mkIf config.services.bla.enable { - environment.systemPackages = [ <replaceable>...</replaceable> ]; - }) - ]; -</programlisting> - </para> - </simplesect> -</section> diff --git a/nixpkgs/nixos/doc/manual/development/option-types.section.md b/nixpkgs/nixos/doc/manual/development/option-types.section.md new file mode 100644 index 000000000000..ed557206659f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/option-types.section.md @@ -0,0 +1,558 @@ +# Options Types {#sec-option-types} + +Option types are a way to put constraints on the values a module option +can take. Types are also responsible of how values are merged in case of +multiple value definitions. + +## Basic Types {#sec-option-types-basic} + +Basic types are the simplest available types in the module system. Basic +types include multiple string types that mainly differ in how definition +merging is handled. + +`types.bool` + +: A boolean, its values can be `true` or `false`. + +`types.path` + +: A filesystem path, defined as anything that when coerced to a string + starts with a slash. Even if derivations can be considered as path, + the more specific `types.package` should be preferred. + +`types.package` + +: A derivation or a store path. + +`types.anything` + +: A type that accepts any value and recursively merges attribute sets + together. This type is recommended when the option type is unknown. + + ::: {#ex-types-anything .example} + ::: {.title} + **Example: `types.anything` Example** + ::: + Two definitions of this type like + + ```nix + { + str = lib.mkDefault "foo"; + pkg.hello = pkgs.hello; + fun.fun = x: x + 1; + } + ``` + + ```nix + { + str = lib.mkIf true "bar"; + pkg.gcc = pkgs.gcc; + fun.fun = lib.mkForce (x: x + 2); + } + ``` + + will get merged to + + ```nix + { + str = "bar"; + pkg.gcc = pkgs.gcc; + pkg.hello = pkgs.hello; + fun.fun = x: x + 2; + } + ``` + ::: + +`types.attrs` + +: A free-form attribute set. + + ::: {.warning} + This type will be deprecated in the future because it doesn\'t + recurse into attribute sets, silently drops earlier attribute + definitions, and doesn\'t discharge `lib.mkDefault`, `lib.mkIf` + and co. For allowing arbitrary attribute sets, prefer + `types.attrsOf types.anything` instead which doesn\'t have these + problems. + ::: + +Integer-related types: + +`types.int` + +: A signed integer. + +`types.ints.{s8, s16, s32}` + +: Signed integers with a fixed length (8, 16 or 32 bits). They go from + −2^n/2 to + 2^n/2−1 respectively (e.g. `−128` to + `127` for 8 bits). + +`types.ints.unsigned` + +: An unsigned integer (that is >= 0). + +`types.ints.{u8, u16, u32}` + +: Unsigned integers with a fixed length (8, 16 or 32 bits). They go + from 0 to 2^n−1 respectively (e.g. `0` + to `255` for 8 bits). + +`types.ints.positive` + +: A positive integer (that is > 0). + +`types.port` + +: A port number. This type is an alias to + `types.ints.u16`. + +String-related types: + +`types.str` + +: A string. Multiple definitions cannot be merged. + +`types.lines` + +: A string. Multiple definitions are concatenated with a new line + `"\n"`. + +`types.commas` + +: A string. Multiple definitions are concatenated with a comma `","`. + +`types.envVar` + +: A string. Multiple definitions are concatenated with a collon `":"`. + +`types.strMatching` + +: A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is processed + using `builtins.match`. + +## Value Types {#sec-option-types-value} + +Value types are types that take a value parameter. + +`types.enum` *`l`* + +: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`. + Multiple definitions cannot be merged. + +`types.separatedString` *`sep`* + +: A string with a custom separator *`sep`*, e.g. + `types.separatedString "|"`. + +`types.ints.between` *`lowest highest`* + +: An integer between *`lowest`* and *`highest`* (both inclusive). Useful + for creating types like `types.port`. + +`types.submodule` *`o`* + +: A set of sub options *`o`*. *`o`* can be an attribute set, a function + returning an attribute set, or a path to a file containing such a + value. Submodules are used in composed types to create modular + options. This is equivalent to + `types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }`. + Submodules are detailed in [Submodule](#section-option-types-submodule). + +`types.submoduleWith` { *`modules`*, *`specialArgs`* ? {}, *`shorthandOnlyDefinesConfig`* ? false } + +: Like `types.submodule`, but more flexible and with better defaults. + It has parameters + + - *`modules`* A list of modules to use by default for this + submodule type. This gets combined with all option definitions + to build the final list of modules that will be included. + + ::: {.note} + Only options defined with this argument are included in rendered + documentation. + ::: + + - *`specialArgs`* An attribute set of extra arguments to be passed + to the module functions. The option `_module.args` should be + used instead for most arguments since it allows overriding. + *`specialArgs`* should only be used for arguments that can\'t go + through the module fixed-point, because of infinite recursion or + other problems. An example is overriding the `lib` argument, + because `lib` itself is used to define `_module.args`, which + makes using `_module.args` to define it impossible. + + - *`shorthandOnlyDefinesConfig`* Whether definitions of this type + should default to the `config` section of a module (see + [Example: Structure of NixOS Modules](#ex-module-syntax)) + if it is an attribute set. Enabling this only has a benefit + when the submodule defines an option named `config` or `options`. + In such a case it would allow the option to be set with + `the-submodule.config = "value"` instead of requiring + `the-submodule.config.config = "value"`. This is because + only when modules *don\'t* set the `config` or `options` + keys, all keys are interpreted as option definitions in the + `config` section. Enabling this option implicitly puts all + attributes in the `config` section. + + With this option enabled, defining a non-`config` section + requires using a function: + `the-submodule = { ... }: { options = { ... }; }`. + +## Composed Types {#sec-option-types-composed} + +Composed types are types that take a type as parameter. `listOf + int` and `either int str` are examples of composed types. + +`types.listOf` *`t`* + +: A list of *`t`* type, e.g. `types.listOf + int`. Multiple definitions are merged with list concatenation. + +`types.attrsOf` *`t`* + +: An attribute set of where all the values are of *`t`* type. Multiple + definitions result in the joined attribute set. + + ::: {.note} + This type is *strict* in its values, which in turn means attributes + cannot depend on other attributes. See ` + types.lazyAttrsOf` for a lazy version. + ::: + +`types.lazyAttrsOf` *`t`* + +: An attribute set of where all the values are of *`t`* type. Multiple + definitions result in the joined attribute set. This is the lazy + version of `types.attrsOf + `, allowing attributes to depend on each other. + + ::: {.warning} + This version does not fully support conditional definitions! With an + option `foo` of this type and a definition + `foo.attr = lib.mkIf false 10`, evaluating `foo ? attr` will return + `true` even though it should be false. Accessing the value will then + throw an error. For types *`t`* that have an `emptyValue` defined, + that value will be returned instead of throwing an error. So if the + type of `foo.attr` was `lazyAttrsOf (nullOr int)`, `null` would be + returned instead for the same `mkIf false` definition. + ::: + +`types.nullOr` *`t`* + +: `null` or type *`t`*. Multiple definitions are merged according to + type *`t`*. + +`types.uniq` *`t`* + +: Ensures that type *`t`* cannot be merged. It is used to ensure option + definitions are declared only once. + +`types.either` *`t1 t2`* + +: Type *`t1`* or type *`t2`*, e.g. `with types; either int str`. + Multiple definitions cannot be merged. + +`types.oneOf` \[ *`t1 t2`* \... \] + +: Type *`t1`* or type *`t2`* and so forth, e.g. + `with types; oneOf [ int str bool ]`. Multiple definitions cannot be + merged. + +`types.coercedTo` *`from f to`* + +: Type *`to`* or type *`from`* which will be coerced to type *`to`* using + function *`f`* which takes an argument of type *`from`* and return a + value of type *`to`*. Can be used to preserve backwards compatibility + of an option if its type was changed. + +## Submodule {#section-option-types-submodule} + +`submodule` is a very powerful type that defines a set of sub-options +that are handled like a separate module. + +It takes a parameter *`o`*, that should be a set, or a function returning +a set with an `options` key defining the sub-options. Submodule option +definitions are type-checked accordingly to the `options` declarations. +Of course, you can nest submodule option definitons for even higher +modularity. + +The option set can be defined directly +([Example: Directly defined submodule](#ex-submodule-direct)) or as reference +([Example: Submodule defined as a reference](#ex-submodule-reference)). + +::: {#ex-submodule-direct .example} +::: {.title} +**Example: Directly defined submodule** +::: +```nix +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }; +}; +``` +::: + +::: {#ex-submodule-reference .example} +::: {.title} +**Example: Submodule defined as a reference** +::: +```nix +let + modOptions = { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = int; + }; + }; + }; +in +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule modOptions; +}; +``` +::: + +The `submodule` type is especially interesting when used with composed +types like `attrsOf` or `listOf`. When composed with `listOf` +([Example: Declaration of a list of submodules](#ex-submodule-listof-declaration)), `submodule` allows +multiple definitions of the submodule option set +([Example: Definition of a list of submodules](#ex-submodule-listof-definition)). + +::: {#ex-submodule-listof-declaration .example} +::: {.title} +**Example: Declaration of a list of submodules** +::: +```nix +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; +``` +::: + +::: {#ex-submodule-listof-definition .example} +::: {.title} +**Example: Definition of a list of submodules** +::: +```nix +config.mod = [ + { foo = 1; bar = "one"; } + { foo = 2; bar = "two"; } +]; +``` +::: + +When composed with `attrsOf` +([Example: Declaration of attribute sets of submodules](#ex-submodule-attrsof-declaration)), `submodule` allows +multiple named definitions of the submodule option set +([Example: Definition of attribute sets of submodules](#ex-submodule-attrsof-definition)). + +::: {#ex-submodule-attrsof-declaration .example} +::: {.title} +**Example: Declaration of attribute sets of submodules** +::: +```nix +options.mod = mkOption { + description = "submodule example"; + type = with types; attrsOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; +``` +::: + +::: {#ex-submodule-attrsof-definition .example} +::: {.title} +**Example: Definition of attribute sets of submodules** +::: +```nix +config.mod.one = { foo = 1; bar = "one"; }; +config.mod.two = { foo = 2; bar = "two"; }; +``` +::: + +## Extending types {#sec-option-types-extending} + +Types are mainly characterized by their `check` and `merge` functions. + +`check` + +: The function to type check the value. Takes a value as parameter and + return a boolean. It is possible to extend a type check with the + `addCheck` function ([Example: Adding a type check](#ex-extending-type-check-1)), + or to fully override the check function + ([Example: Overriding a type check](#ex-extending-type-check-2)). + + ::: {#ex-extending-type-check-1 .example} + ::: {.title} + **Example: Adding a type check** + ::: + ```nix + byte = mkOption { + description = "An integer between 0 and 255."; + type = types.addCheck types.int (x: x >= 0 && x <= 255); + }; + ``` + ::: + + ::: {#ex-extending-type-check-2 .example} + ::: {.title} + **Example: Overriding a type check** + ::: + ```nix + nixThings = mkOption { + description = "words that start with 'nix'"; + type = types.str // { + check = (x: lib.hasPrefix "nix" x) + }; + }; + ``` + ::: + +`merge` + +: Function to merge the options values when multiple values are set. + The function takes two parameters, `loc` the option path as a list + of strings, and `defs` the list of defined values as a list. It is + possible to override a type merge function for custom needs. + +## Custom Types {#sec-option-types-custom} + +Custom types can be created with the `mkOptionType` function. As type +creation includes some more complex topics such as submodule handling, +it is recommended to get familiar with `types.nix` code before creating +a new type. + +The only required parameter is `name`. + +`name` + +: A string representation of the type function name. + +`definition` + +: Description of the type used in documentation. Give information of + the type and any of its arguments. + +`check` + +: A function to type check the definition value. Takes the definition + value as a parameter and returns a boolean indicating the type check + result, `true` for success and `false` for failure. + +`merge` + +: A function to merge multiple definitions values. Takes two + parameters: + + *`loc`* + + : The option path as a list of strings, e.g. `["boot" "loader + "grub" "enable"]`. + + *`defs`* + + : The list of sets of defined `value` and `file` where the value + was defined, e.g. `[ { + file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } + ]`. The `merge` function should return the merged value + or throw an error in case the values are impossible or not meant + to be merged. + +`getSubOptions` + +: For composed types that can take a submodule as type parameter, this + function generate sub-options documentation. It takes the current + option prefix as a list and return the set of sub-options. Usually + defined in a recursive manner by adding a term to the prefix, e.g. + `prefix: + elemType.getSubOptions (prefix ++ + ["prefix"])` where *`"prefix"`* is the newly added prefix. + +`getSubModules` + +: For composed types that can take a submodule as type parameter, this + function should return the type parameters submodules. If the type + parameter is called `elemType`, the function should just recursively + look into submodules by returning `elemType.getSubModules;`. + +`substSubModules` + +: For composed types that can take a submodule as type parameter, this + function can be used to substitute the parameter of a submodule + type. It takes a module as parameter and return the type with the + submodule options substituted. It is usually defined as a type + function call with a recursive call to `substSubModules`, e.g for a + type `composedType` that take an `elemtype` type parameter, this + function should be defined as `m: + composedType (elemType.substSubModules m)`. + +`typeMerge` + +: A function to merge multiple type declarations. Takes the type to + merge `functor` as parameter. A `null` return value means that type + cannot be merged. + + *`f`* + + : The type to merge `functor`. + + Note: There is a generic `defaultTypeMerge` that work with most of + value and composed types. + +`functor` + +: An attribute set representing the type. It is used for type + operations and has the following keys: + + `type` + + : The type function. + + `wrapped` + + : Holds the type parameter for composed types. + + `payload` + + : Holds the value parameter for value types. The types that have a + `payload` are the `enum`, `separatedString` and `submodule` + types. + + `binOp` + + : A binary operation that can merge the payloads of two same + types. Defined as a function that take two payloads as + parameters and return the payloads merged. diff --git a/nixpkgs/nixos/doc/manual/development/option-types.xml b/nixpkgs/nixos/doc/manual/development/option-types.xml deleted file mode 100644 index 3d2191e2f3f3..000000000000 --- a/nixpkgs/nixos/doc/manual/development/option-types.xml +++ /dev/null @@ -1,914 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-option-types"> - <title>Options Types</title> - - <para> - Option types are a way to put constraints on the values a module option can - take. Types are also responsible of how values are merged in case of multiple - value definitions. - </para> - - <section xml:id="sec-option-types-basic"> - <title>Basic Types</title> - - <para> - Basic types are the simplest available types in the module system. Basic - types include multiple string types that mainly differ in how definition - merging is handled. - </para> - - <variablelist> - <varlistentry> - <term> - <varname>types.bool</varname> - </term> - <listitem> - <para> - A boolean, its values can be <literal>true</literal> or - <literal>false</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.path</varname> - </term> - <listitem> - <para> - A filesystem path, defined as anything that when coerced to a string - starts with a slash. Even if derivations can be considered as path, the - more specific <literal>types.package</literal> should be preferred. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.package</varname> - </term> - <listitem> - <para> - A derivation or a store path. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.anything</varname> - </term> - <listitem> - <para> - A type that accepts any value and recursively merges attribute sets together. - This type is recommended when the option type is unknown. - <example xml:id="ex-types-anything"> - <title><literal>types.anything</literal> Example</title> - <para> - Two definitions of this type like -<programlisting> -{ - str = lib.mkDefault "foo"; - pkg.hello = pkgs.hello; - fun.fun = x: x + 1; -} -</programlisting> -<programlisting> -{ - str = lib.mkIf true "bar"; - pkg.gcc = pkgs.gcc; - fun.fun = lib.mkForce (x: x + 2); -} -</programlisting> - will get merged to -<programlisting> -{ - str = "bar"; - pkg.gcc = pkgs.gcc; - pkg.hello = pkgs.hello; - fun.fun = x: x + 2; -} -</programlisting> - </para> - </example> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.attrs</varname> - </term> - <listitem> - <para> - A free-form attribute set. - <warning><para> - This type will be deprecated in the future because it doesn't recurse - into attribute sets, silently drops earlier attribute definitions, and - doesn't discharge <literal>lib.mkDefault</literal>, <literal>lib.mkIf - </literal> and co. For allowing arbitrary attribute sets, prefer - <literal>types.attrsOf types.anything</literal> instead which doesn't - have these problems. - </para></warning> - </para> - </listitem> - </varlistentry> - </variablelist> - - <para> - Integer-related types: - </para> - - <variablelist> - <varlistentry> - <term> - <varname>types.int</varname> - </term> - <listitem> - <para> - A signed integer. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.ints.{s8, s16, s32}</varname> - </term> - <listitem> - <para> - Signed integers with a fixed length (8, 16 or 32 bits). They go from - <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase> - </inlineequation> to <inlineequation> - <mathphrase>2<superscript>n</superscript>/2−1</mathphrase> - </inlineequation> respectively (e.g. <literal>−128</literal> to - <literal>127</literal> for 8 bits). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.ints.unsigned</varname> - </term> - <listitem> - <para> - An unsigned integer (that is >= 0). - </para> - </listitem> - </varlistentry> - <varlistentry xml:id='types.ints.ux'> - <term> - <varname>types.ints.{u8, u16, u32}</varname> - </term> - <listitem> - <para> - Unsigned integers with a fixed length (8, 16 or 32 bits). They go from - <inlineequation><mathphrase>0</mathphrase></inlineequation> to - <inlineequation> - <mathphrase>2<superscript>n</superscript>−1</mathphrase> - </inlineequation> respectively (e.g. <literal>0</literal> to - <literal>255</literal> for 8 bits). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.ints.positive</varname> - </term> - <listitem> - <para> - A positive integer (that is > 0). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.port</varname> - </term> - <listitem> - <para> - A port number. This type is an alias to - <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>. - </para> - </listitem> - </varlistentry> - </variablelist> - - <para> - String-related types: - </para> - - <variablelist> - <varlistentry> - <term> - <varname>types.str</varname> - </term> - <listitem> - <para> - A string. Multiple definitions cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.lines</varname> - </term> - <listitem> - <para> - A string. Multiple definitions are concatenated with a new line - <literal>"\n"</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.commas</varname> - </term> - <listitem> - <para> - A string. Multiple definitions are concatenated with a comma - <literal>","</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.envVar</varname> - </term> - <listitem> - <para> - A string. Multiple definitions are concatenated with a collon - <literal>":"</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.strMatching</varname> - </term> - <listitem> - <para> - A string matching a specific regular expression. Multiple definitions - cannot be merged. The regular expression is processed using - <literal>builtins.match</literal>. - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - - <section xml:id="sec-option-types-value"> - <title>Value Types</title> - - <para> - Value types are types that take a value parameter. - </para> - - <variablelist> - <varlistentry> - <term> - <varname>types.enum</varname> <replaceable>l</replaceable> - </term> - <listitem> - <para> - One element of the list <replaceable>l</replaceable>, e.g. - <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions - cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.separatedString</varname> <replaceable>sep</replaceable> - </term> - <listitem> - <para> - A string with a custom separator <replaceable>sep</replaceable>, e.g. - <literal>types.separatedString "|"</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.ints.between</varname> <replaceable>lowest</replaceable> <replaceable>highest</replaceable> - </term> - <listitem> - <para> - An integer between <replaceable>lowest</replaceable> and - <replaceable>highest</replaceable> (both inclusive). Useful for creating - types like <literal>types.port</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.submodule</varname> <replaceable>o</replaceable> - </term> - <listitem> - <para> - A set of sub options <replaceable>o</replaceable>. - <replaceable>o</replaceable> can be an attribute set, a function - returning an attribute set, or a path to a file containing such a value. Submodules are used in - composed types to create modular options. This is equivalent to - <literal>types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }</literal>. - Submodules are detailed in - <xref - linkend='section-option-types-submodule' />. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.submoduleWith</varname> { - <replaceable>modules</replaceable>, - <replaceable>specialArgs</replaceable> ? {}, - <replaceable>shorthandOnlyDefinesConfig</replaceable> ? false } - </term> - <listitem> - <para> - Like <varname>types.submodule</varname>, but more flexible and with better defaults. - It has parameters - <itemizedlist> - <listitem><para> - <replaceable>modules</replaceable> - A list of modules to use by default for this submodule type. This gets combined - with all option definitions to build the final list of modules that will be included. - <note><para> - Only options defined with this argument are included in rendered documentation. - </para></note> - </para></listitem> - <listitem><para> - <replaceable>specialArgs</replaceable> - An attribute set of extra arguments to be passed to the module functions. - The option <literal>_module.args</literal> should be used instead - for most arguments since it allows overriding. <replaceable>specialArgs</replaceable> should only be - used for arguments that can't go through the module fixed-point, because of - infinite recursion or other problems. An example is overriding the - <varname>lib</varname> argument, because <varname>lib</varname> itself is used - to define <literal>_module.args</literal>, which makes using - <literal>_module.args</literal> to define it impossible. - </para></listitem> - <listitem><para> - <replaceable>shorthandOnlyDefinesConfig</replaceable> - Whether definitions of this type should default to the <literal>config</literal> - section of a module (see <xref linkend='ex-module-syntax'/>) if it is an attribute - set. Enabling this only has a benefit when the submodule defines an option named - <literal>config</literal> or <literal>options</literal>. In such a case it would - allow the option to be set with <literal>the-submodule.config = "value"</literal> - instead of requiring <literal>the-submodule.config.config = "value"</literal>. - This is because only when modules <emphasis>don't</emphasis> set the - <literal>config</literal> or <literal>options</literal> keys, all keys are interpreted - as option definitions in the <literal>config</literal> section. Enabling this option - implicitly puts all attributes in the <literal>config</literal> section. - </para> - <para> - With this option enabled, defining a non-<literal>config</literal> section requires - using a function: <literal>the-submodule = { ... }: { options = { ... }; }</literal>. - </para></listitem> - </itemizedlist> - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - - <section xml:id="sec-option-types-composed"> - <title>Composed Types</title> - - <para> - Composed types are types that take a type as parameter. <literal>listOf - int</literal> and <literal>either int str</literal> are examples of composed - types. - </para> - - <variablelist> - <varlistentry> - <term> - <varname>types.listOf</varname> <replaceable>t</replaceable> - </term> - <listitem> - <para> - A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf - int</literal>. Multiple definitions are merged with list concatenation. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.attrsOf</varname> <replaceable>t</replaceable> - </term> - <listitem> - <para> - An attribute set of where all the values are of - <replaceable>t</replaceable> type. Multiple definitions result in the - joined attribute set. - <note><para> - This type is <emphasis>strict</emphasis> in its values, which in turn - means attributes cannot depend on other attributes. See <varname> - types.lazyAttrsOf</varname> for a lazy version. - </para></note> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.lazyAttrsOf</varname> <replaceable>t</replaceable> - </term> - <listitem> - <para> - An attribute set of where all the values are of - <replaceable>t</replaceable> type. Multiple definitions result in the - joined attribute set. This is the lazy version of <varname>types.attrsOf - </varname>, allowing attributes to depend on each other. - <warning><para> - This version does not fully support conditional definitions! With an - option <varname>foo</varname> of this type and a definition - <literal>foo.attr = lib.mkIf false 10</literal>, evaluating - <literal>foo ? attr</literal> will return <literal>true</literal> - even though it should be false. Accessing the value will then throw - an error. For types <replaceable>t</replaceable> that have an - <literal>emptyValue</literal> defined, that value will be returned - instead of throwing an error. So if the type of <literal>foo.attr</literal> - was <literal>lazyAttrsOf (nullOr int)</literal>, <literal>null</literal> - would be returned instead for the same <literal>mkIf false</literal> definition. - </para></warning> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.nullOr</varname> <replaceable>t</replaceable> - </term> - <listitem> - <para> - <literal>null</literal> or type <replaceable>t</replaceable>. Multiple - definitions are merged according to type <replaceable>t</replaceable>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.uniq</varname> <replaceable>t</replaceable> - </term> - <listitem> - <para> - Ensures that type <replaceable>t</replaceable> cannot be merged. It is - used to ensure option definitions are declared only once. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.either</varname> <replaceable>t1</replaceable> <replaceable>t2</replaceable> - </term> - <listitem> - <para> - Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>, - e.g. <literal>with types; either int str</literal>. Multiple definitions - cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.oneOf</varname> [ <replaceable>t1</replaceable> <replaceable>t2</replaceable> ... ] - </term> - <listitem> - <para> - Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable> and so forth, - e.g. <literal>with types; oneOf [ int str bool ]</literal>. Multiple definitions - cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>types.coercedTo</varname> <replaceable>from</replaceable> <replaceable>f</replaceable> <replaceable>to</replaceable> - </term> - <listitem> - <para> - Type <replaceable>to</replaceable> or type - <replaceable>from</replaceable> which will be coerced to type - <replaceable>to</replaceable> using function <replaceable>f</replaceable> - which takes an argument of type <replaceable>from</replaceable> and - return a value of type <replaceable>to</replaceable>. Can be used to - preserve backwards compatibility of an option if its type was changed. - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - - <section xml:id='section-option-types-submodule'> - <title>Submodule</title> - - <para> - <literal>submodule</literal> is a very powerful type that defines a set of - sub-options that are handled like a separate module. - </para> - - <para> - It takes a parameter <replaceable>o</replaceable>, that should be a set, or - a function returning a set with an <literal>options</literal> key defining - the sub-options. Submodule option definitions are type-checked accordingly - to the <literal>options</literal> declarations. Of course, you can nest - submodule option definitons for even higher modularity. - </para> - - <para> - The option set can be defined directly - (<xref linkend='ex-submodule-direct' />) or as reference - (<xref linkend='ex-submodule-reference' />). - </para> - - <example xml:id='ex-submodule-direct'> - <title>Directly defined submodule</title> -<screen> -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }; -};</screen> - </example> - - <example xml:id='ex-submodule-reference'> - <title>Submodule defined as a reference</title> -<screen> -let - modOptions = { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = int; - }; - }; - }; -in -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule modOptions; -};</screen> - </example> - - <para> - The <literal>submodule</literal> type is especially interesting when used - with composed types like <literal>attrsOf</literal> or - <literal>listOf</literal>. When composed with <literal>listOf</literal> - (<xref linkend='ex-submodule-listof-declaration' />), - <literal>submodule</literal> allows multiple definitions of the submodule - option set (<xref linkend='ex-submodule-listof-definition' />). - </para> - - <example xml:id='ex-submodule-listof-declaration'> - <title>Declaration of a list of submodules</title> -<screen> -options.mod = mkOption { - description = "submodule example"; - type = with types; listOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -};</screen> - </example> - - <example xml:id='ex-submodule-listof-definition'> - <title>Definition of a list of submodules</title> -<screen> -config.mod = [ - { foo = 1; bar = "one"; } - { foo = 2; bar = "two"; } -];</screen> - </example> - - <para> - When composed with <literal>attrsOf</literal> - (<xref linkend='ex-submodule-attrsof-declaration' />), - <literal>submodule</literal> allows multiple named definitions of the - submodule option set (<xref linkend='ex-submodule-attrsof-definition' />). - </para> - - <example xml:id='ex-submodule-attrsof-declaration'> - <title>Declaration of attribute sets of submodules</title> -<screen> -options.mod = mkOption { - description = "submodule example"; - type = with types; attrsOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -};</screen> - </example> - - <example xml:id='ex-submodule-attrsof-definition'> - <title>Declaration of attribute sets of submodules</title> -<screen> -config.mod.one = { foo = 1; bar = "one"; }; -config.mod.two = { foo = 2; bar = "two"; };</screen> - </example> - </section> - - <section xml:id="sec-option-types-extending"> - <title>Extending types</title> - - <para> - Types are mainly characterized by their <literal>check</literal> and - <literal>merge</literal> functions. - </para> - - <variablelist> - <varlistentry> - <term> - <varname>check</varname> - </term> - <listitem> - <para> - The function to type check the value. Takes a value as parameter and - return a boolean. It is possible to extend a type check with the - <literal>addCheck</literal> function - (<xref - linkend='ex-extending-type-check-1' />), or to fully - override the check function - (<xref linkend='ex-extending-type-check-2' />). - </para> - <example xml:id='ex-extending-type-check-1'> - <title>Adding a type check</title> -<screen> -byte = mkOption { - description = "An integer between 0 and 255."; - type = types.addCheck types.int (x: x >= 0 && x <= 255); -};</screen> - </example> - <example xml:id='ex-extending-type-check-2'> - <title>Overriding a type check</title> -<screen> -nixThings = mkOption { - description = "words that start with 'nix'"; - type = types.str // { - check = (x: lib.hasPrefix "nix" x) - }; -};</screen> - </example> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>merge</varname> - </term> - <listitem> - <para> - Function to merge the options values when multiple values are set. The - function takes two parameters, <literal>loc</literal> the option path as - a list of strings, and <literal>defs</literal> the list of defined values - as a list. It is possible to override a type merge function for custom - needs. - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - - <section xml:id="sec-option-types-custom"> - <title>Custom Types</title> - - <para> - Custom types can be created with the <literal>mkOptionType</literal> - function. As type creation includes some more complex topics such as - submodule handling, it is recommended to get familiar with - <filename - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename> - code before creating a new type. - </para> - - <para> - The only required parameter is <literal>name</literal>. - </para> - - <variablelist> - <varlistentry> - <term> - <varname>name</varname> - </term> - <listitem> - <para> - A string representation of the type function name. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>definition</varname> - </term> - <listitem> - <para> - Description of the type used in documentation. Give information of the - type and any of its arguments. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>check</varname> - </term> - <listitem> - <para> - A function to type check the definition value. Takes the definition value - as a parameter and returns a boolean indicating the type check result, - <literal>true</literal> for success and <literal>false</literal> for - failure. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>merge</varname> - </term> - <listitem> - <para> - A function to merge multiple definitions values. Takes two parameters: - </para> - <variablelist> - <varlistentry> - <term> - <replaceable>loc</replaceable> - </term> - <listitem> - <para> - The option path as a list of strings, e.g. <literal>["boot" "loader - "grub" "enable"]</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <replaceable>defs</replaceable> - </term> - <listitem> - <para> - The list of sets of defined <literal>value</literal> and - <literal>file</literal> where the value was defined, e.g. <literal>[ { - file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } - ]</literal>. The <literal>merge</literal> function should return the - merged value or throw an error in case the values are impossible or - not meant to be merged. - </para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>getSubOptions</varname> - </term> - <listitem> - <para> - For composed types that can take a submodule as type parameter, this - function generate sub-options documentation. It takes the current option - prefix as a list and return the set of sub-options. Usually defined in a - recursive manner by adding a term to the prefix, e.g. <literal>prefix: - elemType.getSubOptions (prefix ++ - [<replaceable>"prefix"</replaceable>])</literal> where - <replaceable>"prefix"</replaceable> is the newly added prefix. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>getSubModules</varname> - </term> - <listitem> - <para> - For composed types that can take a submodule as type parameter, this - function should return the type parameters submodules. If the type - parameter is called <literal>elemType</literal>, the function should just - recursively look into submodules by returning - <literal>elemType.getSubModules;</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>substSubModules</varname> - </term> - <listitem> - <para> - For composed types that can take a submodule as type parameter, this - function can be used to substitute the parameter of a submodule type. It - takes a module as parameter and return the type with the submodule - options substituted. It is usually defined as a type function call with a - recursive call to <literal>substSubModules</literal>, e.g for a type - <literal>composedType</literal> that take an <literal>elemtype</literal> - type parameter, this function should be defined as <literal>m: - composedType (elemType.substSubModules m)</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>typeMerge</varname> - </term> - <listitem> - <para> - A function to merge multiple type declarations. Takes the type to merge - <literal>functor</literal> as parameter. A <literal>null</literal> return - value means that type cannot be merged. - </para> - <variablelist> - <varlistentry> - <term> - <replaceable>f</replaceable> - </term> - <listitem> - <para> - The type to merge <literal>functor</literal>. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - Note: There is a generic <literal>defaultTypeMerge</literal> that work - with most of value and composed types. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>functor</varname> - </term> - <listitem> - <para> - An attribute set representing the type. It is used for type operations - and has the following keys: - </para> - <variablelist> - <varlistentry> - <term> - <varname>type</varname> - </term> - <listitem> - <para> - The type function. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>wrapped</varname> - </term> - <listitem> - <para> - Holds the type parameter for composed types. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>payload</varname> - </term> - <listitem> - <para> - Holds the value parameter for value types. The types that have a - <literal>payload</literal> are the <literal>enum</literal>, - <literal>separatedString</literal> and <literal>submodule</literal> - types. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>binOp</varname> - </term> - <listitem> - <para> - A binary operation that can merge the payloads of two same types. - Defined as a function that take two payloads as parameters and return - the payloads merged. - </para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - </variablelist> - </section> -</section> diff --git a/nixpkgs/nixos/doc/manual/development/replace-modules.section.md b/nixpkgs/nixos/doc/manual/development/replace-modules.section.md new file mode 100644 index 000000000000..0700a82004c1 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/replace-modules.section.md @@ -0,0 +1,64 @@ +# Replace Modules {#sec-replace-modules} + +Modules that are imported can also be disabled. The option declarations, +config implementation and the imports of a disabled module will be +ignored, allowing another to take it\'s place. This can be used to +import a set of modules from another channel while keeping the rest of +the system on a stable release. + +`disabledModules` is a top level attribute like `imports`, `options` and +`config`. It contains a list of modules that will be disabled. This can +either be the full path to the module or a string with the filename +relative to the modules path (eg. \<nixpkgs/nixos/modules> for nixos). + +This example will replace the existing postgresql module with the +version defined in the nixos-unstable channel while keeping the rest of +the modules and packages from the original nixos channel. This only +overrides the module definition, this won\'t use postgresql from +nixos-unstable unless explicitly configured to do so. + +```nix +{ config, lib, pkgs, ... }: + +{ + disabledModules = [ "services/databases/postgresql.nix" ]; + + imports = + [ # Use postgresql service from nixos-unstable channel. + # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable + <nixos-unstable/nixos/modules/services/databases/postgresql.nix> + ]; + + services.postgresql.enable = true; +} +``` + +This example shows how to define a custom module as a replacement for an +existing module. Importing this module will disable the original module +without having to know it\'s implementation details. + +```nix +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.man; +in + +{ + disabledModules = [ "services/programs/man.nix" ]; + + options = { + programs.man.enable = mkOption { + type = types.bool; + default = true; + description = "Whether to enable manual pages."; + }; + }; + + config = mkIf cfg.enabled { + warnings = [ "disabled manpages for production deployments." ]; + }; +} +``` diff --git a/nixpkgs/nixos/doc/manual/development/replace-modules.xml b/nixpkgs/nixos/doc/manual/development/replace-modules.xml deleted file mode 100644 index 9fc5678ca1b3..000000000000 --- a/nixpkgs/nixos/doc/manual/development/replace-modules.xml +++ /dev/null @@ -1,79 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-replace-modules"> - <title>Replace Modules</title> - - <para> - Modules that are imported can also be disabled. The option declarations, - config implementation and the imports of a disabled module will be ignored, allowing another - to take it's place. This can be used to import a set of modules from another - channel while keeping the rest of the system on a stable release. - </para> - - <para> - <literal>disabledModules</literal> is a top level attribute like - <literal>imports</literal>, <literal>options</literal> and - <literal>config</literal>. It contains a list of modules that will be - disabled. This can either be the full path to the module or a string with the - filename relative to the modules path (eg. <nixpkgs/nixos/modules> for - nixos). - </para> - - <para> - This example will replace the existing postgresql module with the version - defined in the nixos-unstable channel while keeping the rest of the modules - and packages from the original nixos channel. This only overrides the module - definition, this won't use postgresql from nixos-unstable unless explicitly - configured to do so. - </para> - -<programlisting> -{ config, lib, pkgs, ... }: - -{ - disabledModules = [ "services/databases/postgresql.nix" ]; - - imports = - [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable - <nixos-unstable/nixos/modules/services/databases/postgresql.nix> - ]; - - services.postgresql.enable = true; -} -</programlisting> - - <para> - This example shows how to define a custom module as a replacement for an - existing module. Importing this module will disable the original module - without having to know it's implementation details. - </para> - -<programlisting> -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.programs.man; -in - -{ - disabledModules = [ "services/programs/man.nix" ]; - - options = { - programs.man.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable manual pages."; - }; - }; - - config = mkIf cfg.enabled { - warnings = [ "disabled manpages for production deployments." ]; - }; -} -</programlisting> -</section> diff --git a/nixpkgs/nixos/doc/manual/development/settings-options.section.md b/nixpkgs/nixos/doc/manual/development/settings-options.section.md new file mode 100644 index 000000000000..58a3d8448af5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/settings-options.section.md @@ -0,0 +1,192 @@ +# Options for Program Settings {#sec-settings-options} + +Many programs have configuration files where program-specific settings +can be declared. File formats can be separated into two categories: + +- Nix-representable ones: These can trivially be mapped to a subset of + Nix syntax. E.g. JSON is an example, since its values like + `{"foo":{"bar":10}}` can be mapped directly to Nix: + `{ foo = { bar = 10; }; }`. Other examples are INI, YAML and TOML. + The following section explains the convention for these settings. + +- Non-nix-representable ones: These can\'t be trivially mapped to a + subset of Nix syntax. Most generic programming languages are in this + group, e.g. bash, since the statement `if true; then echo hi; fi` + doesn\'t have a trivial representation in Nix. + + Currently there are no fixed conventions for these, but it is common + to have a `configFile` option for setting the configuration file + path directly. The default value of `configFile` can be an + auto-generated file, with convenient options for controlling the + contents. For example an option of type `attrsOf str` can be used + for representing environment variables which generates a section + like `export FOO="foo"`. Often it can also be useful to also include + an `extraConfig` option of type `lines` to allow arbitrary text + after the autogenerated part of the file. + +## Nix-representable Formats (JSON, YAML, TOML, INI, \...) {#sec-settings-nix-representable} + +By convention, formats like this are handled with a generic `settings` +option, representing the full program configuration as a Nix value. The +type of this option should represent the format. The most common formats +have a predefined type and string generator already declared under +`pkgs.formats`: + +`pkgs.formats.json` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with JSON-specific attributes `type` and + `generate` as specified [below](#pkgs-formats-result). + +`pkgs.formats.yaml` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with YAML-specific attributes `type` and + `generate` as specified [below](#pkgs-formats-result). + +`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \... } + +: A function taking an attribute set with values + + `listsAsDuplicateKeys` + + : A boolean for controlling whether list values can be used to + represent duplicate INI keys + + `listToValue` + + : A function for turning a list of values into a single value. + + It returns a set with INI-specific attributes `type` and `generate` + as specified [below](#pkgs-formats-result). + +`pkgs.formats.toml` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with TOML-specific attributes `type` and + `generate` as specified [below](#pkgs-formats-result). + +::: {#pkgs-formats-result} +These functions all return an attribute set with these values: +::: + +`type` + +: A module system type representing a value of the format + +`generate` *`filename jsonValue`* + +: A function that can render a value of the format to a file. Returns + a file path. + + ::: {.note} + This function puts the value contents in the Nix store. So this + should be avoided for secrets. + ::: + +::: {#ex-settings-nix-representable .example} +::: {.title} +**Example: Module with conventional `settings` option** +::: +The following shows a module for an example program that uses a JSON +configuration file. It demonstrates how above values can be used, along +with some other related best practices. See the comments for +explanations. + +```nix +{ options, config, lib, pkgs, ... }: +let + cfg = config.services.foo; + # Define the settings format used for this program + settingsFormat = pkgs.formats.json {}; +in { + + options.services.foo = { + enable = lib.mkEnableOption "foo service"; + + settings = lib.mkOption { + # Setting this type allows for correct merging behavior + type = settingsFormat.type; + default = {}; + description = '' + Configuration for foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported settings. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + # We can assign some default settings here to make the service work by just + # enabling it. We use `mkDefault` for values that can be changed without + # problems + services.foo.settings = { + # Fails at runtime without any value set + log_level = lib.mkDefault "WARN"; + + # We assume systemd's `StateDirectory` is used, so we require this value, + # therefore no mkDefault + data_path = "/var/lib/foo"; + + # Since we use this to create a user we need to know the default value at + # eval time + user = lib.mkDefault "foo"; + }; + + environment.etc."foo.json".source = + # The formats generator function takes a filename and the Nix value + # representing the format value and produces a filepath with that value + # rendered in the format + settingsFormat.generate "foo-config.json" cfg.settings; + + # We know that the `user` attribute exists because we set a default value + # for it above, allowing us to use it without worries here + users.users.${cfg.settings.user} = { isSystemUser = true; }; + + # ... + }; +} +``` +::: + +### Option declarations for attributes {#sec-settings-attrs-options} + +Some `settings` attributes may deserve some extra care. They may need a +different type, default or merging behavior, or they are essential +options that should show their documentation in the manual. This can be +done using [](#sec-freeform-modules). + +We extend above example using freeform modules to declare an option for +the port, which will enforce it to be a valid integer and make it show +up in the manual. + +::: {#ex-settings-typed-attrs .example} +::: {.title} +**Example: Declaring a type-checked `settings` attribute** +::: +```nix +settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = settingsFormat.type; + + # Declare an option for the port such that the type is checked and this option + # is shown in the manual. + options.port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + Which port this service should listen on. + ''; + }; + + }; + default = {}; + description = '' + Configuration for Foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported values. + ''; +}; +``` +::: diff --git a/nixpkgs/nixos/doc/manual/development/settings-options.xml b/nixpkgs/nixos/doc/manual/development/settings-options.xml deleted file mode 100644 index 7292cac62b70..000000000000 --- a/nixpkgs/nixos/doc/manual/development/settings-options.xml +++ /dev/null @@ -1,226 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-settings-options"> - <title>Options for Program Settings</title> - - <para> - Many programs have configuration files where program-specific settings can be declared. File formats can be separated into two categories: - <itemizedlist> - <listitem> - <para> - Nix-representable ones: These can trivially be mapped to a subset of Nix syntax. E.g. JSON is an example, since its values like <literal>{"foo":{"bar":10}}</literal> can be mapped directly to Nix: <literal>{ foo = { bar = 10; }; }</literal>. Other examples are INI, YAML and TOML. The following section explains the convention for these settings. - </para> - </listitem> - <listitem> - <para> - Non-nix-representable ones: These can't be trivially mapped to a subset of Nix syntax. Most generic programming languages are in this group, e.g. bash, since the statement <literal>if true; then echo hi; fi</literal> doesn't have a trivial representation in Nix. - </para> - <para> - Currently there are no fixed conventions for these, but it is common to have a <literal>configFile</literal> option for setting the configuration file path directly. The default value of <literal>configFile</literal> can be an auto-generated file, with convenient options for controlling the contents. For example an option of type <literal>attrsOf str</literal> can be used for representing environment variables which generates a section like <literal>export FOO="foo"</literal>. Often it can also be useful to also include an <literal>extraConfig</literal> option of type <literal>lines</literal> to allow arbitrary text after the autogenerated part of the file. - </para> - </listitem> - </itemizedlist> - </para> - <section xml:id="sec-settings-nix-representable"> - <title>Nix-representable Formats (JSON, YAML, TOML, INI, ...)</title> - <para> - By convention, formats like this are handled with a generic <literal>settings</literal> option, representing the full program configuration as a Nix value. The type of this option should represent the format. The most common formats have a predefined type and string generator already declared under <literal>pkgs.formats</literal>: - <variablelist> - <varlistentry> - <term> - <varname>pkgs.formats.json</varname> { } - </term> - <listitem> - <para> - A function taking an empty attribute set (for future extensibility) and returning a set with JSON-specific attributes <varname>type</varname> and <varname>generate</varname> as specified <link linkend='pkgs-formats-result'>below</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>pkgs.formats.yaml</varname> { } - </term> - <listitem> - <para> - A function taking an empty attribute set (for future extensibility) and returning a set with YAML-specific attributes <varname>type</varname> and <varname>generate</varname> as specified <link linkend='pkgs-formats-result'>below</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>pkgs.formats.ini</varname> { <replaceable>listsAsDuplicateKeys</replaceable> ? false, <replaceable>listToValue</replaceable> ? null, ... } - </term> - <listitem> - <para> - A function taking an attribute set with values - <variablelist> - <varlistentry> - <term> - <varname>listsAsDuplicateKeys</varname> - </term> - <listitem> - <para> - A boolean for controlling whether list values can be used to represent duplicate INI keys - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>listToValue</varname> - </term> - <listitem> - <para> - A function for turning a list of values into a single value. - </para> - </listitem> - </varlistentry> - </variablelist> - It returns a set with INI-specific attributes <varname>type</varname> and <varname>generate</varname> as specified <link linkend='pkgs-formats-result'>below</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>pkgs.formats.toml</varname> { } - </term> - <listitem> - <para> - A function taking an empty attribute set (for future extensibility) and returning a set with TOML-specific attributes <varname>type</varname> and <varname>generate</varname> as specified <link linkend='pkgs-formats-result'>below</link>. - </para> - </listitem> - </varlistentry> - </variablelist> - - </para> - <para xml:id="pkgs-formats-result"> - These functions all return an attribute set with these values: - <variablelist> - <varlistentry> - <term> - <varname>type</varname> - </term> - <listitem> - <para> - A module system type representing a value of the format - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>generate</varname> <replaceable>filename</replaceable> <replaceable>jsonValue</replaceable> - </term> - <listitem> - <para> - A function that can render a value of the format to a file. Returns a file path. - <note> - <para> - This function puts the value contents in the Nix store. So this should be avoided for secrets. - </para> - </note> - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - <example xml:id="ex-settings-nix-representable"> - <title>Module with conventional <literal>settings</literal> option</title> - <para> - The following shows a module for an example program that uses a JSON configuration file. It demonstrates how above values can be used, along with some other related best practices. See the comments for explanations. - </para> -<programlisting> -{ options, config, lib, pkgs, ... }: -let - cfg = config.services.foo; - # Define the settings format used for this program - settingsFormat = pkgs.formats.json {}; -in { - - options.services.foo = { - enable = lib.mkEnableOption "foo service"; - - settings = lib.mkOption { - # Setting this type allows for correct merging behavior - type = settingsFormat.type; - default = {}; - description = '' - Configuration for foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported settings. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - # We can assign some default settings here to make the service work by just - # enabling it. We use `mkDefault` for values that can be changed without - # problems - services.foo.settings = { - # Fails at runtime without any value set - log_level = lib.mkDefault "WARN"; - - # We assume systemd's `StateDirectory` is used, so we require this value, - # therefore no mkDefault - data_path = "/var/lib/foo"; - - # Since we use this to create a user we need to know the default value at - # eval time - user = lib.mkDefault "foo"; - }; - - environment.etc."foo.json".source = - # The formats generator function takes a filename and the Nix value - # representing the format value and produces a filepath with that value - # rendered in the format - settingsFormat.generate "foo-config.json" cfg.settings; - - # We know that the `user` attribute exists because we set a default value - # for it above, allowing us to use it without worries here - users.users.${cfg.settings.user} = { isSystemUser = true; }; - - # ... - }; -} -</programlisting> - </example> - <section xml:id="sec-settings-attrs-options"> - <title>Option declarations for attributes</title> - <para> - Some <literal>settings</literal> attributes may deserve some extra care. They may need a different type, default or merging behavior, or they are essential options that should show their documentation in the manual. This can be done using <xref linkend='sec-freeform-modules'/>. - <example xml:id="ex-settings-typed-attrs"> - <title>Declaring a type-checked <literal>settings</literal> attribute</title> - <para> - We extend above example using freeform modules to declare an option for the port, which will enforce it to be a valid integer and make it show up in the manual. - </para> -<programlisting> -settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = settingsFormat.type; - - # Declare an option for the port such that the type is checked and this option - # is shown in the manual. - options.port = lib.mkOption { - type = lib.types.port; - default = 8080; - description = '' - Which port this service should listen on. - ''; - }; - - }; - default = {}; - description = '' - Configuration for Foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported values. - ''; -}; -</programlisting> - </example> - </para> - </section> - </section> - -</section> diff --git a/nixpkgs/nixos/doc/manual/development/sources.chapter.md b/nixpkgs/nixos/doc/manual/development/sources.chapter.md new file mode 100644 index 000000000000..88173f7135bd --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/sources.chapter.md @@ -0,0 +1,77 @@ +# Getting the Sources {#sec-getting-sources} + +By default, NixOS's `nixos-rebuild` command uses the NixOS and Nixpkgs +sources provided by the `nixos` channel (kept in +`/nix/var/nix/profiles/per-user/root/channels/nixos`). To modify NixOS, +however, you should check out the latest sources from Git. This is as +follows: + +```ShellSession +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +$ git remote update origin +``` + +This will check out the latest Nixpkgs sources to `./nixpkgs` the NixOS +sources to `./nixpkgs/nixos`. (The NixOS source tree lives in a +subdirectory of the Nixpkgs repository.) The `nixpkgs` repository has +branches that correspond to each Nixpkgs/NixOS channel (see +[](#sec-upgrading) for more information about channels). Thus, the +Git branch `origin/nixos-17.03` will contain the latest built and tested +version available in the `nixos-17.03` channel. + +It's often inconvenient to develop directly on the master branch, since +if somebody has just committed (say) a change to GCC, then the binary +cache may not have caught up yet and you'll have to rebuild everything +from source. So you may want to create a local branch based on your +current NixOS version: + +```ShellSession +$ nixos-version +17.09pre104379.6e0b727 (Hummingbird) + +$ git checkout -b local 6e0b727 +``` + +Or, to base your local branch on the latest version available in a NixOS +channel: + +```ShellSession +$ git remote update origin +$ git checkout -b local origin/nixos-17.03 +``` + +(Replace `nixos-17.03` with the name of the channel you want to use.) +You can use `git merge` or `git + rebase` to keep your local branch in sync with the channel, e.g. + +```ShellSession +$ git remote update origin +$ git merge origin/nixos-17.03 +``` + +You can use `git cherry-pick` to copy commits from your local branch to +the upstream branch. + +If you want to rebuild your system using your (modified) sources, you +need to tell `nixos-rebuild` about them using the `-I` flag: + +```ShellSession +# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs +``` + +If you want `nix-env` to use the expressions in `/my/sources`, use +`nix-env -f + /my/sources/nixpkgs`, or change the default by adding a symlink in +`~/.nix-defexpr`: + +```ShellSession +$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs +``` + +You may want to delete the symlink `~/.nix-defexpr/channels_root` to +prevent root's NixOS channel from clashing with your own tree (this may +break the command-not-found utility though). If you want to go back to +the default state, you may just remove the `~/.nix-defexpr` directory +completely, log out and log in again and it should have been recreated +with a link to the root channels. diff --git a/nixpkgs/nixos/doc/manual/development/sources.xml b/nixpkgs/nixos/doc/manual/development/sources.xml deleted file mode 100644 index b333ccabb420..000000000000 --- a/nixpkgs/nixos/doc/manual/development/sources.xml +++ /dev/null @@ -1,85 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-getting-sources"> - <title>Getting the Sources</title> - <para> - By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS - and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in - <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To - modify NixOS, however, you should check out the latest sources from Git. This - is as follows: -<screen> -<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs -<prompt>$ </prompt>cd nixpkgs -<prompt>$ </prompt>git remote update origin -</screen> - This will check out the latest Nixpkgs sources to - <filename>./nixpkgs</filename> the NixOS sources to - <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a - subdirectory of the Nixpkgs repository.) The - <literal>nixpkgs</literal> repository has branches that correspond - to each Nixpkgs/NixOS channel (see <xref linkend="sec-upgrading"/> for more - information about channels). Thus, the Git branch - <literal>origin/nixos-17.03</literal> will contain the latest built and - tested version available in the <literal>nixos-17.03</literal> channel. - </para> - <para> - It’s often inconvenient to develop directly on the master branch, since if - somebody has just committed (say) a change to GCC, then the binary cache may - not have caught up yet and you’ll have to rebuild everything from source. - So you may want to create a local branch based on your current NixOS version: -<screen> -<prompt>$ </prompt>nixos-version -17.09pre104379.6e0b727 (Hummingbird) - -<prompt>$ </prompt>git checkout -b local 6e0b727 -</screen> - Or, to base your local branch on the latest version available in a NixOS - channel: -<screen> -<prompt>$ </prompt>git remote update origin -<prompt>$ </prompt>git checkout -b local origin/nixos-17.03 -</screen> - (Replace <literal>nixos-17.03</literal> with the name of the channel you want - to use.) You can use <command>git merge</command> or <command>git - rebase</command> to keep your local branch in sync with the channel, e.g. -<screen> -<prompt>$ </prompt>git remote update origin -<prompt>$ </prompt>git merge origin/nixos-17.03 -</screen> - You can use <command>git cherry-pick</command> to copy commits from your - local branch to the upstream branch. - </para> - <para> - If you want to rebuild your system using your (modified) sources, you need to - tell <command>nixos-rebuild</command> about them using the - <option>-I</option> flag: -<screen> -<prompt># </prompt>nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs -</screen> - </para> - <para> - If you want <command>nix-env</command> to use the expressions in - <replaceable>/my/sources</replaceable>, use <command>nix-env -f - <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the - default by adding a symlink in <filename>~/.nix-defexpr</filename>: -<screen> -<prompt>$ </prompt>ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs -</screen> - You may want to delete the symlink - <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s NixOS - channel from clashing with your own tree (this may break the - command-not-found utility though). If you want to go back to the default - state, you may just remove the <filename>~/.nix-defexpr</filename> directory - completely, log out and log in again and it should have been recreated with a - link to the root channels. - </para> -<!-- FIXME: not sure what this means. -<para>You should not pass the base directory -<filename><replaceable>/my/sources</replaceable></filename> -to <command>nix-env</command>, as it will break after interpreting expressions -in <filename>nixos/</filename> as packages.</para> ---> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/development/testing-installer.chapter.md b/nixpkgs/nixos/doc/manual/development/testing-installer.chapter.md new file mode 100644 index 000000000000..2eaa01614920 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/testing-installer.chapter.md @@ -0,0 +1,18 @@ +# Testing the Installer {#ch-testing-installer} + +Building, burning, and booting from an installation CD is rather +tedious, so here is a quick way to see if the installer works properly: + +```ShellSession +# mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install +# ./result/bin/nixos-install +``` + +To start a login shell in the new NixOS installation in `/mnt`: + +```ShellSession +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter +``` diff --git a/nixpkgs/nixos/doc/manual/development/testing-installer.xml b/nixpkgs/nixos/doc/manual/development/testing-installer.xml deleted file mode 100644 index 902f995fbc1b..000000000000 --- a/nixpkgs/nixos/doc/manual/development/testing-installer.xml +++ /dev/null @@ -1,22 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-testing-installer"> - <title>Testing the Installer</title> - <para> - Building, burning, and booting from an installation CD is rather tedious, so - here is a quick way to see if the installer works properly: -<screen> -<prompt># </prompt>mount -t tmpfs none /mnt -<prompt># </prompt>nixos-generate-config --root /mnt -<prompt>$ </prompt>nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install -<prompt># </prompt>./result/bin/nixos-install</screen> - To start a login shell in the new NixOS installation in - <filename>/mnt</filename>: -<screen> -<prompt>$ </prompt>nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter -<prompt># </prompt>./result/bin/nixos-enter -</screen> - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/development/writing-documentation.chapter.md b/nixpkgs/nixos/doc/manual/development/writing-documentation.chapter.md new file mode 100644 index 000000000000..7c29f600d701 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/writing-documentation.chapter.md @@ -0,0 +1,93 @@ +# Writing NixOS Documentation {#sec-writing-documentation} + +As NixOS grows, so too does the need for a catalogue and explanation of +its extensive functionality. Collecting pertinent information from +disparate sources and presenting it in an accessible style would be a +worthy contribution to the project. + +## Building the Manual {#sec-writing-docs-building-the-manual} + +The DocBook sources of the [](#book-nixos-manual) are in the +[`nixos/doc/manual`](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) +subdirectory of the Nixpkgs repository. + +You can quickly validate your edits with `make`: + +```ShellSession +$ cd /path/to/nixpkgs/nixos/doc/manual +$ nix-shell +nix-shell$ make +``` + +Once you are done making modifications to the manual, it\'s important to +build it before committing. You can do that as follows: + +```ShellSession +nix-build nixos/release.nix -A manual.x86_64-linux +``` + +When this command successfully finishes, it will tell you where the +manual got generated. The HTML will be accessible through the `result` +symlink at `./result/share/doc/nixos/index.html`. + +## Editing DocBook XML {#sec-writing-docs-editing-docbook-xml} + +For general information on how to write in DocBook, see [DocBook 5: The +Definitive Guide](http://www.docbook.org/tdg5/en/html/docbook.html). + +Emacs nXML Mode is very helpful for editing DocBook XML because it +validates the document as you write, and precisely locates errors. To +use it, see [](#sec-emacs-docbook-xml). + +[Pandoc](http://pandoc.org) can generate DocBook XML from a multitude of +formats, which makes a good starting point. Here is an example of Pandoc +invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML: + +```ShellSession +pandoc -f markdown_github -t docbook5 docs.md -o my-section.md +``` + +Pandoc can also quickly convert a single `section.xml` to HTML, which is +helpful when drafting. + +Sometimes writing valid DocBook is simply too difficult. In this case, +submit your documentation updates in a [GitHub +Issue](https://github.com/NixOS/nixpkgs/issues/new) and someone will +handle the conversion to XML for you. + +## Creating a Topic {#sec-writing-docs-creating-a-topic} + +You can use an existing topic as a basis for the new topic or create a +topic from scratch. + +Keep the following guidelines in mind when you create and add a topic: + +- The NixOS [`book`](http://www.docbook.org/tdg5/en/html/book.html) + element is in `nixos/doc/manual/manual.xml`. It includes several + [`parts`](http://www.docbook.org/tdg5/en/html/book.html) which are in + subdirectories. + +- Store the topic file in the same directory as the `part` to which it + belongs. If your topic is about configuring a NixOS module, then the + XML file can be stored alongside the module definition `nix` file. + +- If you include multiple words in the file name, separate the words + with a dash. For example: `ipv6-config.xml`. + +- Make sure that the `xml:id` value is unique. You can use abbreviations + if the ID is too long. For example: `nixos-config`. + +- Determine whether your topic is a chapter or a section. If you are + unsure, open an existing topic file and check whether the main + element is chapter or section. + +## Adding a Topic to the Book {#sec-writing-docs-adding-a-topic} + +Open the parent XML file and add an `xi:include` element to the list of +chapters with the file name of the topic that you created. If you +created a `section`, you add the file to the `chapter` file. If you created +a `chapter`, you add the file to the `part` file. + +If the topic is about configuring a NixOS module, it can be +automatically included in the manual by using the `meta.doc` attribute. +See [](#sec-meta-attributes) for an explanation. diff --git a/nixpkgs/nixos/doc/manual/development/writing-documentation.xml b/nixpkgs/nixos/doc/manual/development/writing-documentation.xml deleted file mode 100644 index 89fab6665616..000000000000 --- a/nixpkgs/nixos/doc/manual/development/writing-documentation.xml +++ /dev/null @@ -1,150 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-writing-documentation"> - <title>Writing NixOS Documentation</title> - <para> - As NixOS grows, so too does the need for a catalogue and explanation of its - extensive functionality. Collecting pertinent information from disparate - sources and presenting it in an accessible style would be a worthy - contribution to the project. - </para> - <section xml:id="sec-writing-docs-building-the-manual"> - <title>Building the Manual</title> - - <para> - The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the - <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link> - subdirectory of the Nixpkgs repository. - </para> - - <para> - You can quickly validate your edits with <command>make</command>: - </para> - -<screen> -<prompt>$ </prompt>cd /path/to/nixpkgs/nixos/doc/manual -<prompt>$ </prompt>nix-shell -<prompt>nix-shell$ </prompt>make -</screen> - - <para> - Once you are done making modifications to the manual, it's important to - build it before committing. You can do that as follows: - </para> - -<screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen> - - <para> - When this command successfully finishes, it will tell you where the manual - got generated. The HTML will be accessible through the - <filename>result</filename> symlink at - <filename>./result/share/doc/nixos/index.html</filename>. - </para> - </section> - <section xml:id="sec-writing-docs-editing-docbook-xml"> - <title>Editing DocBook XML</title> - - <para> - For general information on how to write in DocBook, see - <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook - 5: The Definitive Guide</link>. - </para> - - <para> - Emacs nXML Mode is very helpful for editing DocBook XML because it validates - the document as you write, and precisely locates errors. To use it, see - <xref linkend="sec-emacs-docbook-xml"/>. - </para> - - <para> - <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML - from a multitude of formats, which makes a good starting point. - <example xml:id="ex-pandoc-xml-conv"> - <title>Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML</title> -<screen>pandoc -f markdown_github -t docbook5 docs.md -o my-section.md</screen> - </example> - Pandoc can also quickly convert a single <filename>section.xml</filename> to - HTML, which is helpful when drafting. - </para> - - <para> - Sometimes writing valid DocBook is simply too difficult. In this case, - submit your documentation updates in a - <link - xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub - Issue</link> and someone will handle the conversion to XML for you. - </para> - </section> - <section xml:id="sec-writing-docs-creating-a-topic"> - <title>Creating a Topic</title> - - <para> - You can use an existing topic as a basis for the new topic or create a topic - from scratch. - </para> - - <para> - Keep the following guidelines in mind when you create and add a topic: - <itemizedlist> - <listitem> - <para> - The NixOS - <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link> - element is in <filename>nixos/doc/manual/manual.xml</filename>. It - includes several - <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link> - which are in subdirectories. - </para> - </listitem> - <listitem> - <para> - Store the topic file in the same directory as the <tag>part</tag> to - which it belongs. If your topic is about configuring a NixOS module, then - the XML file can be stored alongside the module definition - <filename>nix</filename> file. - </para> - </listitem> - <listitem> - <para> - If you include multiple words in the file name, separate the words with a - dash. For example: <filename>ipv6-config.xml</filename>. - </para> - </listitem> - <listitem> - <para> - Make sure that the <tag>xml:id</tag> value is unique. You can use - abbreviations if the ID is too long. For example: - <varname>nixos-config</varname>. - </para> - </listitem> - <listitem> - <para> - Determine whether your topic is a chapter or a section. If you are - unsure, open an existing topic file and check whether the main element is - chapter or section. - </para> - </listitem> - </itemizedlist> - </para> - </section> - <section xml:id="sec-writing-docs-adding-a-topic"> - <title>Adding a Topic to the Book</title> - - <para> - Open the parent XML file and add an <varname>xi:include</varname> element to - the list of chapters with the file name of the topic that you created. If - you created a <tag>section</tag>, you add the file to the <tag>chapter</tag> - file. If you created a <tag>chapter</tag>, you add the file to the - <tag>part</tag> file. - </para> - - <para> - If the topic is about configuring a NixOS module, it can be automatically - included in the manual by using the <varname>meta.doc</varname> attribute. - See <xref - linkend="sec-meta-attributes"/> for an explanation. - </para> - </section> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/development/writing-modules.chapter.md b/nixpkgs/nixos/doc/manual/development/writing-modules.chapter.md new file mode 100644 index 000000000000..2e3c6b34f1f5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/development/writing-modules.chapter.md @@ -0,0 +1,166 @@ +# Writing NixOS Modules {#sec-writing-modules} + +NixOS has a modular system for declarative configuration. This system +combines multiple *modules* to produce the full system configuration. +One of the modules that constitute the configuration is +`/etc/nixos/configuration.nix`. Most of the others live in the +[`nixos/modules`](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules) +subdirectory of the Nixpkgs tree. + +Each NixOS module is a file that handles one logical aspect of the +configuration, such as a specific kind of hardware, a service, or +network settings. A module configuration does not have to handle +everything from scratch; it can use the functionality provided by other +modules for its implementation. Thus a module can *declare* options that +can be used by other modules, and conversely can *define* options +provided by other modules in its own implementation. For example, the +module +[`pam.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix) +declares the option `security.pam.services` that allows other modules (e.g. +[`sshd.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix)) +to define PAM services; and it defines the option `environment.etc` (declared by +[`etc.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix)) +to cause files to be created in `/etc/pam.d`. + +In [](#sec-configuration-syntax), we saw the following structure of +NixOS modules: + +```nix +{ config, pkgs, ... }: + +{ option definitions +} +``` + +This is actually an *abbreviated* form of module that only defines +options, but does not declare any. The structure of full NixOS modules +is shown in [Example: Structure of NixOS Modules](#ex-module-syntax). + +::: {#ex-module-syntax .example} +::: {.title} +**Example: Structure of NixOS Modules** +::: +```nix +{ config, pkgs, ... }: + +{ + imports = + [ paths of other modules + ]; + + options = { + option declarations + }; + + config = { + option definitions + }; +} +``` +::: + +The meaning of each part is as follows. + +- The first line makes the current Nix expression a function. The variable + `pkgs` contains Nixpkgs (by default, it takes the `nixpkgs` entry of + `NIX_PATH`, see the [Nix manual](https://nixos.org/manual/nix/stable/#sec-common-env) + for further details), while `config` contains the full system + configuration. This line can be omitted if there is no reference to + `pkgs` and `config` inside the module. + +- This `imports` list enumerates the paths to other NixOS modules that + should be included in the evaluation of the system configuration. A + default set of modules is defined in the file `modules/module-list.nix`. + These don\'t need to be added in the import list. + +- The attribute `options` is a nested set of *option declarations* + (described below). + +- The attribute `config` is a nested set of *option definitions* (also + described below). + +[Example: NixOS Module for the "locate" Service](#locate-example) +shows a module that handles the regular update of the "locate" database, +an index of all files in the file system. This module declares two +options that can be defined by other modules (typically the user's +`configuration.nix`): `services.locate.enable` (whether the database should +be updated) and `services.locate.interval` (when the update should be done). +It implements its functionality by defining two options declared by other +modules: `systemd.services` (the set of all systemd services) and +`systemd.timers` (the list of commands to be executed periodically by +`systemd`). + +::: {#locate-example .example} +::: {.title} +**Example: NixOS Module for the "locate" Service** +::: +```nix +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.locate; +in { + options.services.locate = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically update the database of + files used by the locate command. + ''; + }; + + interval = mkOption { + type = types.str; + default = "02:15"; + example = "hourly"; + description = '' + Update the locate database at this interval. Updates by + default at 2:15 AM every day. + + The format is described in + systemd.time(7). + ''; + }; + + # Other options omitted for documentation + }; + + config = { + systemd.services.update-locatedb = + { description = "Update Locate Database"; + path = [ pkgs.su ]; + script = + '' + mkdir -m 0755 -p $(dirname ${toString cfg.output}) + exec updatedb \ + --localuser=${cfg.localuser} \ + ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ + --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} + ''; + }; + + systemd.timers.update-locatedb = mkIf cfg.enable + { description = "Update timer for locate database"; + partOf = [ "update-locatedb.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.interval; + }; + }; +} +``` +::: + +```{=docbook} +<xi:include href="option-declarations.section.xml" /> +<xi:include href="option-types.section.xml" /> +<xi:include href="option-def.section.xml" /> +<xi:include href="assertions.section.xml" /> +<xi:include href="meta-attributes.section.xml" /> +<xi:include href="importing-modules.section.xml" /> +<xi:include href="replace-modules.section.xml" /> +<xi:include href="freeform-modules.section.xml" /> +<xi:include href="settings-options.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/development/writing-modules.xml b/nixpkgs/nixos/doc/manual/development/writing-modules.xml deleted file mode 100644 index 04497db77b89..000000000000 --- a/nixpkgs/nixos/doc/manual/development/writing-modules.xml +++ /dev/null @@ -1,191 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-writing-modules"> - <title>Writing NixOS Modules</title> - <para> - NixOS has a modular system for declarative configuration. This system - combines multiple <emphasis>modules</emphasis> to produce the full system - configuration. One of the modules that constitute the configuration is - <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in - the - <link -xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link> - subdirectory of the Nixpkgs tree. - </para> - <para> - Each NixOS module is a file that handles one logical aspect of the - configuration, such as a specific kind of hardware, a service, or network - settings. A module configuration does not have to handle everything from - scratch; it can use the functionality provided by other modules for its - implementation. Thus a module can <emphasis>declare</emphasis> options that - can be used by other modules, and conversely can <emphasis>define</emphasis> - options provided by other modules in its own implementation. For example, the - module - <link -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link> - declares the option <option>security.pam.services</option> that allows other - modules (e.g. - <link -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>) - to define PAM services; and it defines the option - <option>environment.etc</option> (declared by - <link -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>) - to cause files to be created in <filename>/etc/pam.d</filename>. - </para> - <para xml:id="para-module-syn"> - In <xref -linkend="sec-configuration-syntax"/>, we saw the following structure - of NixOS modules: -<programlisting> -{ config, pkgs, ... }: - -{ <replaceable>option definitions</replaceable> -} -</programlisting> - This is actually an <emphasis>abbreviated</emphasis> form of module that only - defines options, but does not declare any. The structure of full NixOS - modules is shown in <xref linkend='ex-module-syntax' />. - </para> - <example xml:id='ex-module-syntax'> - <title>Structure of NixOS Modules</title> -<programlisting> -{ config, pkgs, ... }: <co xml:id='module-syntax-1' /> - -{ - imports = - [ <replaceable>paths of other modules</replaceable> <co xml:id='module-syntax-2' /> - ]; - - options = { - <replaceable>option declarations</replaceable> <co xml:id='module-syntax-3' /> - }; - - config = { - <replaceable>option definitions</replaceable> <co xml:id='module-syntax-4' /> - }; -}</programlisting> - </example> - <para> - The meaning of each part is as follows. - <calloutlist> - <callout arearefs='module-syntax-1'> - <para> - This line makes the current Nix expression a function. The variable - <varname>pkgs</varname> contains Nixpkgs (by default, it takes the - <varname>nixpkgs</varname> entry of <envar>NIX_PATH</envar>, see the <link - xlink:href="https://nixos.org/manual/nix/stable/#sec-common-env">Nix - manual</link> for further details), while <varname>config</varname> - contains the full system configuration. This line can be omitted if there - is no reference to <varname>pkgs</varname> and <varname>config</varname> - inside the module. - </para> - </callout> - <callout arearefs='module-syntax-2'> - <para> - This list enumerates the paths to other NixOS modules that should be - included in the evaluation of the system configuration. A default set of - modules is defined in the file - <filename>modules/module-list.nix</filename>. These don't need to be added - in the import list. - </para> - </callout> - <callout arearefs='module-syntax-3'> - <para> - The attribute <varname>options</varname> is a nested set of - <emphasis>option declarations</emphasis> (described below). - </para> - </callout> - <callout arearefs='module-syntax-4'> - <para> - The attribute <varname>config</varname> is a nested set of - <emphasis>option definitions</emphasis> (also described below). - </para> - </callout> - </calloutlist> - </para> - <para> - <xref linkend='locate-example' /> shows a module that handles the regular - update of the “locate” database, an index of all files in the file - system. This module declares two options that can be defined by other modules - (typically the user’s <filename>configuration.nix</filename>): - <option>services.locate.enable</option> (whether the database should be - updated) and <option>services.locate.interval</option> (when the update - should be done). It implements its functionality by defining two options - declared by other modules: <option>systemd.services</option> (the set of all - systemd services) and <option>systemd.timers</option> (the list of commands - to be executed periodically by <command>systemd</command>). - </para> - <example xml:id='locate-example'> - <title>NixOS Module for the “locate” Service</title> -<programlisting> -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.locate; -in { - options.services.locate = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, NixOS will periodically update the database of - files used by the <command>locate</command> command. - ''; - }; - - interval = mkOption { - type = types.str; - default = "02:15"; - example = "hourly"; - description = '' - Update the locate database at this interval. Updates by - default at 2:15 AM every day. - - The format is described in - <citerefentry><refentrytitle>systemd.time</refentrytitle> - <manvolnum>7</manvolnum></citerefentry>. - ''; - }; - - # Other options omitted for documentation - }; - - config = { - systemd.services.update-locatedb = - { description = "Update Locate Database"; - path = [ pkgs.su ]; - script = - '' - mkdir -m 0755 -p $(dirname ${toString cfg.output}) - exec updatedb \ - --localuser=${cfg.localuser} \ - ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ - --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} - ''; - }; - - systemd.timers.update-locatedb = mkIf cfg.enable - { description = "Update timer for locate database"; - partOf = [ "update-locatedb.service" ]; - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.interval; - }; - }; -} -</programlisting> - </example> - <xi:include href="option-declarations.xml" /> - <xi:include href="option-types.xml" /> - <xi:include href="option-def.xml" /> - <xi:include href="../from_md/development/assertions.section.xml" /> - <xi:include href="meta-attributes.xml" /> - <xi:include href="importing-modules.xml" /> - <xi:include href="replace-modules.xml" /> - <xi:include href="freeform-modules.xml" /> - <xi:include href="settings-options.xml" /> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/boot-problems.section.xml index 4ea01e78f32f..144661c86eba 100644 --- a/nixpkgs/nixos/doc/manual/from_md/administration/boot-problems.section.xml +++ b/nixpkgs/nixos/doc/manual/from_md/administration/boot-problems.section.xml @@ -61,7 +61,7 @@ <link linkend="opt-fileSystems._name_.neededForBoot">neededForBoot</link>). As a motivating example, this could be useful if you’ve forgotten to set - <link xlink:href="options.html#opt-fileSystems._name_.neededForBoot">neededForBoot</link> + <link linkend="opt-fileSystems._name_.neededForBoot">neededForBoot</link> on a file system. </para> </listitem> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml new file mode 100644 index 000000000000..0ca98dd6e510 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml @@ -0,0 +1,71 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-gc"> + <title>Cleaning the Nix Store</title> + <para> + Nix has a purely functional model, meaning that packages are never + upgraded in place. Instead new versions of packages end up in a + different location in the Nix store (<literal>/nix/store</literal>). + You should periodically run Nix’s <emphasis>garbage + collector</emphasis> to remove old, unreferenced packages. This is + easy: + </para> + <programlisting> +$ nix-collect-garbage +</programlisting> + <para> + Alternatively, you can use a systemd unit that does the same in the + background: + </para> + <programlisting> +# systemctl start nix-gc.service +</programlisting> + <para> + You can tell NixOS in <literal>configuration.nix</literal> to run + this unit automatically at certain points in time, for instance, + every night at 03:15: + </para> + <programlisting language="bash"> +nix.gc.automatic = true; +nix.gc.dates = "03:15"; +</programlisting> + <para> + The commands above do not remove garbage collector roots, such as + old system configurations. Thus they do not remove the ability to + roll back to previous configurations. The following command deletes + old roots, removing the ability to roll back to them: + </para> + <programlisting> +$ nix-collect-garbage -d +</programlisting> + <para> + You can also do this for specific profiles, e.g. + </para> + <programlisting> +$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old +</programlisting> + <para> + Note that NixOS system configurations are stored in the profile + <literal>/nix/var/nix/profiles/system</literal>. + </para> + <para> + Another way to reclaim disk space (often as much as 40% of the size + of the Nix store) is to run Nix’s store optimiser, which seeks out + identical files in the store and replaces them with hard links to a + single copy. + </para> + <programlisting> +$ nix-store --optimise +</programlisting> + <para> + Since this command needs to read the entire Nix store, it can take + quite a while to finish. + </para> + <section xml:id="sect-nixos-gc-boot-entries"> + <title>NixOS Boot Entries</title> + <para> + If your <literal>/boot</literal> partition runs out of space, + after clearing old profiles you must rebuild your system with + <literal>nixos-rebuild</literal> to update the + <literal>/boot</literal> partition and clear space. + </para> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/container-networking.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/container-networking.section.xml new file mode 100644 index 000000000000..788a2b7b0acb --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/container-networking.section.xml @@ -0,0 +1,54 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-container-networking"> + <title>Container Networking</title> + <para> + When you create a container using + <literal>nixos-container create</literal>, it gets it own private + IPv4 address in the range <literal>10.233.0.0/16</literal>. You can + get the container’s IPv4 address as follows: + </para> + <programlisting> +# nixos-container show-ip foo +10.233.4.2 + +$ ping -c1 10.233.4.2 +64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms +</programlisting> + <para> + Networking is implemented using a pair of virtual Ethernet devices. + The network interface in the container is called + <literal>eth0</literal>, while the matching interface in the host is + called <literal>ve-container-name</literal> (e.g., + <literal>ve-foo</literal>). The container has its own network + namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it + can perform arbitrary network configuration such as setting up + firewall rules, without affecting or having access to the host’s + network. + </para> + <para> + By default, containers cannot talk to the outside network. If you + want that, you should set up Network Address Translation (NAT) rules + on the host to rewrite container traffic to use your external IP + address. This can be accomplished using the following configuration + on the host: + </para> + <programlisting language="bash"> +networking.nat.enable = true; +networking.nat.internalInterfaces = ["ve-+"]; +networking.nat.externalInterface = "eth0"; +</programlisting> + <para> + where <literal>eth0</literal> should be replaced with the desired + external interface. Note that <literal>ve-+</literal> is a wildcard + that matches all container interfaces. + </para> + <para> + If you are using Network Manager, you need to explicitly prevent it + from managing container interfaces: + </para> + <programlisting language="bash"> +networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; +</programlisting> + <para> + You may need to restart your system for the changes to take effect. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/containers.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/containers.chapter.xml new file mode 100644 index 000000000000..afbd5b35aaa5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/containers.chapter.xml @@ -0,0 +1,31 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-containers"> + <title>Container Management</title> + <para> + NixOS allows you to easily run other NixOS instances as + <emphasis>containers</emphasis>. Containers are a light-weight + approach to virtualisation that runs software in the container at + the same speed as in the host system. NixOS containers share the Nix + store of the host, making container creation very efficient. + </para> + <warning> + <para> + Currently, NixOS containers are not perfectly isolated from the + host system. This means that a user with root access to the + container can do things that affect the host. So you should not + give container root access to untrusted users. + </para> + </warning> + <para> + NixOS containers can be created in two ways: imperatively, using the + command <literal>nixos-container</literal>, and declaratively, by + specifying them in your <literal>configuration.nix</literal>. The + declarative approach implies that containers get upgraded along with + your host system when you run <literal>nixos-rebuild</literal>, + which is often not what you want. By contrast, in the imperative + approach, containers are configured and updated independently from + the host system. + </para> + <xi:include href="imperative-containers.section.xml" /> + <xi:include href="declarative-containers.section.xml" /> + <xi:include href="container-networking.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/control-groups.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/control-groups.chapter.xml new file mode 100644 index 000000000000..8dab2c9d44b4 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/control-groups.chapter.xml @@ -0,0 +1,67 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-cgroups"> + <title>Control Groups</title> + <para> + To keep track of the processes in a running system, systemd uses + <emphasis>control groups</emphasis> (cgroups). A control group is a + set of processes used to allocate resources such as CPU, memory or + I/O bandwidth. There can be multiple control group hierarchies, + allowing each kind of resource to be managed independently. + </para> + <para> + The command <literal>systemd-cgls</literal> lists all control groups + in the <literal>systemd</literal> hierarchy, which is what systemd + uses to keep track of the processes belonging to each service or + user session: + </para> + <programlisting> +$ systemd-cgls +├─user +│ └─eelco +│ └─c1 +│ ├─ 2567 -:0 +│ ├─ 2682 kdeinit4: kdeinit4 Running... +│ ├─ ... +│ └─10851 sh -c less -R +└─system + ├─httpd.service + │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH + │ └─... + ├─dhcpcd.service + │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf + └─ ... +</programlisting> + <para> + Similarly, <literal>systemd-cgls cpu</literal> shows the cgroups in + the CPU hierarchy, which allows per-cgroup CPU scheduling + priorities. By default, every systemd service gets its own CPU + cgroup, while all user sessions are in the top-level CPU cgroup. + This ensures, for instance, that a thousand run-away processes in + the <literal>httpd.service</literal> cgroup cannot starve the CPU + for one process in the <literal>postgresql.service</literal> cgroup. + (By contrast, it they were in the same cgroup, then the PostgreSQL + process would get 1/1001 of the cgroup’s CPU time.) You can limit a + service’s CPU share in <literal>configuration.nix</literal>: + </para> + <programlisting language="bash"> +systemd.services.httpd.serviceConfig.CPUShares = 512; +</programlisting> + <para> + By default, every cgroup has 1024 CPU shares, so this will halve the + CPU allocation of the <literal>httpd.service</literal> cgroup. + </para> + <para> + There also is a <literal>memory</literal> hierarchy that controls + memory allocation limits; by default, all processes are in the + top-level cgroup, so any service or session can exhaust all + available memory. Per-cgroup memory limits can be specified in + <literal>configuration.nix</literal>; for instance, to limit + <literal>httpd.service</literal> to 512 MiB of RAM (excluding swap): + </para> + <programlisting language="bash"> +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +</programlisting> + <para> + The command <literal>systemd-cgtop</literal> shows a continuously + updated list of all cgroups with their CPU and memory usage. + </para> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/declarative-containers.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/declarative-containers.section.xml new file mode 100644 index 000000000000..a918314a2723 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/declarative-containers.section.xml @@ -0,0 +1,60 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-declarative-containers"> + <title>Declarative Container Specification</title> + <para> + You can also specify containers and their configuration in the + host’s <literal>configuration.nix</literal>. For example, the + following specifies that there shall be a container named + <literal>database</literal> running PostgreSQL: + </para> + <programlisting language="bash"> +containers.database = + { config = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql_9_6; + }; + }; +</programlisting> + <para> + If you run <literal>nixos-rebuild switch</literal>, the container + will be built. If the container was already running, it will be + updated in place, without rebooting. The container can be configured + to start automatically by setting + <literal>containers.database.autoStart = true</literal> in its + configuration. + </para> + <para> + By default, declarative containers share the network namespace of + the host, meaning that they can listen on (privileged) ports. + However, they cannot change the network configuration. You can give + a container its own network as follows: + </para> + <programlisting language="bash"> +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; +</programlisting> + <para> + This gives the container a private virtual Ethernet interface with + IP address <literal>192.168.100.11</literal>, which is hooked up to + a virtual Ethernet interface on the host with IP address + <literal>192.168.100.10</literal>. (See the next section for details + on container networking.) + </para> + <para> + To disable the container, just remove it from + <literal>configuration.nix</literal> and run + <literal>nixos-rebuild switch</literal>. Note that this will not + delete the root directory of the container in + <literal>/var/lib/containers</literal>. Containers can be destroyed + using the imperative method: + <literal>nixos-container destroy foo</literal>. + </para> + <para> + Declarative containers can be started and stopped using the + corresponding systemd service, e.g. + <literal>systemctl start container@database</literal>. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/imperative-containers.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/imperative-containers.section.xml new file mode 100644 index 000000000000..59ecfdee5af0 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/imperative-containers.section.xml @@ -0,0 +1,131 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-imperative-containers"> + <title>Imperative Container Management</title> + <para> + We’ll cover imperative container management using + <literal>nixos-container</literal> first. Be aware that container + management is currently only possible as <literal>root</literal>. + </para> + <para> + You create a container with identifier <literal>foo</literal> as + follows: + </para> + <programlisting> +# nixos-container create foo +</programlisting> + <para> + This creates the container’s root directory in + <literal>/var/lib/containers/foo</literal> and a small configuration + file in <literal>/etc/containers/foo.conf</literal>. It also builds + the container’s initial system configuration and stores it in + <literal>/nix/var/nix/profiles/per-container/foo/system</literal>. + You can modify the initial configuration of the container on the + command line. For instance, to create a container that has + <literal>sshd</literal> running, with the given public key for + <literal>root</literal>: + </para> + <programlisting> +# nixos-container create foo --config ' + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; +' +</programlisting> + <para> + By default the next free address in the + <literal>10.233.0.0/16</literal> subnet will be chosen as container + IP. This behavior can be altered by setting + <literal>--host-address</literal> and + <literal>--local-address</literal>: + </para> + <programlisting> +# nixos-container create test --config-file test-container.nix \ + --local-address 10.235.1.2 --host-address 10.235.1.1 +</programlisting> + <para> + Creating a container does not start it. To start the container, run: + </para> + <programlisting> +# nixos-container start foo +</programlisting> + <para> + This command will return as soon as the container has booted and has + reached <literal>multi-user.target</literal>. On the host, the + container runs within a systemd unit called + <literal>container@container-name.service</literal>. Thus, if + something went wrong, you can get status info using + <literal>systemctl</literal>: + </para> + <programlisting> +# systemctl status container@foo +</programlisting> + <para> + If the container has started successfully, you can log in as root + using the <literal>root-login</literal> operation: + </para> + <programlisting> +# nixos-container root-login foo +[root@foo:~]# +</programlisting> + <para> + Note that only root on the host can do this (since there is no + authentication). You can also get a regular login prompt using the + <literal>login</literal> operation, which is available to all users + on the host: + </para> + <programlisting> +# nixos-container login foo +foo login: alice +Password: *** +</programlisting> + <para> + With <literal>nixos-container run</literal>, you can execute + arbitrary commands in the container: + </para> + <programlisting> +# nixos-container run foo -- uname -a +Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux +</programlisting> + <para> + There are several ways to change the configuration of the container. + First, on the host, you can edit + <literal>/var/lib/container/name/etc/nixos/configuration.nix</literal>, + and run + </para> + <programlisting> +# nixos-container update foo +</programlisting> + <para> + This will build and activate the new configuration. You can also + specify a new configuration on the command line: + </para> + <programlisting> +# nixos-container update foo --config ' + services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; +' + +# curl http://$(nixos-container show-ip foo)/ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… +</programlisting> + <para> + However, note that this will overwrite the container’s + <literal>/etc/nixos/configuration.nix</literal>. + </para> + <para> + Alternatively, you can change the configuration from within the + container itself by running <literal>nixos-rebuild switch</literal> + inside the container. Note that the container by default does not + have a copy of the NixOS channel, so you should run + <literal>nix-channel --update</literal> first. + </para> + <para> + Containers can be stopped and started using + <literal>nixos-container stop</literal> and + <literal>nixos-container start</literal>, respectively, or by using + <literal>systemctl</literal> on the container’s service unit. To + destroy a container, including its file system, do + </para> + <programlisting> +# nixos-container destroy foo +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/logging.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/logging.chapter.xml new file mode 100644 index 000000000000..4da38c065a27 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/logging.chapter.xml @@ -0,0 +1,45 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-logging"> + <title>Logging</title> + <para> + System-wide logging is provided by systemd’s + <emphasis>journal</emphasis>, which subsumes traditional logging + daemons such as syslogd and klogd. Log entries are kept in binary + files in <literal>/var/log/journal/</literal>. The command + <literal>journalctl</literal> allows you to see the contents of the + journal. For example, + </para> + <programlisting> +$ journalctl -b +</programlisting> + <para> + shows all journal entries since the last reboot. (The output of + <literal>journalctl</literal> is piped into <literal>less</literal> + by default.) You can use various options and match operators to + restrict output to messages of interest. For instance, to get all + messages from PostgreSQL: + </para> + <programlisting> +$ journalctl -u postgresql.service +-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- +... +Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down +-- Reboot -- +Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET +Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections +</programlisting> + <para> + Or to get all messages since the last reboot that have at least a + <quote>critical</quote> severity level: + </para> + <programlisting> +$ journalctl -b -p crit +Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] +Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) +</programlisting> + <para> + The system journal is readable by root and by users in the + <literal>wheel</literal> and <literal>systemd-journal</literal> + groups. All users have a private journal that can be read using + <literal>journalctl</literal>. + </para> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml new file mode 100644 index 000000000000..c86b1911c117 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml @@ -0,0 +1,14 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-maintenance-mode"> + <title>Maintenance Mode</title> + <para> + You can enter rescue mode by running: + </para> + <programlisting> +# systemctl rescue +</programlisting> + <para> + This will eventually give you a single-user root shell. Systemd will + stop (almost) all system services. To get out of maintenance mode, + just exit from the rescue shell. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/network-problems.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/network-problems.section.xml new file mode 100644 index 000000000000..4c0598ca94e8 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/network-problems.section.xml @@ -0,0 +1,25 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-network-issues"> + <title>Network Problems</title> + <para> + Nix uses a so-called <emphasis>binary cache</emphasis> to optimise + building a package from source into downloading it as a pre-built + binary. That is, whenever a command like + <literal>nixos-rebuild</literal> needs a path in the Nix store, Nix + will try to download that path from the Internet rather than build + it from source. The default binary cache is + <literal>https://cache.nixos.org/</literal>. If this cache is + unreachable, Nix operations may take a long time due to HTTP + connection timeouts. You can disable the use of the binary cache by + adding <literal>--option use-binary-caches false</literal>, e.g. + </para> + <programlisting> +# nixos-rebuild switch --option use-binary-caches false +</programlisting> + <para> + If you have an alternative binary cache at your disposal, you can + use it instead: + </para> + <programlisting> +# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/rebooting.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/rebooting.chapter.xml new file mode 100644 index 000000000000..78ee75afb642 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/rebooting.chapter.xml @@ -0,0 +1,38 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-rebooting"> + <title>Rebooting and Shutting Down</title> + <para> + The system can be shut down (and automatically powered off) by + doing: + </para> + <programlisting> +# shutdown +</programlisting> + <para> + This is equivalent to running <literal>systemctl poweroff</literal>. + </para> + <para> + To reboot the system, run + </para> + <programlisting> +# reboot +</programlisting> + <para> + which is equivalent to <literal>systemctl reboot</literal>. + Alternatively, you can quickly reboot the system using + <literal>kexec</literal>, which bypasses the BIOS by directly + loading the new kernel into memory: + </para> + <programlisting> +# systemctl kexec +</programlisting> + <para> + The machine can be suspended to RAM (if supported) using + <literal>systemctl suspend</literal>, and suspended to disk using + <literal>systemctl hibernate</literal>. + </para> + <para> + These commands can be run by any user who is logged in locally, i.e. + on a virtual console or in X11; otherwise, the user is asked for + authentication. + </para> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/rollback.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/rollback.section.xml new file mode 100644 index 000000000000..a8df053011c5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/rollback.section.xml @@ -0,0 +1,42 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-rollback"> + <title>Rolling Back Configuration Changes</title> + <para> + After running <literal>nixos-rebuild</literal> to switch to a new + configuration, you may find that the new configuration doesn’t work + very well. In that case, there are several ways to return to a + previous configuration. + </para> + <para> + First, the GRUB boot manager allows you to boot into any previous + configuration that hasn’t been garbage-collected. These + configurations can be found under the GRUB submenu <quote>NixOS - + All configurations</quote>. This is especially useful if the new + configuration fails to boot. After the system has booted, you can + make the selected configuration the default for subsequent boots: + </para> + <programlisting> +# /run/current-system/bin/switch-to-configuration boot +</programlisting> + <para> + Second, you can switch to the previous configuration in a running + system: + </para> + <programlisting> +# nixos-rebuild switch --rollback +</programlisting> + <para> + This is equivalent to running: + </para> + <programlisting> +# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch +</programlisting> + <para> + where <literal>N</literal> is the number of the NixOS system + configuration. To get a list of the available configurations, do: + </para> + <programlisting> +$ ls -l /nix/var/nix/profiles/system-*-link +... +lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml new file mode 100644 index 000000000000..8b01b8f896a4 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml @@ -0,0 +1,141 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-systemctl"> + <title>Service Management</title> + <para> + In NixOS, all system services are started and monitored using the + systemd program. systemd is the <quote>init</quote> process of the + system (i.e. PID 1), the parent of all other processes. It manages a + set of so-called <quote>units</quote>, which can be things like + system services (programs), but also mount points, swap files, + devices, targets (groups of units) and more. Units can have complex + dependencies; for instance, one unit can require that another unit + must be successfully started before the first unit can be started. + When the system boots, it starts a unit named + <literal>default.target</literal>; the dependencies of this unit + cause all system services to be started, file systems to be mounted, + swap files to be activated, and so on. + </para> + <section xml:id="sect-nixos-systemd-general"> + <title>Interacting with a running systemd</title> + <para> + The command <literal>systemctl</literal> is the main way to + interact with <literal>systemd</literal>. The following paragraphs + demonstrate ways to interact with any OS running systemd as init + system. NixOS is of no exception. The + <link linkend="sect-nixos-systemd-nixos">next section </link> + explains NixOS specific things worth knowing. + </para> + <para> + Without any arguments, <literal>systemctl</literal> the status of + active units: + </para> + <programlisting> +$ systemctl +-.mount loaded active mounted / +swapfile.swap loaded active active /swapfile +sshd.service loaded active running SSH Daemon +graphical.target loaded active active Graphical Interface +... +</programlisting> + <para> + You can ask for detailed status information about a unit, for + instance, the PostgreSQL database service: + </para> + <programlisting> +$ systemctl status postgresql.service +postgresql.service - PostgreSQL Server + Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) + Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago + Main PID: 2390 (postgres) + CGroup: name=systemd:/system/postgresql.service + ├─2390 postgres + ├─2418 postgres: writer process + ├─2419 postgres: wal writer process + ├─2420 postgres: autovacuum launcher process + ├─2421 postgres: stats collector process + └─2498 postgres: zabbix zabbix [local] idle + +Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET +Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections +Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started +Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. +</programlisting> + <para> + Note that this shows the status of the unit (active and running), + all the processes belonging to the service, as well as the most + recent log messages from the service. + </para> + <para> + Units can be stopped, started or restarted: + </para> + <programlisting> +# systemctl stop postgresql.service +# systemctl start postgresql.service +# systemctl restart postgresql.service +</programlisting> + <para> + These operations are synchronous: they wait until the service has + finished starting or stopping (or has failed). Starting a unit + will cause the dependencies of that unit to be started as well (if + necessary). + </para> + </section> + <section xml:id="sect-nixos-systemd-nixos"> + <title>systemd in NixOS</title> + <para> + Packages in Nixpkgs sometimes provide systemd units with them, + usually in e.g <literal>#pkg-out#/lib/systemd/</literal>. Putting + such a package in <literal>environment.systemPackages</literal> + doesn't make the service available to users or the system. + </para> + <para> + In order to enable a systemd <emphasis>system</emphasis> service + with provided upstream package, use (e.g): + </para> + <programlisting language="bash"> +systemd.packages = [ pkgs.packagekit ]; +</programlisting> + <para> + Usually NixOS modules written by the community do the above, plus + take care of other details. If a module was written for a service + you are interested in, you'd probably need only to use + <literal>services.#name#.enable = true;</literal>. These services + are defined in Nixpkgs' + <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"> + <literal>nixos/modules/</literal> directory </link>. In case the + service is simple enough, the above method should work, and start + the service on boot. + </para> + <para> + <emphasis>User</emphasis> systemd services on the other hand, + should be treated differently. Given a package that has a systemd + unit file at <literal>#pkg-out#/lib/systemd/user/</literal>, using + <xref linkend="opt-systemd.packages" /> will make you able to + start the service via <literal>systemctl --user start</literal>, + but it won't start automatically on login. However, You can + imperatively enable it by adding the package's attribute to + <xref linkend="opt-systemd.packages" /> and then do this (e.g): + </para> + <programlisting> +$ mkdir -p ~/.config/systemd/user/default.target.wants +$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ +$ systemctl --user daemon-reload +$ systemctl --user enable syncthing.service +</programlisting> + <para> + If you are interested in a timer file, use + <literal>timers.target.wants</literal> instead of + <literal>default.target.wants</literal> in the 1st and 2nd + command. + </para> + <para> + Using <literal>systemctl --user enable syncthing.service</literal> + instead of the above, will work, but it'll use the absolute path + of <literal>syncthing.service</literal> for the symlink, and this + path is in <literal>/nix/store/.../lib/systemd/user/</literal>. + Hence <link linkend="sec-nix-gc">garbage collection</link> will + remove that file and you will wind up with a broken symlink in + your systemd configuration, which in turn will not make the + service / timer start on login. + </para> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/store-corruption.section.xml b/nixpkgs/nixos/doc/manual/from_md/administration/store-corruption.section.xml new file mode 100644 index 000000000000..9ed572d484dc --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/store-corruption.section.xml @@ -0,0 +1,34 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-store-corruption"> + <title>Nix Store Corruption</title> + <para> + After a system crash, it’s possible for files in the Nix store to + become corrupted. (For instance, the Ext4 file system has the + tendency to replace un-synced files with zero bytes.) NixOS tries + hard to prevent this from happening: it performs a + <literal>sync</literal> before switching to a new configuration, and + Nix’s database is fully transactional. If corruption still occurs, + you may be able to fix it automatically. + </para> + <para> + If the corruption is in a path in the closure of the NixOS system + configuration, you can fix it by doing + </para> + <programlisting> +# nixos-rebuild switch --repair +</programlisting> + <para> + This will cause Nix to check every path in the closure, and if its + cryptographic hash differs from the hash recorded in Nix’s database, + the path is rebuilt or redownloaded. + </para> + <para> + You can also scan the entire Nix store for corrupt paths: + </para> + <programlisting> +# nix-store --verify --check-contents --repair +</programlisting> + <para> + Any corrupt paths will be redownloaded if they’re available in a + binary cache; otherwise, they cannot be repaired. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml new file mode 100644 index 000000000000..8bbb8a1fe729 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml @@ -0,0 +1,12 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-troubleshooting"> + <title>Troubleshooting</title> + <para> + This chapter describes solutions to common problems you might + encounter when you manage your NixOS system. + </para> + <xi:include href="boot-problems.section.xml" /> + <xi:include href="maintenance-mode.section.xml" /> + <xi:include href="rollback.section.xml" /> + <xi:include href="store-corruption.section.xml" /> + <xi:include href="network-problems.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml new file mode 100644 index 000000000000..e8c64f153fc5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml @@ -0,0 +1,46 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-user-sessions"> + <title>User Sessions</title> + <para> + Systemd keeps track of all users who are logged into the system + (e.g. on a virtual console or remotely via SSH). The command + <literal>loginctl</literal> allows querying and manipulating user + sessions. For instance, to list all user sessions: + </para> + <programlisting> +$ loginctl + SESSION UID USER SEAT + c1 500 eelco seat0 + c3 0 root seat0 + c4 500 alice +</programlisting> + <para> + This shows that two users are logged in locally, while another is + logged in remotely. (<quote>Seats</quote> are essentially the + combinations of displays and input devices attached to the system; + usually, there is only one seat.) To get information about a + session: + </para> + <programlisting> +$ loginctl session-status c3 +c3 - root (0) + Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago + Leader: 2536 (login) + Seat: seat0; vc3 + TTY: /dev/tty3 + Service: login; type tty; class user + State: online + CGroup: name=systemd:/user/root/c3 + ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- + ├─10339 -bash + └─10355 w3m nixos.org +</programlisting> + <para> + This shows that the user is logged in on virtual console 3. It also + lists the processes belonging to this session. Since systemd keeps + track of this, you can terminate a session in a way that ensures + that all the session’s processes are gone: + </para> + <programlisting> +# loginctl terminate-session c3 +</programlisting> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml new file mode 100644 index 000000000000..035ee3122e15 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml @@ -0,0 +1,16 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ad-hoc-network-config"> + <title>Ad-Hoc Configuration</title> + <para> + You can use <xref linkend="opt-networking.localCommands" /> to + specify shell commands to be run at the end of + <literal>network-setup.service</literal>. This is useful for doing + network configuration not covered by the existing NixOS modules. For + instance, to statically configure an IPv6 address: + </para> + <programlisting language="bash"> +networking.localCommands = + '' + ip -6 addr add 2001:610:685:1::1/64 dev eth0 + ''; +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml new file mode 100644 index 000000000000..c9a8d4f3f106 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml @@ -0,0 +1,59 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ad-hoc-packages"> + <title>Ad-Hoc Package Management</title> + <para> + With the command <literal>nix-env</literal>, you can install and + uninstall packages from the command line. For instance, to install + Mozilla Thunderbird: + </para> + <programlisting> +$ nix-env -iA nixos.thunderbird +</programlisting> + <para> + If you invoke this as root, the package is installed in the Nix + profile <literal>/nix/var/nix/profiles/default</literal> and visible + to all users of the system; otherwise, the package ends up in + <literal>/nix/var/nix/profiles/per-user/username/profile</literal> + and is not visible to other users. The <literal>-A</literal> flag + specifies the package by its attribute name; without it, the package + is installed by matching against its package name (e.g. + <literal>thunderbird</literal>). The latter is slower because it + requires matching against all available Nix packages, and is + ambiguous if there are multiple matching packages. + </para> + <para> + Packages come from the NixOS channel. You typically upgrade a + package by updating to the latest version of the NixOS channel: + </para> + <programlisting> +$ nix-channel --update nixos +</programlisting> + <para> + and then running <literal>nix-env -i</literal> again. Other packages + in the profile are <emphasis>not</emphasis> affected; this is the + crucial difference with the declarative style of package management, + where running <literal>nixos-rebuild switch</literal> causes all + packages to be updated to their current versions in the NixOS + channel. You can however upgrade all packages for which there is a + newer version by doing: + </para> + <programlisting> +$ nix-env -u '*' +</programlisting> + <para> + A package can be uninstalled using the <literal>-e</literal> flag: + </para> + <programlisting> +$ nix-env -e thunderbird +</programlisting> + <para> + Finally, you can roll back an undesirable <literal>nix-env</literal> + action: + </para> + <programlisting> +$ nix-env --rollback +</programlisting> + <para> + <literal>nix-env</literal> has many more flags. For details, see the + nix-env(1) manpage or the Nix manual. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml new file mode 100644 index 000000000000..4fa40d61966e --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml @@ -0,0 +1,80 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-custom-packages"> + <title>Adding Custom Packages</title> + <para> + It’s possible that a package you need is not available in NixOS. In + that case, you can do two things. First, you can clone the Nixpkgs + repository, add the package to your clone, and (optionally) submit a + patch or pull request to have it accepted into the main Nixpkgs + repository. This is described in detail in the + <link xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs + manual</link>. In short, you clone Nixpkgs: + </para> + <programlisting> +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +</programlisting> + <para> + Then you write and test the package as described in the Nixpkgs + manual. Finally, you add it to + <xref linkend="opt-environment.systemPackages" />, e.g. + </para> + <programlisting language="bash"> +environment.systemPackages = [ pkgs.my-package ]; +</programlisting> + <para> + and you run <literal>nixos-rebuild</literal>, specifying your own + Nixpkgs tree: + </para> + <programlisting> +# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs +</programlisting> + <para> + The second possibility is to add the package outside of the Nixpkgs + tree. For instance, here is how you specify a build of the + <link xlink:href="https://www.gnu.org/software/hello/">GNU + Hello</link> package directly in + <literal>configuration.nix</literal>: + </para> + <programlisting language="bash"> +environment.systemPackages = + let + my-hello = with pkgs; stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; + }; + in + [ my-hello ]; +</programlisting> + <para> + Of course, you can also move the definition of + <literal>my-hello</literal> into a separate Nix expression, e.g. + </para> + <programlisting language="bash"> +environment.systemPackages = [ (import ./my-hello.nix) ]; +</programlisting> + <para> + where <literal>my-hello.nix</literal> contains: + </para> + <programlisting language="bash"> +with import <nixpkgs> {}; # bring all of Nixpkgs into scope + +stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; +} +</programlisting> + <para> + This allows testing the package easily: + </para> + <programlisting> +$ nix-build my-hello.nix +$ ./result/bin/hello +Hello, world! +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml new file mode 100644 index 000000000000..952c6e600302 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml @@ -0,0 +1,231 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-configuration-file"> + <title>NixOS Configuration File</title> + <para> + The NixOS configuration file generally looks like this: + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ option definitions +} +</programlisting> + <para> + The first line (<literal>{ config, pkgs, ... }:</literal>) denotes + that this is actually a function that takes at least the two + arguments <literal>config</literal> and <literal>pkgs</literal>. + (These are explained later, in chapter + <xref linkend="sec-writing-modules" />) The function returns a + <emphasis>set</emphasis> of option definitions + (<literal>{ ... }</literal>). These definitions have the form + <literal>name = value</literal>, where <literal>name</literal> is + the name of an option and <literal>value</literal> is its value. For + example, + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ services.httpd.enable = true; + services.httpd.adminAddr = "alice@example.org"; + services.httpd.virtualHosts.localhost.documentRoot = "/webroot"; +} +</programlisting> + <para> + defines a configuration with three option definitions that together + enable the Apache HTTP Server with <literal>/webroot</literal> as + the document root. + </para> + <para> + Sets can be nested, and in fact dots in option names are shorthand + for defining a set containing another set. For instance, + <xref linkend="opt-services.httpd.enable" /> defines a set named + <literal>services</literal> that contains a set named + <literal>httpd</literal>, which in turn contains an option + definition named <literal>enable</literal> with value + <literal>true</literal>. This means that the example above can also + be written as: + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ services = { + httpd = { + enable = true; + adminAddr = "alice@example.org"; + virtualHosts = { + localhost = { + documentRoot = "/webroot"; + }; + }; + }; + }; +} +</programlisting> + <para> + which may be more convenient if you have lots of option definitions + that share the same prefix (such as + <literal>services.httpd</literal>). + </para> + <para> + NixOS checks your option definitions for correctness. For instance, + if you try to define an option that doesn’t exist (that is, doesn’t + have a corresponding <emphasis>option declaration</emphasis>), + <literal>nixos-rebuild</literal> will give an error like: + </para> + <programlisting> +The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. +</programlisting> + <para> + Likewise, values in option definitions must have a correct type. For + instance, <literal>services.httpd.enable</literal> must be a Boolean + (<literal>true</literal> or <literal>false</literal>). Trying to + give it a value of another type, such as a string, will cause an + error: + </para> + <programlisting> +The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. +</programlisting> + <para> + Options have various types of values. The most important are: + </para> + <variablelist> + <varlistentry> + <term> + Strings + </term> + <listitem> + <para> + Strings are enclosed in double quotes, e.g. + </para> + <programlisting language="bash"> +networking.hostName = "dexter"; +</programlisting> + <para> + Special characters can be escaped by prefixing them with a + backslash (e.g. <literal>\"</literal>). + </para> + <para> + Multi-line strings can be enclosed in <emphasis>double single + quotes</emphasis>, e.g. + </para> + <programlisting language="bash"> +networking.extraHosts = + '' + 127.0.0.2 other-localhost + 10.0.0.1 server + ''; +</programlisting> + <para> + The main difference is that it strips from each line a number + of spaces equal to the minimal indentation of the string as a + whole (disregarding the indentation of empty lines), and that + characters like <literal>"</literal> and + <literal>\</literal> are not special (making it more + convenient for including things like shell code). See more + info about this in the Nix manual + <link xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Booleans + </term> + <listitem> + <para> + These can be <literal>true</literal> or + <literal>false</literal>, e.g. + </para> + <programlisting language="bash"> +networking.firewall.enable = true; +networking.firewall.allowPing = false; +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + Integers + </term> + <listitem> + <para> + For example, + </para> + <programlisting language="bash"> +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; +</programlisting> + <para> + (Note that here the attribute name + <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in + quotes to prevent it from being interpreted as a set named + <literal>net</literal> containing a set named + <literal>ipv4</literal>, and so on. This is because it’s not a + NixOS option but the literal name of a Linux kernel setting.) + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + Sets + </term> + <listitem> + <para> + Sets were introduced above. They are name/value pairs enclosed + in braces, as in the option definition + </para> + <programlisting language="bash"> +fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext4"; + options = [ "rw" "data=ordered" "relatime" ]; + }; +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + Lists + </term> + <listitem> + <para> + The important thing to note about lists is that list elements + are separated by whitespace, like this: + </para> + <programlisting language="bash"> +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; +</programlisting> + <para> + List elements can be any other type, e.g. sets: + </para> + <programlisting language="bash"> +swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + Packages + </term> + <listitem> + <para> + Usually, the packages you need are already part of the Nix + Packages collection, which is a set that can be accessed + through the function argument <literal>pkgs</literal>. Typical + uses: + </para> + <programlisting language="bash"> +environment.systemPackages = + [ pkgs.thunderbird + pkgs.emacs + ]; + +services.postgresql.package = pkgs.postgresql_10; +</programlisting> + <para> + The latter option definition changes the default PostgreSQL + package used by NixOS’s PostgreSQL service to 10.x. For more + information on packages, including how to add new ones, see + <xref linkend="sec-custom-packages" />. + </para> + </listitem> + </varlistentry> + </variablelist> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml new file mode 100644 index 000000000000..01446e53e38f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml @@ -0,0 +1,21 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-configuration-syntax"> + <title>Configuration Syntax</title> + <para> + The NixOS configuration file + <literal>/etc/nixos/configuration.nix</literal> is actually a + <emphasis>Nix expression</emphasis>, which is the Nix package + manager’s purely functional language for describing how to build + packages and configurations. This means you have all the expressive + power of that language at your disposal, including the ability to + abstract over common patterns, which is very useful when managing + complex systems. The syntax and semantics of the Nix language are + fully described in the + <link xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix + manual</link>, but here we give a short overview of the most + important constructs useful in NixOS configuration files. + </para> + <xi:include href="config-file.section.xml" /> + <xi:include href="abstractions.section.xml" /> + <xi:include href="modularity.section.xml" /> + <xi:include href="summary.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml new file mode 100644 index 000000000000..f78b5dc5460c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml @@ -0,0 +1,90 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-customising-packages"> + <title>Customising Packages</title> + <para> + Some packages in Nixpkgs have options to enable or disable optional + functionality or change other aspects of the package. For instance, + the Firefox wrapper package (which provides Firefox with a set of + plugins such as the Adobe Flash player) has an option to enable the + Google Talk plugin. It can be set in + <literal>configuration.nix</literal> as follows: + <literal>nixpkgs.config.firefox.enableGoogleTalkPlugin = true;</literal> + </para> + <warning> + <para> + Unfortunately, Nixpkgs currently lacks a way to query available + configuration options. + </para> + </warning> + <para> + Apart from high-level options, it’s possible to tweak a package in + almost arbitrary ways, such as changing or disabling dependencies of + a package. For instance, the Emacs package in Nixpkgs by default has + a dependency on GTK 2. If you want to build it against GTK 3, you + can specify that as follows: + </para> + <programlisting language="bash"> +environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; +</programlisting> + <para> + The function <literal>override</literal> performs the call to the + Nix function that produces Emacs, with the original arguments + amended by the set of arguments specified by you. So here the + function argument <literal>gtk</literal> gets the value + <literal>pkgs.gtk3</literal>, causing Emacs to depend on GTK 3. (The + parentheses are necessary because in Nix, function application binds + more weakly than list construction, so without them, + <xref linkend="opt-environment.systemPackages" /> would be a list + with two elements.) + </para> + <para> + Even greater customisation is possible using the function + <literal>overrideAttrs</literal>. While the + <literal>override</literal> mechanism above overrides the arguments + of a package function, <literal>overrideAttrs</literal> allows + changing the <emphasis>attributes</emphasis> passed to + <literal>mkDerivation</literal>. This permits changing any aspect of + the package, such as the source code. For instance, if you want to + override the source code of Emacs, you can say: + </para> + <programlisting language="bash"> +environment.systemPackages = [ + (pkgs.emacs.overrideAttrs (oldAttrs: { + name = "emacs-25.0-pre"; + src = /path/to/my/emacs/tree; + })) +]; +</programlisting> + <para> + Here, <literal>overrideAttrs</literal> takes the Nix derivation + specified by <literal>pkgs.emacs</literal> and produces a new + derivation in which the original’s <literal>name</literal> and + <literal>src</literal> attribute have been replaced by the given + values by re-calling <literal>stdenv.mkDerivation</literal>. The + original attributes are accessible via the function argument, which + is conventionally named <literal>oldAttrs</literal>. + </para> + <para> + The overrides shown above are not global. They do not affect the + original package; other packages in Nixpkgs continue to depend on + the original rather than the customised package. This means that if + another package in your system depends on the original package, you + end up with two instances of the package. If you want to have + everything depend on your customised instance, you can apply a + <emphasis>global</emphasis> override as follows: + </para> + <programlisting language="bash"> +nixpkgs.config.packageOverrides = pkgs: + { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; + }; +</programlisting> + <para> + The effect of this definition is essentially equivalent to modifying + the <literal>emacs</literal> attribute in the Nixpkgs source tree. + Any package in Nixpkgs that depends on <literal>emacs</literal> will + be passed your customised instance. (However, the value + <literal>pkgs.emacs</literal> in + <literal>nixpkgs.config.packageOverrides</literal> refers to the + original rather than overridden instance, to prevent an infinite + recursion.) + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml new file mode 100644 index 000000000000..da31f18d9233 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml @@ -0,0 +1,53 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-declarative-package-mgmt"> + <title>Declarative Package Management</title> + <para> + With declarative package management, you specify which packages you + want on your system by setting the option + <xref linkend="opt-environment.systemPackages" />. For instance, + adding the following line to <literal>configuration.nix</literal> + enables the Mozilla Thunderbird email application: + </para> + <programlisting language="bash"> +environment.systemPackages = [ pkgs.thunderbird ]; +</programlisting> + <para> + The effect of this specification is that the Thunderbird package + from Nixpkgs will be built or downloaded as part of the system when + you run <literal>nixos-rebuild switch</literal>. + </para> + <note> + <para> + Some packages require additional global configuration such as + D-Bus or systemd service registration so adding them to + <xref linkend="opt-environment.systemPackages" /> might not be + sufficient. You are advised to check the + <link linkend="ch-options">list of options</link> whether a NixOS + module for the package does not exist. + </para> + </note> + <para> + You can get a list of the available packages as follows: + </para> + <programlisting> +$ nix-env -qaP '*' --description +nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded +... +</programlisting> + <para> + The first column in the output is the <emphasis>attribute + name</emphasis>, such as <literal>nixos.thunderbird</literal>. + </para> + <para> + Note: the <literal>nixos</literal> prefix tells us that we want to + get the package from the <literal>nixos</literal> channel and works + only in CLI tools. In declarative configuration use + <literal>pkgs</literal> prefix (variable). + </para> + <para> + To <quote>uninstall</quote> a package, simply remove it from + <xref linkend="opt-environment.systemPackages" /> and run + <literal>nixos-rebuild switch</literal>. + </para> + <xi:include href="customizing-packages.section.xml" /> + <xi:include href="adding-custom-packages.section.xml" /> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml new file mode 100644 index 000000000000..71441d8b4a5b --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml @@ -0,0 +1,55 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-file-systems"> + <title>File Systems</title> + <para> + You can define file systems using the <literal>fileSystems</literal> + configuration option. For instance, the following definition causes + NixOS to mount the Ext4 file system on device + <literal>/dev/disk/by-label/data</literal> onto the mount point + <literal>/data</literal>: + </para> + <programlisting language="bash"> +fileSystems."/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; +</programlisting> + <para> + This will create an entry in <literal>/etc/fstab</literal>, which + will generate a corresponding + <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.mount.html">systemd.mount</link> + unit via + <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html">systemd-fstab-generator</link>. + The filesystem will be mounted automatically unless + <literal>"noauto"</literal> is present in + <link linkend="opt-fileSystems._name_.options">options</link>. + <literal>"noauto"</literal> filesystems can be mounted + explicitly using <literal>systemctl</literal> e.g. + <literal>systemctl start data.mount</literal>. Mount points are + created automatically if they don’t already exist. For + <literal>device</literal>, it’s best to use the topology-independent + device aliases in <literal>/dev/disk/by-label</literal> and + <literal>/dev/disk/by-uuid</literal>, as these don’t change if the + topology changes (e.g. if a disk is moved to another IDE + controller). + </para> + <para> + You can usually omit the file system type + (<literal>fsType</literal>), since <literal>mount</literal> can + usually detect the type and load the necessary kernel module + automatically. However, if the file system is needed at early boot + (in the initial ramdisk) and is not <literal>ext2</literal>, + <literal>ext3</literal> or <literal>ext4</literal>, then it’s best + to specify <literal>fsType</literal> to ensure that the kernel + module is available. + </para> + <note> + <para> + System startup will fail if any of the filesystems fails to mount, + dropping you to the emergency shell. You can make a mount + asynchronous and non-critical by adding + <literal>options = [ "nofail" ];</literal>. + </para> + </note> + <xi:include href="luks-file-systems.section.xml" /> + <xi:include href="sshfs-file-systems.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/firewall.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/firewall.section.xml new file mode 100644 index 000000000000..24c19bb1c66d --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/firewall.section.xml @@ -0,0 +1,39 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-firewall"> + <title>Firewall</title> + <para> + NixOS has a simple stateful firewall that blocks incoming + connections and other unexpected packets. The firewall applies to + both IPv4 and IPv6 traffic. It is enabled by default. It can be + disabled as follows: + </para> + <programlisting language="bash"> +networking.firewall.enable = false; +</programlisting> + <para> + If the firewall is enabled, you can open specific TCP ports to the + outside world: + </para> + <programlisting language="bash"> +networking.firewall.allowedTCPPorts = [ 80 443 ]; +</programlisting> + <para> + Note that TCP port 22 (ssh) is opened automatically if the SSH + daemon is enabled + (<literal>services.openssh.enable = true</literal>). UDP ports can + be opened through + <xref linkend="opt-networking.firewall.allowedUDPPorts" />. + </para> + <para> + To open ranges of TCP ports: + </para> + <programlisting language="bash"> +networking.firewall.allowedTCPPortRanges = [ + { from = 4000; to = 4007; } + { from = 8000; to = 8010; } +]; +</programlisting> + <para> + Similarly, UDP port ranges can be opened through + <xref linkend="opt-networking.firewall.allowedUDPPortRanges" />. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml new file mode 100644 index 000000000000..8e780c5dee95 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -0,0 +1,239 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-gpu-accel"> + <title>GPU acceleration</title> + <para> + NixOS provides various APIs that benefit from GPU hardware + acceleration, such as VA-API and VDPAU for video playback; OpenGL + and Vulkan for 3D graphics; and OpenCL for general-purpose + computing. This chapter describes how to set up GPU hardware + acceleration (as far as this is not done automatically) and how to + verify that hardware acceleration is indeed used. + </para> + <para> + Most of the aforementioned APIs are agnostic with regards to which + display server is used. Consequently, these instructions should + apply both to the X Window System and Wayland compositors. + </para> + <section xml:id="sec-gpu-accel-opencl"> + <title>OpenCL</title> + <para> + <link xlink:href="https://en.wikipedia.org/wiki/OpenCL">OpenCL</link> + is a general compute API. It is used by various applications such + as Blender and Darktable to accelerate certain operations. + </para> + <para> + OpenCL applications load drivers through the <emphasis>Installable + Client Driver</emphasis> (ICD) mechanism. In this mechanism, an + ICD file specifies the path to the OpenCL driver for a particular + GPU family. In NixOS, there are two ways to make ICD files visible + to the ICD loader. The first is through the + <literal>OCL_ICD_VENDORS</literal> environment variable. This + variable can contain a directory which is scanned by the ICL + loader for ICD files. For example: + </para> + <programlisting> +$ export \ + OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ +</programlisting> + <para> + The second mechanism is to add the OpenCL driver package to + <xref linkend="opt-hardware.opengl.extraPackages" />. This links + the ICD file under <literal>/run/opengl-driver</literal>, where it + will be visible to the ICD loader. + </para> + <para> + The proper installation of OpenCL drivers can be verified through + the <literal>clinfo</literal> command of the clinfo package. This + command will report the number of hardware devices that is found + and give detailed information for each device: + </para> + <programlisting> +$ clinfo | head -n3 +Number of platforms 1 +Platform Name AMD Accelerated Parallel Processing +Platform Vendor Advanced Micro Devices, Inc. +</programlisting> + <section xml:id="sec-gpu-accel-opencl-amd"> + <title>AMD</title> + <para> + Modern AMD + <link xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics + Core Next</link> (GCN) GPUs are supported through the + rocm-opencl-icd package. Adding this package to + <xref linkend="opt-hardware.opengl.extraPackages" /> enables + OpenCL support: + </para> + <programlisting language="bash"> +hardware.opengl.extraPackages = [ + rocm-opencl-icd +]; +</programlisting> + </section> + <section xml:id="sec-gpu-accel-opencl-intel"> + <title>Intel</title> + <para> + <link xlink:href="https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Gen8">Intel + Gen8 and later GPUs</link> are supported by the Intel NEO OpenCL + runtime that is provided by the intel-compute-runtime package. + For Gen7 GPUs, the deprecated Beignet runtime can be used, which + is provided by the beignet package. The proprietary Intel OpenCL + runtime, in the intel-ocl package, is an alternative for Gen7 + GPUs. + </para> + <para> + The intel-compute-runtime, beignet, or intel-ocl package can be + added to <xref linkend="opt-hardware.opengl.extraPackages" /> to + enable OpenCL support. For example, for Gen8 and later GPUs, the + following configuration can be used: + </para> + <programlisting language="bash"> +hardware.opengl.extraPackages = [ + intel-compute-runtime +]; +</programlisting> + </section> + </section> + <section xml:id="sec-gpu-accel-vulkan"> + <title>Vulkan</title> + <para> + <link xlink:href="https://en.wikipedia.org/wiki/Vulkan_(API)">Vulkan</link> + is a graphics and compute API for GPUs. It is used directly by + games or indirectly though compatibility layers like + <link xlink:href="https://github.com/doitsujin/dxvk/wiki">DXVK</link>. + </para> + <para> + By default, if <xref linkend="opt-hardware.opengl.driSupport" /> + is enabled, mesa is installed and provides Vulkan for supported + hardware. + </para> + <para> + Similar to OpenCL, Vulkan drivers are loaded through the + <emphasis>Installable Client Driver</emphasis> (ICD) mechanism. + ICD files for Vulkan are JSON files that specify the path to the + driver library and the supported Vulkan version. All successfully + loaded drivers are exposed to the application as different GPUs. + In NixOS, there are two ways to make ICD files visible to Vulkan + applications: an environment variable and a module option. + </para> + <para> + The first option is through the + <literal>VK_ICD_FILENAMES</literal> environment variable. This + variable can contain multiple JSON files, separated by + <literal>:</literal>. For example: + </para> + <programlisting> +$ export \ + VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json +</programlisting> + <para> + The second mechanism is to add the Vulkan driver package to + <xref linkend="opt-hardware.opengl.extraPackages" />. This links + the ICD file under <literal>/run/opengl-driver</literal>, where it + will be visible to the ICD loader. + </para> + <para> + The proper installation of Vulkan drivers can be verified through + the <literal>vulkaninfo</literal> command of the vulkan-tools + package. This command will report the hardware devices and drivers + found, in this example output amdvlk and radv: + </para> + <programlisting> +$ vulkaninfo | grep GPU + GPU id : 0 (Unknown AMD GPU) + GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) + ... +GPU0: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU + deviceName = Unknown AMD GPU +GPU1: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU +</programlisting> + <para> + A simple graphical application that uses Vulkan is + <literal>vkcube</literal> from the vulkan-tools package. + </para> + <section xml:id="sec-gpu-accel-vulkan-amd"> + <title>AMD</title> + <para> + Modern AMD + <link xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics + Core Next</link> (GCN) GPUs are supported through either radv, + which is part of mesa, or the amdvlk package. Adding the amdvlk + package to <xref linkend="opt-hardware.opengl.extraPackages" /> + makes amdvlk the default driver and hides radv and lavapipe from + the device list. A specific driver can be forced as follows: + </para> + <programlisting language="bash"> +hardware.opengl.extraPackages = [ + pkgs.amdvlk +]; + +# To enable Vulkan support for 32-bit applications, also add: +hardware.opengl.extraPackages32 = [ + pkgs.driversi686Linux.amdvlk +]; + +# Force radv +environment.variables.AMD_VULKAN_ICD = "RADV"; +# Or +environment.variables.VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; +</programlisting> + </section> + </section> + <section xml:id="sec-gpu-accel-common-issues"> + <title>Common issues</title> + <section xml:id="sec-gpu-accel-common-issues-permissions"> + <title>User permissions</title> + <para> + Except where noted explicitly, it should not be necessary to + adjust user permissions to use these acceleration APIs. In the + default configuration, GPU devices have world-read/write + permissions (<literal>/dev/dri/renderD*</literal>) or are tagged + as <literal>uaccess</literal> + (<literal>/dev/dri/card*</literal>). The access control lists of + devices with the <literal>uaccess</literal> tag will be updated + automatically when a user logs in through + <literal>systemd-logind</literal>. For example, if the user + <emphasis>jane</emphasis> is logged in, the access control list + should look as follows: + </para> + <programlisting> +$ getfacl /dev/dri/card0 +# file: dev/dri/card0 +# owner: root +# group: video +user::rw- +user:jane:rw- +group::rw- +mask::rw- +other::--- +</programlisting> + <para> + If you disabled (this functionality of) + <literal>systemd-logind</literal>, you may need to add the user + to the <literal>video</literal> group and log in again. + </para> + </section> + <section xml:id="sec-gpu-accel-common-issues-mixing-nixpkgs"> + <title>Mixing different versions of nixpkgs</title> + <para> + The <emphasis>Installable Client Driver</emphasis> (ICD) + mechanism used by OpenCL and Vulkan loads runtimes into its + address space using <literal>dlopen</literal>. Mixing an ICD + loader mechanism and runtimes from different version of nixpkgs + may not work. For example, if the ICD loader uses an older + version of glibc than the runtime, the runtime may not be + loadable due to missing symbols. Unfortunately, the loader will + generally be quiet about such issues. + </para> + <para> + If you suspect that you are running into library version + mismatches between an ICL loader and a runtime, you could run an + application with the <literal>LD_DEBUG</literal> variable set to + get more diagnostic information. For example, OpenCL can be + tested with <literal>LD_DEBUG=files clinfo</literal>, which + should report missing symbols. + </para> + </section> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml new file mode 100644 index 000000000000..047ba2165f07 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml @@ -0,0 +1,43 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ipv4"> + <title>IPv4 Configuration</title> + <para> + By default, NixOS uses DHCP (specifically, + <literal>dhcpcd</literal>) to automatically configure network + interfaces. However, you can configure an interface manually as + follows: + </para> + <programlisting language="bash"> +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; +</programlisting> + <para> + Typically you’ll also want to set a default gateway and set of name + servers: + </para> + <programlisting language="bash"> +networking.defaultGateway = "192.168.1.1"; +networking.nameservers = [ "8.8.8.8" ]; +</programlisting> + <note> + <para> + Statically configured interfaces are set up by the systemd service + <literal>interface-name-cfg.service</literal>. The default gateway + and name server configuration is performed by + <literal>network-setup.service</literal>. + </para> + </note> + <para> + The host name is set using + <xref linkend="opt-networking.hostName" />: + </para> + <programlisting language="bash"> +networking.hostName = "cartman"; +</programlisting> + <para> + The default host name is <literal>nixos</literal>. Set it to the + empty string (<literal>""</literal>) to allow the DHCP + server to provide the host name. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml new file mode 100644 index 000000000000..137c3d772a86 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml @@ -0,0 +1,47 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ipv6"> + <title>IPv6 Configuration</title> + <para> + IPv6 is enabled by default. Stateless address autoconfiguration is + used to automatically assign IPv6 addresses to all interfaces, and + Privacy Extensions (RFC 4946) are enabled by default. You can adjust + the default for this by setting + <xref linkend="opt-networking.tempAddresses" />. This option may be + overridden on a per-interface basis by + <xref linkend="opt-networking.interfaces._name_.tempAddress" />. You + can disable IPv6 support globally by setting: + </para> + <programlisting language="bash"> +networking.enableIPv6 = false; +</programlisting> + <para> + You can disable IPv6 on a single interface using a normal sysctl (in + this example, we use interface <literal>eth0</literal>): + </para> + <programlisting language="bash"> +boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +</programlisting> + <para> + As with IPv4 networking interfaces are automatically configured via + DHCPv6. You can configure an interface manually: + </para> + <programlisting language="bash"> +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; +</programlisting> + <para> + For configuring a gateway, optionally with explicitly specified + interface: + </para> + <programlisting language="bash"> +networking.defaultGateway6 = { + address = "fe00::1"; + interface = "enp0s3"; +}; +</programlisting> + <para> + See <xref linkend="sec-ipv4" /> for similar examples and additional + information. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml new file mode 100644 index 000000000000..83a50d7c49d1 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml @@ -0,0 +1,126 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-kubernetes"> + <title>Kubernetes</title> + <para> + The NixOS Kubernetes module is a collective term for a handful of + individual submodules implementing the Kubernetes cluster + components. + </para> + <para> + There are generally two ways of enabling Kubernetes on NixOS. One + way is to enable and configure cluster components appropriately by + hand: + </para> + <programlisting language="bash"> +services.kubernetes = { + apiserver.enable = true; + controllerManager.enable = true; + scheduler.enable = true; + addonManager.enable = true; + proxy.enable = true; + flannel.enable = true; +}; +</programlisting> + <para> + Another way is to assign cluster roles ("master" and/or + "node") to the host. This enables apiserver, + controllerManager, scheduler, addonManager, kube-proxy and etcd: + </para> + <programlisting language="bash"> +services.kubernetes.roles = [ "master" ]; +</programlisting> + <para> + While this will enable the kubelet and kube-proxy only: + </para> + <programlisting language="bash"> +services.kubernetes.roles = [ "node" ]; +</programlisting> + <para> + Assigning both the master and node roles is usable if you want a + single node Kubernetes cluster for dev or testing purposes: + </para> + <programlisting language="bash"> +services.kubernetes.roles = [ "master" "node" ]; +</programlisting> + <para> + Note: Assigning either role will also default both + <xref linkend="opt-services.kubernetes.flannel.enable" /> and + <xref linkend="opt-services.kubernetes.easyCerts" /> to true. This + sets up flannel as CNI and activates automatic PKI bootstrapping. + </para> + <para> + As of kubernetes 1.10.X it has been deprecated to open + non-tls-enabled ports on kubernetes components. Thus, from NixOS + 19.03 all plain HTTP ports have been disabled by default. While + opening insecure ports is still possible, it is recommended not to + bind these to other interfaces than loopback. To re-enable the + insecure port on the apiserver, see options: + <xref linkend="opt-services.kubernetes.apiserver.insecurePort" /> + and + <xref linkend="opt-services.kubernetes.apiserver.insecureBindAddress" /> + </para> + <note> + <para> + As of NixOS 19.03, it is mandatory to configure: + <xref linkend="opt-services.kubernetes.masterAddress" />. The + masterAddress must be resolveable and routeable by all cluster + nodes. In single node clusters, this can be set to + <literal>localhost</literal>. + </para> + </note> + <para> + Role-based access control (RBAC) authorization mode is enabled by + default. This means that anonymous requests to the apiserver secure + port will expectedly cause a permission denied error. All cluster + components must therefore be configured with x509 certificates for + two-way tls communication. The x509 certificate subject section + determines the roles and permissions granted by the apiserver to + perform clusterwide or namespaced operations. See also: + <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/"> + Using RBAC Authorization</link>. + </para> + <para> + The NixOS kubernetes module provides an option for automatic + certificate bootstrapping and configuration, + <xref linkend="opt-services.kubernetes.easyCerts" />. The PKI + bootstrapping process involves setting up a certificate authority + (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a + CA-cert for the cluster, and uses the CA-cert for signing + subordinate certs issued to each of the cluster components. + Subsequently, the certmgr daemon monitors active certificates and + renews them when needed. For single node Kubernetes clusters, + setting <xref linkend="opt-services.kubernetes.easyCerts" /> = true + is sufficient and no further action is required. For joining extra + node machines to an existing cluster on the other hand, establishing + initial trust is mandatory. + </para> + <para> + To add new nodes to the cluster: On any (non-master) cluster node + where <xref linkend="opt-services.kubernetes.easyCerts" /> is + enabled, the helper script + <literal>nixos-kubernetes-node-join</literal> is available on PATH. + Given a token on stdin, it will copy the token to the kubernetes + secrets directory and restart the certmgr service. As requested + certificates are issued, the script will restart kubernetes cluster + components as needed for them to pick up new keypairs. + </para> + <note> + <para> + Multi-master (HA) clusters are not supported by the easyCerts + module. + </para> + </note> + <para> + In order to interact with an RBAC-enabled cluster as an + administrator, one needs to have cluster-admin privileges. By + default, when easyCerts is enabled, a cluster-admin kubeconfig file + is generated and linked into + <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as + determined by + <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig" />. + <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal> + will make kubectl use this kubeconfig to access and authenticate the + cluster. The cluster-admin kubeconfig references an auto-generated + keypair owned by root. Thus, only root on the kubernetes master may + obtain cluster-admin rights by means of this file. + </para> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml new file mode 100644 index 000000000000..f804d0a3b8c2 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -0,0 +1,150 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-kernel-config"> + <title>Linux Kernel</title> + <para> + You can override the Linux kernel and associated packages using the + option <literal>boot.kernelPackages</literal>. For instance, this + selects the Linux 3.10 kernel: + </para> + <programlisting language="bash"> +boot.kernelPackages = pkgs.linuxPackages_3_10; +</programlisting> + <para> + Note that this not only replaces the kernel, but also packages that + are specific to the kernel version, such as the NVIDIA video + drivers. This ensures that driver packages are consistent with the + kernel. + </para> + <para> + The default Linux kernel configuration should be fine for most + users. You can see the configuration of your current kernel with the + following command: + </para> + <programlisting> +zcat /proc/config.gz +</programlisting> + <para> + If you want to change the kernel configuration, you can use the + <literal>packageOverrides</literal> feature (see + <xref linkend="sec-customising-packages" />). For instance, to + enable support for the kernel debugger KGDB: + </para> + <programlisting language="bash"> +nixpkgs.config.packageOverrides = pkgs: + { linux_3_4 = pkgs.linux_3_4.override { + extraConfig = + '' + KGDB y + ''; + }; + }; +</programlisting> + <para> + <literal>extraConfig</literal> takes a list of Linux kernel + configuration options, one per line. The name of the option should + not include the prefix <literal>CONFIG_</literal>. The option value + is typically <literal>y</literal>, <literal>n</literal> or + <literal>m</literal> (to build something as a kernel module). + </para> + <para> + Kernel modules for hardware devices are generally loaded + automatically by <literal>udev</literal>. You can force a module to + be loaded via <xref linkend="opt-boot.kernelModules" />, e.g. + </para> + <programlisting language="bash"> +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; +</programlisting> + <para> + If the module is required early during the boot (e.g. to mount the + root file system), you can use + <xref linkend="opt-boot.initrd.kernelModules" />: + </para> + <programlisting language="bash"> +boot.initrd.kernelModules = [ "cifs" ]; +</programlisting> + <para> + This causes the specified modules and their dependencies to be added + to the initial ramdisk. + </para> + <para> + Kernel runtime parameters can be set through + <xref linkend="opt-boot.kernel.sysctl" />, e.g. + </para> + <programlisting language="bash"> +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; +</programlisting> + <para> + sets the kernel’s TCP keepalive time to 120 seconds. To see the + available parameters, run <literal>sysctl -a</literal>. + </para> + <section xml:id="sec-linux-config-customizing"> + <title>Customize your kernel</title> + <para> + The first step before compiling the kernel is to generate an + appropriate <literal>.config</literal> configuration. Either you + pass your own config via the <literal>configfile</literal> setting + of <literal>linuxManualConfig</literal>: + </para> + <programlisting language="bash"> +custom-kernel = super.linuxManualConfig { + inherit (super) stdenv hostPlatform; + inherit (linux_4_9) src; + version = "${linux_4_9.version}-custom"; + + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; +}; +</programlisting> + <para> + You can edit the config with this snippet (by default + <literal>make menuconfig</literal> won't work out of the box on + nixos): + </para> + <programlisting> +nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' +</programlisting> + <para> + or you can let nixpkgs generate the configuration. Nixpkgs + generates it via answering the interactive kernel utility + <literal>make config</literal>. The answers depend on parameters + passed to + <literal>pkgs/os-specific/linux/kernel/generic.nix</literal> + (which you can influence by overriding + <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>). + </para> + <programlisting language="bash"> +mptcp93.override ({ + name="mptcp-local"; + + ignoreConfigErrors = true; + autoModules = false; + kernelPreferBuiltin = true; + + enableParallelBuilding = true; + + extraConfig = '' + DEBUG_KERNEL y + FRAME_POINTER y + KGDB y + KGDB_SERIAL_CONSOLE y + DEBUG_INFO y + ''; +}); +</programlisting> + </section> + <section xml:id="sec-linux-config-developing-modules"> + <title>Developing kernel modules</title> + <para> + When developing kernel modules it's often convenient to run + edit-compile-run loop as quickly as possible. See below snippet as + an example of developing <literal>mellanox</literal> drivers. + </para> + <programlisting> +$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev +$ nix-shell '<nixpkgs>' -A linuxPackages.kernel +$ unpackPhase +$ cd linux-* +$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules +# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko +</programlisting> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml new file mode 100644 index 000000000000..42b766eba98b --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml @@ -0,0 +1,84 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-luks-file-systems"> + <title>LUKS-Encrypted File Systems</title> + <para> + NixOS supports file systems that are encrypted using + <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, + here is how you create an encrypted Ext4 file system on the device + <literal>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</literal>: + </para> + <programlisting> +# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d + +WARNING! +======== +This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. + +Are you sure? (Type uppercase yes): YES +Enter LUKS passphrase: *** +Verify passphrase: *** + +# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted +Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** + +# mkfs.ext4 /dev/mapper/crypted +</programlisting> + <para> + The LUKS volume should be automatically picked up by + <literal>nixos-generate-config</literal>, but you might want to + verify that your <literal>hardware-configuration.nix</literal> looks + correct. To manually ensure that the system is automatically mounted + at boot time as <literal>/</literal>, add the following to + <literal>configuration.nix</literal>: + </para> + <programlisting language="bash"> +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +fileSystems."/".device = "/dev/mapper/crypted"; +</programlisting> + <para> + Should grub be used as bootloader, and <literal>/boot</literal> is + located on an encrypted partition, it is necessary to add the + following grub option: + </para> + <programlisting language="bash"> +boot.loader.grub.enableCryptodisk = true; +</programlisting> + <section xml:id="sec-luks-file-systems-fido2"> + <title>FIDO2</title> + <para> + NixOS also supports unlocking your LUKS-Encrypted file system + using a FIDO2 compatible token. In the following example, we will + create a new FIDO2 credential and add it as a new key to our + existing device <literal>/dev/sda2</literal>: + </para> + <programlisting> +# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" +# fido2luks credential "$FIDO2_LABEL" +f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 + +# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 +Password: +Password (again): +Old password: +Old password (again): +Added to key to device /dev/sda2, slot: 2 +</programlisting> + <para> + To ensure that this file system is decrypted using the FIDO2 + compatible key, add the following to + <literal>configuration.nix</literal>: + </para> + <programlisting language="bash"> +boot.initrd.luks.fido2Support = true; +boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; +</programlisting> + <para> + You can also use the FIDO2 passwordless setup, but for security + reasons, you might want to enable it only when your device is PIN + protected, such as + <link xlink:href="https://trezor.io/">Trezor</link>. + </para> + <programlisting language="bash"> +boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; +</programlisting> + </section> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/modularity.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/modularity.section.xml new file mode 100644 index 000000000000..a7688090fcc5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/modularity.section.xml @@ -0,0 +1,152 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-modularity"> + <title>Modularity</title> + <para> + The NixOS configuration mechanism is modular. If your + <literal>configuration.nix</literal> becomes too big, you can split + it into multiple files. Likewise, if you have multiple NixOS + configurations (e.g. for different computers) with some commonality, + you can move the common configuration into a shared file. + </para> + <para> + Modules have exactly the same syntax as + <literal>configuration.nix</literal>. In fact, + <literal>configuration.nix</literal> is itself a module. You can use + other modules by including them from + <literal>configuration.nix</literal>, e.g.: + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ imports = [ ./vpn.nix ./kde.nix ]; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.emacs ]; + ... +} +</programlisting> + <para> + Here, we include two modules from the same directory, + <literal>vpn.nix</literal> and <literal>kde.nix</literal>. The + latter might look like this: + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + environment.systemPackages = [ pkgs.vim ]; +} +</programlisting> + <para> + Note that both <literal>configuration.nix</literal> and + <literal>kde.nix</literal> define the option + <xref linkend="opt-environment.systemPackages" />. When multiple + modules define an option, NixOS will try to + <emphasis>merge</emphasis> the definitions. In the case of + <xref linkend="opt-environment.systemPackages" />, that’s easy: the + lists of packages can simply be concatenated. The value in + <literal>configuration.nix</literal> is merged last, so for + list-type options, it will appear at the end of the merged list. If + you want it to appear first, you can use + <literal>mkBefore</literal>: + </para> + <programlisting language="bash"> +boot.kernelModules = mkBefore [ "kvm-intel" ]; +</programlisting> + <para> + This causes the <literal>kvm-intel</literal> kernel module to be + loaded before any other kernel modules. + </para> + <para> + For other types of options, a merge may not be possible. For + instance, if two modules define + <xref linkend="opt-services.httpd.adminAddr" />, + <literal>nixos-rebuild</literal> will give an error: + </para> + <programlisting> +The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. +</programlisting> + <para> + When that happens, it’s possible to force one definition take + precedence over the others: + </para> + <programlisting language="bash"> +services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; +</programlisting> + <para> + When using multiple modules, you may need to access configuration + values defined in other modules. This is what the + <literal>config</literal> function argument is for: it contains the + complete, merged system configuration. That is, + <literal>config</literal> is the result of combining the + configurations returned by every module <footnote> + <para> + If you’re wondering how it’s possible that the (indirect) + <emphasis>result</emphasis> of a function is passed as an + <emphasis>input</emphasis> to that same function: that’s because + Nix is a <quote>lazy</quote> language — it only computes values + when they are needed. This works as long as no individual + configuration value depends on itself. + </para> + </footnote> . For example, here is a module that adds some packages + to <xref linkend="opt-environment.systemPackages" /> only if + <xref linkend="opt-services.xserver.enable" /> is set to + <literal>true</literal> somewhere else: + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ environment.systemPackages = + if config.services.xserver.enable then + [ pkgs.firefox + pkgs.thunderbird + ] + else + [ ]; +} +</programlisting> + <para> + With multiple modules, it may not be obvious what the final value of + a configuration option is. The command + <literal>nixos-option</literal> allows you to find out: + </para> + <programlisting> +$ nixos-option services.xserver.enable +true + +$ nixos-option boot.kernelModules +[ "tun" "ipv6" "loop" ... ] +</programlisting> + <para> + Interactive exploration of the configuration is possible using + <literal>nix repl</literal>, a read-eval-print loop for Nix + expressions. A typical use: + </para> + <programlisting> +$ nix repl '<nixpkgs/nixos>' + +nix-repl> config.networking.hostName +"mandark" + +nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +[ "example.org" "example.gov" ] +</programlisting> + <para> + While abstracting your configuration, you may find it useful to + generate modules using code, instead of writing files. The example + below would have the same effect as importing a file which sets + those options. + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +let netConfig = hostName: { + networking.hostName = hostName; + networking.useDHCP = false; +}; + +in + +{ imports = [ (netConfig "nixos.localdomain") ]; } +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/network-manager.section.xml new file mode 100644 index 000000000000..8f0d6d680ae0 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/network-manager.section.xml @@ -0,0 +1,49 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-networkmanager"> + <title>NetworkManager</title> + <para> + To facilitate network configuration, some desktop environments use + NetworkManager. You can enable NetworkManager by setting: + </para> + <programlisting language="bash"> +networking.networkmanager.enable = true; +</programlisting> + <para> + some desktop managers (e.g., GNOME) enable NetworkManager + automatically for you. + </para> + <para> + All users that should have permission to change network settings + must belong to the <literal>networkmanager</literal> group: + </para> + <programlisting language="bash"> +users.users.alice.extraGroups = [ "networkmanager" ]; +</programlisting> + <para> + NetworkManager is controlled using either <literal>nmcli</literal> + or <literal>nmtui</literal> (curses-based terminal user interface). + See their manual pages for details on their usage. Some desktop + environments (GNOME, KDE) have their own configuration tools for + NetworkManager. On XFCE, there is no configuration tool for + NetworkManager by default: by enabling + <xref linkend="opt-programs.nm-applet.enable" />, the graphical + applet will be installed and will launch automatically when the + graphical session is started. + </para> + <note> + <para> + <literal>networking.networkmanager</literal> and + <literal>networking.wireless</literal> (WPA Supplicant) can be + used together if desired. To do this you need to instruct + NetworkManager to ignore those interfaces like: + </para> + <programlisting language="bash"> +networking.networkmanager.unmanaged = [ + "*" "except:type:wwan" "except:type:gsm" +]; +</programlisting> + <para> + Refer to the option description for the exact syntax and + references to external documentation. + </para> + </note> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/networking.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/networking.chapter.xml new file mode 100644 index 000000000000..2ed86ea3b589 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/networking.chapter.xml @@ -0,0 +1,15 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-networking"> + <title>Networking</title> + <para> + This section describes how to configure networking components on + your NixOS machine. + </para> + <xi:include href="network-manager.section.xml" /> + <xi:include href="ssh.section.xml" /> + <xi:include href="ipv4-config.section.xml" /> + <xi:include href="ipv6-config.section.xml" /> + <xi:include href="firewall.section.xml" /> + <xi:include href="wireless.section.xml" /> + <xi:include href="ad-hoc-network-config.section.xml" /> + <xi:include href="renaming-interfaces.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml new file mode 100644 index 000000000000..d3727edbe08d --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml @@ -0,0 +1,28 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-package-management"> + <title>Package Management</title> + <para> + This section describes how to add additional packages to your + system. NixOS has two distinct styles of package management: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>Declarative</emphasis>, where you declare what + packages you want in your <literal>configuration.nix</literal>. + Every time you run <literal>nixos-rebuild</literal>, NixOS will + ensure that you get a consistent set of binaries corresponding + to your specification. + </para> + </listitem> + <listitem> + <para> + <emphasis>Ad hoc</emphasis>, where you install, upgrade and + uninstall packages via the <literal>nix-env</literal> command. + This style allows mixing packages from different Nixpkgs + versions. It’s the only choice for non-root users. + </para> + </listitem> + </itemizedlist> + <xi:include href="declarative-packages.section.xml" /> + <xi:include href="ad-hoc-packages.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles.chapter.xml new file mode 100644 index 000000000000..6f5fc130c6a0 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles.chapter.xml @@ -0,0 +1,38 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-profiles"> + <title>Profiles</title> + <para> + In some cases, it may be desirable to take advantage of + commonly-used, predefined configurations provided by nixpkgs, but + different from those that come as default. This is a role fulfilled + by NixOS's Profiles, which come as files living in + <literal><nixpkgs/nixos/modules/profiles></literal>. That is + to say, expected usage is to add them to the imports list of your + <literal>/etc/configuration.nix</literal> as such: + </para> + <programlisting language="bash"> +imports = [ + <nixpkgs/nixos/modules/profiles/profile-name.nix> +]; +</programlisting> + <para> + Even if some of these profiles seem only useful in the context of + install media, many are actually intended to be used in real + installs. + </para> + <para> + What follows is a brief explanation on the purpose and use-case for + each profile. Detailing each option configured by each one is out of + scope. + </para> + <xi:include href="profiles/all-hardware.section.xml" /> + <xi:include href="profiles/base.section.xml" /> + <xi:include href="profiles/clone-config.section.xml" /> + <xi:include href="profiles/demo.section.xml" /> + <xi:include href="profiles/docker-container.section.xml" /> + <xi:include href="profiles/graphical.section.xml" /> + <xi:include href="profiles/hardened.section.xml" /> + <xi:include href="profiles/headless.section.xml" /> + <xi:include href="profiles/installation-device.section.xml" /> + <xi:include href="profiles/minimal.section.xml" /> + <xi:include href="profiles/qemu-guest.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml new file mode 100644 index 000000000000..43ac5edea7f8 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml @@ -0,0 +1,15 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-all-hardware"> + <title>All Hardware</title> + <para> + Enables all hardware supported by NixOS: i.e., all firmware is + included, and all devices from which one may boot are enabled in the + initrd. Its primary use is in the NixOS installation CDs. + </para> + <para> + The enabled kernel modules include support for SATA and PATA, SCSI + (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), + VMware, and Hyper-V. Additionally, + <xref linkend="opt-hardware.enableAllFirmware" /> is enabled, and + the firmware for the ZyDAS ZD1211 chipset is specifically installed. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/base.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/base.section.xml new file mode 100644 index 000000000000..83d35bd28676 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/base.section.xml @@ -0,0 +1,10 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-base"> + <title>Base</title> + <para> + Defines the software packages included in the <quote>minimal</quote> + installation CD. It installs several utilities useful in a simple + recovery or install media, such as a text-mode web browser, and + tools for manipulating block devices, networking, hardware + diagnostics, and filesystems (with their respective kernel modules). + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml new file mode 100644 index 000000000000..9430b49ea33d --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml @@ -0,0 +1,16 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-clone-config"> + <title>Clone Config</title> + <para> + This profile is used in installer images. It provides an editable + configuration.nix that imports all the modules that were also used + when creating the image in the first place. As a result it allows + users to edit and rebuild the live-system. + </para> + <para> + On images where the installation media also becomes an installation + target, copying over <literal>configuration.nix</literal> should be + disabled by setting <literal>installer.cloneConfig</literal> to + <literal>false</literal>. For example, this is done in + <literal>sd-image-aarch64-installer.nix</literal>. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml new file mode 100644 index 000000000000..09c2680a1067 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml @@ -0,0 +1,10 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-demo"> + <title>Demo</title> + <para> + This profile just enables a <literal>demo</literal> user, with + password <literal>demo</literal>, uid <literal>1000</literal>, + <literal>wheel</literal> group and + <link linkend="opt-services.xserver.displayManager.autoLogin">autologin + in the SDDM display manager</link>. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml new file mode 100644 index 000000000000..97c2a92dcab5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml @@ -0,0 +1,12 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-docker-container"> + <title>Docker Container</title> + <para> + This is the profile from which the Docker images are generated. It + prepares a working system by importing the + <link linkend="sec-profile-minimal">Minimal</link> and + <link linkend="sec-profile-clone-config">Clone Config</link> + profiles, and setting appropriate configuration options that are + useful inside a container context, like + <xref linkend="opt-boot.isContainer" />. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml new file mode 100644 index 000000000000..1b109519d436 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml @@ -0,0 +1,14 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-graphical"> + <title>Graphical</title> + <para> + Defines a NixOS configuration with the Plasma 5 desktop. It’s used + by the graphical installation CD. + </para> + <para> + It sets <xref linkend="opt-services.xserver.enable" />, + <xref linkend="opt-services.xserver.displayManager.sddm.enable" />, + <xref linkend="opt-services.xserver.desktopManager.plasma5.enable" />, + and <xref linkend="opt-services.xserver.libinput.enable" /> to true. + It also includes glxinfo and firefox in the system packages list. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml new file mode 100644 index 000000000000..44c11786d940 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml @@ -0,0 +1,25 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-hardened"> + <title>Hardened</title> + <para> + A profile with most (vanilla) hardening options enabled by default, + potentially at the cost of stability, features and performance. + </para> + <para> + This includes a hardened kernel, and limiting the system information + available to processes through the <literal>/sys</literal> and + <literal>/proc</literal> filesystems. It also disables the User + Namespaces feature of the kernel, which stops Nix from being able to + build anything (this particular setting can be overriden via + <xref linkend="opt-security.allowUserNamespaces" />). See the + <link xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">profile + source</link> for further detail on which settings are altered. + </para> + <warning> + <para> + This profile enables options that are known to affect system + stability. If you experience any stability issues when using the + profile, try disabling it. If you report an issue and use this + profile, always mention that you do. + </para> + </warning> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml new file mode 100644 index 000000000000..0910b9ffaad2 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml @@ -0,0 +1,15 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-headless"> + <title>Headless</title> + <para> + Common configuration for headless machines (e.g., Amazon EC2 + instances). + </para> + <para> + Disables <link linkend="opt-sound.enable">sound</link>, + <link linkend="opt-boot.vesa">vesa</link>, serial consoles, + <link linkend="opt-systemd.enableEmergencyMode">emergency + mode</link>, <link linkend="opt-boot.loader.grub.splashImage">grub + splash images</link> and configures the kernel to reboot + automatically on panic. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml new file mode 100644 index 000000000000..837e69df06e1 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml @@ -0,0 +1,32 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-installation-device"> + <title>Installation Device</title> + <para> + Provides a basic configuration for installation devices like CDs. + This enables redistributable firmware, includes the + <link linkend="sec-profile-clone-config">Clone Config profile</link> + and a copy of the Nixpkgs channel, so + <literal>nixos-install</literal> works out of the box. + </para> + <para> + Documentation for + <link linkend="opt-documentation.enable">Nixpkgs</link> and + <link linkend="opt-documentation.nixos.enable">NixOS</link> are + forcefully enabled (to override the + <link linkend="sec-profile-minimal">Minimal profile</link> + preference); the NixOS manual is shown automatically on TTY 8, + udisks is disabled. Autologin is enabled as <literal>nixos</literal> + user, while passwordless login as both <literal>root</literal> and + <literal>nixos</literal> is possible. Passwordless + <literal>sudo</literal> is enabled too. + <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> + is enabled, but configured to not autostart. + </para> + <para> + It is explained how to login, start the ssh server, and if + available, how to start the display manager. + </para> + <para> + Several settings are tweaked so that the installer has a better + chance of succeeding under low-memory environments. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml new file mode 100644 index 000000000000..a3fe30357dff --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml @@ -0,0 +1,13 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-minimal"> + <title>Minimal</title> + <para> + This profile defines a small NixOS configuration. It does not + contain any graphical stuff. It’s a very short file that enables + <link linkend="opt-environment.noXlibs">noXlibs</link>, sets + <xref linkend="opt-i18n.supportedLocales" /> to only support the + user-selected locale, + <link linkend="opt-documentation.enable">disables packages’ + documentation</link>, and <link linkend="opt-sound.enable">disables + sound</link>. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml new file mode 100644 index 000000000000..f33464f9db4d --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml @@ -0,0 +1,11 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-qemu-guest"> + <title>QEMU Guest</title> + <para> + This profile contains common configuration for virtual machines + running under QEMU (using virtio). + </para> + <para> + It makes virtio modules available on the initrd and sets the system + time from the hardware clock to work around a bug in qemu-kvm. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml new file mode 100644 index 000000000000..1c32e30b3f85 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml @@ -0,0 +1,62 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-rename-ifs"> + <title>Renaming network interfaces</title> + <para> + NixOS uses the udev + <link xlink:href="https://systemd.io/PREDICTABLE_INTERFACE_NAMES/">predictable + naming scheme</link> to assign names to network interfaces. This + means that by default cards are not given the traditional names like + <literal>eth0</literal> or <literal>eth1</literal>, whose order can + change unpredictably across reboots. Instead, relying on physical + locations and firmware information, the scheme produces names like + <literal>ens1</literal>, <literal>enp2s0</literal>, etc. + </para> + <para> + These names are predictable but less memorable and not necessarily + stable: for example installing new hardware or changing firmware + settings can result in a + <link xlink:href="https://github.com/systemd/systemd/issues/3715#issue-165347602">name + change</link>. If this is undesirable, for example if you have a + single ethernet card, you can revert to the traditional scheme by + setting + <xref linkend="opt-networking.usePredictableInterfaceNames" /> to + <literal>false</literal>. + </para> + <section xml:id="sec-custom-ifnames"> + <title>Assigning custom names</title> + <para> + In case there are multiple interfaces of the same type, it’s + better to assign custom names based on the device hardware + address. For example, we assign the name <literal>wan</literal> to + the interface with MAC address + <literal>52:54:00:12:01:01</literal> using a netword link unit: + </para> + <programlisting language="bash"> +systemd.network.links."10-wan" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "wan"; +}; +</programlisting> + <para> + Note that links are directly read by udev, <emphasis>not + networkd</emphasis>, and will work even if networkd is disabled. + </para> + <para> + Alternatively, we can use a plain old udev rule: + </para> + <programlisting language="bash"> +services.udev.initrdRules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ + ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" +''; +</programlisting> + <warning> + <para> + The rule must be installed in the initrd using + <literal>services.udev.initrdRules</literal>, not the usual + <literal>services.udev.extraRules</literal> option. This is to + avoid race conditions with other programs controlling the + interface. + </para> + </warning> + </section> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/ssh.section.xml new file mode 100644 index 000000000000..037418d8ea4d --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/ssh.section.xml @@ -0,0 +1,23 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ssh"> + <title>Secure Shell Access</title> + <para> + Secure shell (SSH) access to your machine can be enabled by setting: + </para> + <programlisting language="bash"> +services.openssh.enable = true; +</programlisting> + <para> + By default, root logins using a password are disallowed. They can be + disabled entirely by setting + <xref linkend="opt-services.openssh.permitRootLogin" /> to + <literal>"no"</literal>. + </para> + <para> + You can declaratively specify authorised RSA/DSA public keys for a + user as follows: + </para> + <programlisting language="bash"> +users.users.alice.openssh.authorizedKeys.keys = + [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml index 6b317aa63e9a..5d74712f35dc 100644 --- a/nixpkgs/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml @@ -51,8 +51,8 @@ SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation </para> <para> The file system can be configured in NixOS via the usual - <link xlink:href="options.html#opt-fileSystems">fileSystems</link> - option. Here’s a typical setup: + <link linkend="opt-fileSystems">fileSystems</link> option. Here’s + a typical setup: </para> <programlisting language="bash"> { diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/subversion.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/subversion.chapter.xml new file mode 100644 index 000000000000..794c2c34e399 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/subversion.chapter.xml @@ -0,0 +1,121 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-subversion"> + <title>Subversion</title> + <para> + <link xlink:href="https://subversion.apache.org/">Subversion</link> + is a centralized version-control system. It can use a + <link xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing">variety + of protocols</link> for communication between client and server. + </para> + <section xml:id="module-services-subversion-apache-httpd"> + <title>Subversion inside Apache HTTP</title> + <para> + This section focuses on configuring a web-based server on top of + the Apache HTTP server, which uses + <link xlink:href="http://www.webdav.org/">WebDAV</link>/<link xlink:href="http://www.webdav.org/deltav/WWW10/deltav-intro.htm">DeltaV</link> + for communication. + </para> + <para> + For more information on the general setup, please refer to the + <link xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd">the + appropriate section of the Subversion book</link>. + </para> + <para> + To configure, include in + <literal>/etc/nixos/configuration.nix</literal> code to activate + Apache HTTP, setting + <xref linkend="opt-services.httpd.adminAddr" /> appropriately: + </para> + <programlisting language="bash"> +services.httpd.enable = true; +services.httpd.adminAddr = ...; +networking.firewall.allowedTCPPorts = [ 80 443 ]; +</programlisting> + <para> + For a simple Subversion server with basic authentication, + configure the Subversion module for Apache as follows, setting + <literal>hostName</literal> and <literal>documentRoot</literal> + appropriately, and <literal>SVNParentPath</literal> to the parent + directory of the repositories, + <literal>AuthzSVNAccessFile</literal> to the location of the + <literal>.authz</literal> file describing access permission, and + <literal>AuthUserFile</literal> to the password file. + </para> + <programlisting language="bash"> +services.httpd.extraModules = [ + # note that order is *super* important here + { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } + { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } + ]; + services.httpd.virtualHosts = { + "svn" = { + hostName = HOSTNAME; + documentRoot = DOCUMENTROOT; + locations."/svn".extraConfig = '' + DAV svn + SVNParentPath REPO_PARENT + AuthzSVNAccessFile ACCESS_FILE + AuthName "SVN Repositories" + AuthType Basic + AuthUserFile PASSWORD_FILE + Require valid-user + ''; + } +</programlisting> + <para> + The key <literal>"svn"</literal> is just a symbolic name + identifying the virtual host. The + <literal>"/svn"</literal> in + <literal>locations."/svn".extraConfig</literal> is the + path underneath which the repositories will be served. + </para> + <para> + <link xlink:href="https://wiki.archlinux.org/index.php/Subversion">This + page</link> explains how to set up the Subversion configuration + itself. This boils down to the following: + </para> + <para> + Underneath <literal>REPO_PARENT</literal> repositories can be set + up as follows: + </para> + <programlisting> +$ svn create REPO_NAME +</programlisting> + <para> + Repository files need to be accessible by + <literal>wwwrun</literal>: + </para> + <programlisting> +$ chown -R wwwrun:wwwrun REPO_PARENT +</programlisting> + <para> + The password file <literal>PASSWORD_FILE</literal> can be created + as follows: + </para> + <programlisting> +$ htpasswd -cs PASSWORD_FILE USER_NAME +</programlisting> + <para> + Additional users can be set up similarly, omitting the + <literal>c</literal> flag: + </para> + <programlisting> +$ htpasswd -s PASSWORD_FILE USER_NAME +</programlisting> + <para> + The file describing access permissions + <literal>ACCESS_FILE</literal> will look something like the + following: + </para> + <programlisting language="bash"> +[/] +* = r + +[REPO_NAME:/] +USER_NAME = rw +</programlisting> + <para> + The Subversion repositories will be accessible as + <literal>http://HOSTNAME/svn/REPO_NAME</literal>. + </para> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/summary.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/summary.section.xml new file mode 100644 index 000000000000..96a178c4930e --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/summary.section.xml @@ -0,0 +1,332 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-syntax-summary"> + <title>Syntax Summary</title> + <para> + Below is a summary of the most important syntactic constructs in the + Nix expression language. It’s not complete. In particular, there are + many other built-in functions. See the + <link xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix + manual</link> for the rest. + </para> + <informaltable> + <tgroup cols="2"> + <colspec align="left" /> + <colspec align="left" /> + <thead> + <row> + <entry> + Example + </entry> + <entry> + Description + </entry> + </row> + </thead> + <tbody> + <row> + <entry> + <emphasis>Basic values</emphasis> + </entry> + <entry> + </entry> + </row> + <row> + <entry> + <literal>"Hello world"</literal> + </entry> + <entry> + A string + </entry> + </row> + <row> + <entry> + <literal>"${pkgs.bash}/bin/sh"</literal> + </entry> + <entry> + A string containing an expression (expands to + <literal>"/nix/store/hash-bash-version/bin/sh"</literal>) + </entry> + </row> + <row> + <entry> + <literal>true</literal>, <literal>false</literal> + </entry> + <entry> + Booleans + </entry> + </row> + <row> + <entry> + <literal>123</literal> + </entry> + <entry> + An integer + </entry> + </row> + <row> + <entry> + <literal>./foo.png</literal> + </entry> + <entry> + A path (relative to the containing Nix expression) + </entry> + </row> + <row> + <entry> + <emphasis>Compound values</emphasis> + </entry> + <entry> + </entry> + </row> + <row> + <entry> + <literal>{ x = 1; y = 2; }</literal> + </entry> + <entry> + A set with attributes named <literal>x</literal> and + <literal>y</literal> + </entry> + </row> + <row> + <entry> + <literal>{ foo.bar = 1; }</literal> + </entry> + <entry> + A nested set, equivalent to + <literal>{ foo = { bar = 1; }; }</literal> + </entry> + </row> + <row> + <entry> + <literal>rec { x = "foo"; y = x + "bar"; }</literal> + </entry> + <entry> + A recursive set, equivalent to + <literal>{ x = "foo"; y = "foobar"; }</literal> + </entry> + </row> + <row> + <entry> + <literal>[ "foo" "bar" ]</literal> + </entry> + <entry> + A list with two elements + </entry> + </row> + <row> + <entry> + <emphasis>Operators</emphasis> + </entry> + <entry> + </entry> + </row> + <row> + <entry> + <literal>"foo" + "bar"</literal> + </entry> + <entry> + String concatenation + </entry> + </row> + <row> + <entry> + <literal>1 + 2</literal> + </entry> + <entry> + Integer addition + </entry> + </row> + <row> + <entry> + <literal>"foo" == "f" + "oo"</literal> + </entry> + <entry> + Equality test (evaluates to <literal>true</literal>) + </entry> + </row> + <row> + <entry> + <literal>"foo" != "bar"</literal> + </entry> + <entry> + Inequality test (evaluates to <literal>true</literal>) + </entry> + </row> + <row> + <entry> + <literal>!true</literal> + </entry> + <entry> + Boolean negation + </entry> + </row> + <row> + <entry> + <literal>{ x = 1; y = 2; }.x</literal> + </entry> + <entry> + Attribute selection (evaluates to <literal>1</literal>) + </entry> + </row> + <row> + <entry> + <literal>{ x = 1; y = 2; }.z or 3</literal> + </entry> + <entry> + Attribute selection with default (evaluates to + <literal>3</literal>) + </entry> + </row> + <row> + <entry> + <literal>{ x = 1; y = 2; } // { z = 3; }</literal> + </entry> + <entry> + Merge two sets (attributes in the right-hand set taking + precedence) + </entry> + </row> + <row> + <entry> + <emphasis>Control structures</emphasis> + </entry> + <entry> + </entry> + </row> + <row> + <entry> + <literal>if 1 + 1 == 2 then "yes!" else "no!"</literal> + </entry> + <entry> + Conditional expression + </entry> + </row> + <row> + <entry> + <literal>assert 1 + 1 == 2; "yes!"</literal> + </entry> + <entry> + Assertion check (evaluates to + <literal>"yes!"</literal>). See + <xref linkend="sec-assertions" /> for using assertions in + modules + </entry> + </row> + <row> + <entry> + <literal>let x = "foo"; y = "bar"; in x + y</literal> + </entry> + <entry> + Variable definition + </entry> + </row> + <row> + <entry> + <literal>with pkgs.lib; head [ 1 2 3 ]</literal> + </entry> + <entry> + Add all attributes from the given set to the scope + (evaluates to <literal>1</literal>) + </entry> + </row> + <row> + <entry> + <emphasis>Functions (lambdas)</emphasis> + </entry> + <entry> + </entry> + </row> + <row> + <entry> + <literal>x: x + 1</literal> + </entry> + <entry> + A function that expects an integer and returns it increased + by 1 + </entry> + </row> + <row> + <entry> + <literal>(x: x + 1) 100</literal> + </entry> + <entry> + A function call (evaluates to 101) + </entry> + </row> + <row> + <entry> + <literal>let inc = x: x + 1; in inc (inc (inc 100))</literal> + </entry> + <entry> + A function bound to a variable and subsequently called by + name (evaluates to 103) + </entry> + </row> + <row> + <entry> + <literal>{ x, y }: x + y</literal> + </entry> + <entry> + A function that expects a set with required attributes + <literal>x</literal> and <literal>y</literal> and + concatenates them + </entry> + </row> + <row> + <entry> + <literal>{ x, y ? "bar" }: x + y</literal> + </entry> + <entry> + A function that expects a set with required attribute + <literal>x</literal> and optional <literal>y</literal>, + using <literal>"bar"</literal> as default value + for <literal>y</literal> + </entry> + </row> + <row> + <entry> + <literal>{ x, y, ... }: x + y</literal> + </entry> + <entry> + A function that expects a set with required attributes + <literal>x</literal> and <literal>y</literal> and ignores + any other attributes + </entry> + </row> + <row> + <entry> + <literal>{ x, y } @ args: x + y</literal> + </entry> + <entry> + A function that expects a set with required attributes + <literal>x</literal> and <literal>y</literal>, and binds the + whole set to <literal>args</literal> + </entry> + </row> + <row> + <entry> + <emphasis>Built-in functions</emphasis> + </entry> + <entry> + </entry> + </row> + <row> + <entry> + <literal>import ./foo.nix</literal> + </entry> + <entry> + Load and return Nix expression in given file + </entry> + </row> + <row> + <entry> + <literal>map (x: x + x) [ 1 2 3 ]</literal> + </entry> + <entry> + Apply a function to every element of a list (evaluates to + <literal>[ 2 4 6 ]</literal>) + </entry> + </row> + </tbody> + </tgroup> + </informaltable> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml new file mode 100644 index 000000000000..06492d5c2512 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml @@ -0,0 +1,105 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-user-management"> + <title>User Management</title> + <para> + NixOS supports both declarative and imperative styles of user + management. In the declarative style, users are specified in + <literal>configuration.nix</literal>. For instance, the following + states that a user account named <literal>alice</literal> shall + exist: + </para> + <programlisting language="bash"> +users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; +</programlisting> + <para> + Note that <literal>alice</literal> is a member of the + <literal>wheel</literal> and <literal>networkmanager</literal> + groups, which allows her to use <literal>sudo</literal> to execute + commands as <literal>root</literal> and to configure the network, + respectively. Also note the SSH public key that allows remote logins + with the corresponding private key. Users created in this way do not + have a password by default, so they cannot log in via mechanisms + that require a password. However, you can use the + <literal>passwd</literal> program to set a password, which is + retained across invocations of <literal>nixos-rebuild</literal>. + </para> + <para> + If you set <xref linkend="opt-users.mutableUsers" /> to false, then + the contents of <literal>/etc/passwd</literal> and + <literal>/etc/group</literal> will be congruent to your NixOS + configuration. For instance, if you remove a user from + <xref linkend="opt-users.users" /> and run nixos-rebuild, the user + account will cease to exist. Also, imperative commands for managing + users and groups, such as useradd, are no longer available. + Passwords may still be assigned by setting the user's + <link linkend="opt-users.users._name_.hashedPassword">hashedPassword</link> + option. A hashed password can be generated using + <literal>mkpasswd -m sha-512</literal>. + </para> + <para> + A user ID (uid) is assigned automatically. You can also specify a + uid manually by adding + </para> + <programlisting language="bash"> +uid = 1000; +</programlisting> + <para> + to the user specification. + </para> + <para> + Groups can be specified similarly. The following states that a group + named <literal>students</literal> shall exist: + </para> + <programlisting language="bash"> +users.groups.students.gid = 1000; +</programlisting> + <para> + As with users, the group ID (gid) is optional and will be assigned + automatically if it’s missing. + </para> + <para> + In the imperative style, users and groups are managed by commands + such as <literal>useradd</literal>, <literal>groupmod</literal> and + so on. For instance, to create a user account named + <literal>alice</literal>: + </para> + <programlisting> +# useradd -m alice +</programlisting> + <para> + To make all nix tools available to this new user use `su - USER` + which opens a login shell (==shell that loads the profile) for given + user. This will create the ~/.nix-defexpr symlink. So run: + </para> + <programlisting> +# su - alice -c "true" +</programlisting> + <para> + The flag <literal>-m</literal> causes the creation of a home + directory for the new user, which is generally what you want. The + user does not have an initial password and therefore cannot log in. + A password can be set using the <literal>passwd</literal> utility: + </para> + <programlisting> +# passwd alice +Enter new UNIX password: *** +Retype new UNIX password: *** +</programlisting> + <para> + A user can be deleted using <literal>userdel</literal>: + </para> + <programlisting> +# userdel -r alice +</programlisting> + <para> + The flag <literal>-r</literal> deletes the user’s home directory. + Accounts can be modified using <literal>usermod</literal>. Unix + groups can be managed using <literal>groupadd</literal>, + <literal>groupmod</literal> and <literal>groupdel</literal>. + </para> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/wayland.chapter.xml new file mode 100644 index 000000000000..1e90d4f31177 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/wayland.chapter.xml @@ -0,0 +1,31 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-wayland"> + <title>Wayland</title> + <para> + While X11 (see <xref linkend="sec-x11" />) is still the primary + display technology on NixOS, Wayland support is steadily improving. + Where X11 separates the X Server and the window manager, on Wayland + those are combined: a Wayland Compositor is like an X11 window + manager, but also embeds the Wayland 'Server' functionality. This + means it is sufficient to install a Wayland Compositor such as sway + without separately enabling a Wayland server: + </para> + <programlisting language="bash"> +programs.sway.enable = true; +</programlisting> + <para> + This installs the sway compositor along with some essential + utilities. Now you can start sway from the TTY console. + </para> + <para> + If you are using a wlroots-based compositor, like sway, and want to + be able to share your screen, you might want to activate this + option: + </para> + <programlisting language="bash"> +xdg.portal.wlr.enable = true; +</programlisting> + <para> + and configure Pipewire using + <xref linkend="opt-services.pipewire.enable" /> and related options. + </para> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/wireless.section.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/wireless.section.xml new file mode 100644 index 000000000000..82bc20135157 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/wireless.section.xml @@ -0,0 +1,73 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-wireless"> + <title>Wireless Networks</title> + <para> + For a desktop installation using NetworkManager (e.g., GNOME), you + just have to make sure the user is in the + <literal>networkmanager</literal> group and you can skip the rest of + this section on wireless networks. + </para> + <para> + NixOS will start wpa_supplicant for you if you enable this setting: + </para> + <programlisting language="bash"> +networking.wireless.enable = true; +</programlisting> + <para> + NixOS lets you specify networks for wpa_supplicant declaratively: + </para> + <programlisting language="bash"> +networking.wireless.networks = { + echelon = { # SSID with no spaces or special characters + psk = "abcdefgh"; + }; + "echelon's AP" = { # SSID with spaces and/or special characters + psk = "ijklmnop"; + }; + echelon = { # Hidden SSID + hidden = true; + psk = "qrstuvwx"; + }; + free.wifi = {}; # Public wireless network +}; +</programlisting> + <para> + Be aware that keys will be written to the nix store in plaintext! + When no networks are set, it will default to using a configuration + file at <literal>/etc/wpa_supplicant.conf</literal>. You should edit + this file yourself to define wireless networks, WPA keys and so on + (see wpa_supplicant.conf(5)). + </para> + <para> + If you are using WPA2 you can generate pskRaw key using + <literal>wpa_passphrase</literal>: + </para> + <programlisting> +$ wpa_passphrase ESSID PSK +network={ + ssid="echelon" + #psk="abcdefgh" + psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 +} +</programlisting> + <programlisting language="bash"> +networking.wireless.networks = { + echelon = { + pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; + }; +} +</programlisting> + <para> + or you can use it to directly generate the + <literal>wpa_supplicant.conf</literal>: + </para> + <programlisting> +# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf +</programlisting> + <para> + After you have edited the <literal>wpa_supplicant.conf</literal>, + you need to restart the wpa_supplicant service. + </para> + <programlisting> +# systemctl restart wpa_supplicant.service +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml new file mode 100644 index 000000000000..274d0d817bc1 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml @@ -0,0 +1,381 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-x11"> + <title>X Window System</title> + <para> + The X Window System (X11) provides the basis of NixOS’ graphical + user interface. It can be enabled as follows: + </para> + <programlisting language="bash"> +services.xserver.enable = true; +</programlisting> + <para> + The X server will automatically detect and use the appropriate video + driver from a set of X.org drivers (such as <literal>vesa</literal> + and <literal>intel</literal>). You can also specify a driver + manually, e.g. + </para> + <programlisting language="bash"> +services.xserver.videoDrivers = [ "r128" ]; +</programlisting> + <para> + to enable X.org’s <literal>xf86-video-r128</literal> driver. + </para> + <para> + You also need to enable at least one desktop or window manager. + Otherwise, you can only log into a plain undecorated + <literal>xterm</literal> window. Thus you should pick one or more of + the following lines: + </para> + <programlisting language="bash"> +services.xserver.desktopManager.plasma5.enable = true; +services.xserver.desktopManager.xfce.enable = true; +services.xserver.desktopManager.gnome.enable = true; +services.xserver.desktopManager.mate.enable = true; +services.xserver.windowManager.xmonad.enable = true; +services.xserver.windowManager.twm.enable = true; +services.xserver.windowManager.icewm.enable = true; +services.xserver.windowManager.i3.enable = true; +services.xserver.windowManager.herbstluftwm.enable = true; +</programlisting> + <para> + NixOS’s default <emphasis>display manager</emphasis> (the program + that provides a graphical login prompt and manages the X server) is + LightDM. You can select an alternative one by picking one of the + following lines: + </para> + <programlisting language="bash"> +services.xserver.displayManager.sddm.enable = true; +services.xserver.displayManager.gdm.enable = true; +</programlisting> + <para> + You can set the keyboard layout (and optionally the layout variant): + </para> + <programlisting language="bash"> +services.xserver.layout = "de"; +services.xserver.xkbVariant = "neo"; +</programlisting> + <para> + The X server is started automatically at boot time. If you don’t + want this to happen, you can set: + </para> + <programlisting language="bash"> +services.xserver.autorun = false; +</programlisting> + <para> + The X server can then be started manually: + </para> + <programlisting> +# systemctl start display-manager.service +</programlisting> + <para> + On 64-bit systems, if you want OpenGL for 32-bit programs such as in + Wine, you should also set the following: + </para> + <programlisting language="bash"> +hardware.opengl.driSupport32Bit = true; +</programlisting> + <section xml:id="sec-x11-auto-login"> + <title>Auto-login</title> + <para> + The x11 login screen can be skipped entirely, automatically + logging you into your window manager and desktop environment when + you boot your computer. + </para> + <para> + This is especially helpful if you have disk encryption enabled. + Since you already have to provide a password to decrypt your disk, + entering a second password to login can be redundant. + </para> + <para> + To enable auto-login, you need to define your default window + manager and desktop environment. If you wanted no desktop + environment and i3 as your your window manager, you'd define: + </para> + <programlisting language="bash"> +services.xserver.displayManager.defaultSession = "none+i3"; +</programlisting> + <para> + Every display manager in NixOS supports auto-login, here is an + example using lightdm for a user <literal>alice</literal>: + </para> + <programlisting language="bash"> +services.xserver.displayManager.lightdm.enable = true; +services.xserver.displayManager.autoLogin.enable = true; +services.xserver.displayManager.autoLogin.user = "alice"; +</programlisting> + </section> + <section xml:id="sec-x11--graphics-cards-intel"> + <title>Intel Graphics drivers</title> + <para> + There are two choices for Intel Graphics drivers in X.org: + <literal>modesetting</literal> (included in the xorg-server + itself) and <literal>intel</literal> (provided by the package + xf86-video-intel). + </para> + <para> + The default and recommended is <literal>modesetting</literal>. It + is a generic driver which uses the kernel + <link xlink:href="https://en.wikipedia.org/wiki/Mode_setting">mode + setting</link> (KMS) mechanism. It supports Glamor (2D graphics + acceleration via OpenGL) and is actively maintained but may + perform worse in some cases (like in old chipsets). + </para> + <para> + The second driver, <literal>intel</literal>, is specific to Intel + GPUs, but not recommended by most distributions: it lacks several + modern features (for example, it doesn't support Glamor) and the + package hasn't been officially updated since 2015. + </para> + <para> + The results vary depending on the hardware, so you may have to try + both drivers. Use the option + <xref linkend="opt-services.xserver.videoDrivers" /> to set one. + The recommended configuration for modern systems is: + </para> + <programlisting language="bash"> +services.xserver.videoDrivers = [ "modesetting" ]; +services.xserver.useGlamor = true; +</programlisting> + <para> + If you experience screen tearing no matter what, this + configuration was reported to resolve the issue: + </para> + <programlisting language="bash"> +services.xserver.videoDrivers = [ "intel" ]; +services.xserver.deviceSection = '' + Option "DRI" "2" + Option "TearFree" "true" +''; +</programlisting> + <para> + Note that this will likely downgrade the performance compared to + <literal>modesetting</literal> or <literal>intel</literal> with + DRI 3 (default). + </para> + </section> + <section xml:id="sec-x11-graphics-cards-nvidia"> + <title>Proprietary NVIDIA drivers</title> + <para> + NVIDIA provides a proprietary driver for its graphics cards that + has better 3D performance than the X.org drivers. It is not + enabled by default because it’s not free software. You can enable + it as follows: + </para> + <programlisting language="bash"> +services.xserver.videoDrivers = [ "nvidia" ]; +</programlisting> + <para> + Or if you have an older card, you may have to use one of the + legacy drivers: + </para> + <programlisting language="bash"> +services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; +</programlisting> + <para> + You may need to reboot after enabling this driver to prevent a + clash with other kernel modules. + </para> + </section> + <section xml:id="sec-x11--graphics-cards-amd"> + <title>Proprietary AMD drivers</title> + <para> + AMD provides a proprietary driver for its graphics cards that is + not enabled by default because it’s not Free Software, is often + broken in nixpkgs and as of this writing doesn't offer more + features or performance. If you still want to use it anyway, you + need to explicitly set: + </para> + <programlisting language="bash"> +services.xserver.videoDrivers = [ "amdgpu-pro" ]; +</programlisting> + <para> + You will need to reboot after enabling this driver to prevent a + clash with other kernel modules. + </para> + </section> + <section xml:id="sec-x11-touchpads"> + <title>Touchpads</title> + <para> + Support for Synaptics touchpads (found in many laptops such as the + Dell Latitude series) can be enabled as follows: + </para> + <programlisting language="bash"> +services.xserver.libinput.enable = true; +</programlisting> + <para> + The driver has many options (see <xref linkend="ch-options" />). + For instance, the following disables tap-to-click behavior: + </para> + <programlisting language="bash"> +services.xserver.libinput.touchpad.tapping = false; +</programlisting> + <para> + Note: the use of <literal>services.xserver.synaptics</literal> is + deprecated since NixOS 17.09. + </para> + </section> + <section xml:id="sec-x11-gtk-and-qt-themes"> + <title>GTK/Qt themes</title> + <para> + GTK themes can be installed either to user profile or system-wide + (via <literal>environment.systemPackages</literal>). To make Qt 5 + applications look similar to GTK ones, you can use the following + configuration: + </para> + <programlisting language="bash"> +qt5.enable = true; +qt5.platformTheme = "gtk2"; +qt5.style = "gtk2"; +</programlisting> + </section> + <section xml:id="custom-xkb-layouts"> + <title>Custom XKB layouts</title> + <para> + It is possible to install custom + <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension"> + XKB </link> keyboard layouts using the option + <literal>services.xserver.extraLayouts</literal>. + </para> + <para> + As a first example, we are going to create a layout based on the + basic US layout, with an additional layer to type some greek + symbols by pressing the right-alt key. + </para> + <para> + Create a file called <literal>us-greek</literal> with the + following content (under a directory called + <literal>symbols</literal>; it's an XKB peculiarity that will help + with testing): + </para> + <programlisting language="bash"> +xkb_symbols "us-greek" +{ + include "us(basic)" // includes the base US keys + include "level3(ralt_switch)" // configures right alt as a third level switch + + key <LatA> { [ a, A, Greek_alpha ] }; + key <LatB> { [ b, B, Greek_beta ] }; + key <LatG> { [ g, G, Greek_gamma ] }; + key <LatD> { [ d, D, Greek_delta ] }; + key <LatZ> { [ z, Z, Greek_zeta ] }; +}; +</programlisting> + <para> + A minimal layout specification must include the following: + </para> + <programlisting language="bash"> +services.xserver.extraLayouts.us-greek = { + description = "US layout with alt-gr greek"; + languages = [ "eng" ]; + symbolsFile = /yourpath/symbols/us-greek; +}; +</programlisting> + <note> + <para> + The name (after <literal>extraLayouts.</literal>) should match + the one given to the <literal>xkb_symbols</literal> block. + </para> + </note> + <para> + Applying this customization requires rebuilding several packages, + and a broken XKB file can lead to the X session crashing at login. + Therefore, you're strongly advised to <emphasis role="strong">test + your layout before applying it</emphasis>: + </para> + <programlisting> +$ nix-shell -p xorg.xkbcomp +$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY +</programlisting> + <para> + You can inspect the predefined XKB files for examples: + </para> + <programlisting> +$ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" +</programlisting> + <para> + Once the configuration is applied, and you did a logout/login + cycle, the layout should be ready to use. You can try it by e.g. + running <literal>setxkbmap us-greek</literal> and then type + <literal><alt>+a</literal> (it may not get applied in your + terminal straight away). To change the default, the usual + <literal>services.xserver.layout</literal> option can still be + used. + </para> + <para> + A layout can have several other components besides + <literal>xkb_symbols</literal>, for example we will define new + keycodes for some multimedia key and bind these to some symbol. + </para> + <para> + Use the <emphasis>xev</emphasis> utility from + <literal>pkgs.xorg.xev</literal> to find the codes of the keys of + interest, then create a <literal>media-key</literal> file to hold + the keycodes definitions + </para> + <programlisting language="bash"> +xkb_keycodes "media" +{ + <volUp> = 123; + <volDown> = 456; +} +</programlisting> + <para> + Now use the newly define keycodes in <literal>media-sym</literal>: + </para> + <programlisting language="bash"> +xkb_symbols "media" +{ + key.type = "ONE_LEVEL"; + key <volUp> { [ XF86AudioLowerVolume ] }; + key <volDown> { [ XF86AudioRaiseVolume ] }; +} +</programlisting> + <para> + As before, to install the layout do + </para> + <programlisting language="bash"> +services.xserver.extraLayouts.media = { + description = "Multimedia keys remapping"; + languages = [ "eng" ]; + symbolsFile = /path/to/media-key; + keycodesFile = /path/to/media-sym; +}; +</programlisting> + <note> + <para> + The function + <literal>pkgs.writeText <filename> <content></literal> + can be useful if you prefer to keep the layout definitions + inside the NixOS configuration. + </para> + </note> + <para> + Unfortunately, the Xorg server does not (currently) support + setting a keymap directly but relies instead on XKB rules to + select the matching components (keycodes, types, ...) of a layout. + This means that components other than symbols won't be loaded by + default. As a workaround, you can set the keymap using + <literal>setxkbmap</literal> at the start of the session with: + </para> + <programlisting language="bash"> +services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; +</programlisting> + <para> + If you are manually starting the X server, you should set the + argument <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X + won't find your layout files. For example with + <literal>xinit</literal> run + </para> + <programlisting> +$ xinit -- -xkbdir /etc/X11/xkb +</programlisting> + <para> + To learn how to write layouts take a look at the XKB + <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts">documentation + </link>. More example layouts can also be found + <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples">here + </link>. + </para> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml new file mode 100644 index 000000000000..f96ef2e8c483 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -0,0 +1,62 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-xfce"> + <title>Xfce Desktop Environment</title> + <para> + To enable the Xfce Desktop Environment, set + </para> + <programlisting language="bash"> +services.xserver.desktopManager.xfce.enable = true; +services.xserver.displayManager.defaultSession = "xfce"; +</programlisting> + <para> + Optionally, <emphasis>picom</emphasis> can be enabled for nice + graphical effects, some example settings: + </para> + <programlisting language="bash"> +services.picom = { + enable = true; + fade = true; + inactiveOpacity = 0.9; + shadow = true; + fadeDelta = 4; +}; +</programlisting> + <para> + Some Xfce programs are not installed automatically. To install them + manually (system wide), put them into your + <xref linkend="opt-environment.systemPackages" /> from + <literal>pkgs.xfce</literal>. + </para> + <section xml:id="sec-xfce-thunar-plugins"> + <title>Thunar Plugins</title> + <para> + If you'd like to add extra plugins to Thunar, add them to + <xref linkend="opt-services.xserver.desktopManager.xfce.thunarPlugins" />. + You shouldn't just add them to + <xref linkend="opt-environment.systemPackages" />. + </para> + </section> + <section xml:id="sec-xfce-troubleshooting"> + <title>Troubleshooting</title> + <para> + Even after enabling udisks2, volume management might not work. + Thunar and/or the desktop takes time to show up. Thunar will spit + out this kind of message on start (look at + <literal>journalctl --user -b</literal>). + </para> + <programlisting> +Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported +</programlisting> + <para> + This is caused by some needed GNOME services not running. This is + all fixed by enabling "Launch GNOME services on startup" + in the Advanced tab of the Session and Startup settings panel. + Alternatively, you can run this command to do the same thing. + </para> + <programlisting> +$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true +</programlisting> + <para> + A log-out and re-log will be needed for this to take effect. + </para> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/building-parts.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/development/building-parts.chapter.xml new file mode 100644 index 000000000000..4df24cc95652 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/building-parts.chapter.xml @@ -0,0 +1,124 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-parts"> + <title>Building Specific Parts of NixOS</title> + <para> + With the command <literal>nix-build</literal>, you can build + specific parts of your NixOS configuration. This is done as follows: + </para> + <programlisting> +$ cd /path/to/nixpkgs/nixos +$ nix-build -A config.option +</programlisting> + <para> + where <literal>option</literal> is a NixOS option with type + <quote>derivation</quote> (i.e. something that can be built). + Attributes of interest include: + </para> + <variablelist> + <varlistentry> + <term> + <literal>system.build.toplevel</literal> + </term> + <listitem> + <para> + The top-level option that builds the entire NixOS system. + Everything else in your configuration is indirectly pulled in + by this option. This is what <literal>nixos-rebuild</literal> + builds and what <literal>/run/current-system</literal> points + to afterwards. + </para> + <para> + A shortcut to build this is: + </para> + <programlisting> +$ nix-build -A system +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>system.build.manual.manualHTML</literal> + </term> + <listitem> + <para> + The NixOS manual. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>system.build.etc</literal> + </term> + <listitem> + <para> + A tree of symlinks that form the static parts of + <literal>/etc</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>system.build.initialRamdisk</literal> , + <literal>system.build.kernel</literal> + </term> + <listitem> + <para> + The initial ramdisk and kernel of the system. This allows a + quick way to test whether the kernel and the initial ramdisk + boot correctly, by using QEMU’s <literal>-kernel</literal> and + <literal>-initrd</literal> options: + </para> + <programlisting> +$ nix-build -A config.system.build.initialRamdisk -o initrd +$ nix-build -A config.system.build.kernel -o kernel +$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>system.build.nixos-rebuild</literal> , + <literal>system.build.nixos-install</literal> , + <literal>system.build.nixos-generate-config</literal> + </term> + <listitem> + <para> + These build the corresponding NixOS commands. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>systemd.units.unit-name.unit</literal> + </term> + <listitem> + <para> + This builds the unit with the specified name. Note that since + unit names contain dots (e.g. + <literal>httpd.service</literal>), you need to put them + between quotes, like this: + </para> + <programlisting> +$ nix-build -A 'config.systemd.units."httpd.service".unit' +</programlisting> + <para> + You can also test individual units, without rebuilding the + whole system, by putting them in + <literal>/run/systemd/system</literal>: + </para> + <programlisting> +$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ + /run/systemd/system/tmp-httpd.service +# systemctl daemon-reload +# systemctl start tmp-httpd.service +</programlisting> + <para> + Note that the unit must not have the same name as any unit in + <literal>/etc/systemd/system</literal> since those take + precedence over <literal>/run/systemd/system</literal>. That’s + why the unit is installed as + <literal>tmp-httpd.service</literal> here. + </para> + </listitem> + </varlistentry> + </variablelist> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/freeform-modules.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/freeform-modules.section.xml new file mode 100644 index 000000000000..86a9cf3140d8 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/freeform-modules.section.xml @@ -0,0 +1,87 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-freeform-modules"> + <title>Freeform modules</title> + <para> + Freeform modules allow you to define values for option paths that + have not been declared explicitly. This can be used to add + attribute-specific types to what would otherwise have to be + <literal>attrsOf</literal> options in order to accept all attribute + names. + </para> + <para> + This feature can be enabled by using the attribute + <literal>freeformType</literal> to define a freeform type. By doing + this, all assignments without an associated option will be merged + using the freeform type and combined into the resulting + <literal>config</literal> set. Since this feature nullifies name + checking for entire option trees, it is only recommended for use in + submodules. + </para> + <anchor xml:id="ex-freeform-module" /> + <para> + <emphasis role="strong">Example: Freeform submodule</emphasis> + </para> + <para> + The following shows a submodule assigning a freeform type that + allows arbitrary attributes with <literal>str</literal> values below + <literal>settings</literal>, but also declares an option for the + <literal>settings.port</literal> attribute to have it type-checked + and assign a default value. See + <link linkend="ex-settings-typed-attrs">Example: Declaring a + type-checked <literal>settings</literal> attribute</link> for a more + complete example. + </para> + <programlisting language="bash"> +{ lib, config, ... }: { + + options.settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = with lib.types; attrsOf str; + + # We want this attribute to be checked for the correct type + options.port = lib.mkOption { + type = lib.types.port; + # Declaring the option also allows defining a default value + default = 8080; + }; + + }; + }; +} +</programlisting> + <para> + And the following shows what such a module then allows + </para> + <programlisting language="bash"> +{ + # Not a declared option, but the freeform type allows this + settings.logLevel = "debug"; + + # Not allowed because the the freeform type only allows strings + # settings.enable = true; + + # Allowed because there is a port option declared + settings.port = 80; + + # Not allowed because the port option doesn't allow strings + # settings.port = "443"; +} +</programlisting> + <note> + <para> + Freeform attributes cannot depend on other attributes of the same + set without infinite recursion: + </para> + <programlisting language="bash"> +{ + # This throws infinite recursion encountered + settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; +} +</programlisting> + <para> + To prevent this, declare options for all attributes that need to + depend on others. For above example this means to declare + <literal>logLevel</literal> to be an option. + </para> + </note> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/importing-modules.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/importing-modules.section.xml new file mode 100644 index 000000000000..cb04dde67c83 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/importing-modules.section.xml @@ -0,0 +1,47 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-importing-modules"> + <title>Importing Modules</title> + <para> + Sometimes NixOS modules need to be used in configuration but exist + outside of Nixpkgs. These modules can be imported: + </para> + <programlisting language="bash"> +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} +</programlisting> + <para> + The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> + is an absolute path to a NixOS module that is included alongside the + Nixpkgs NixOS modules. Like any NixOS module, this module can import + additional modules: + </para> + <programlisting language="bash"> +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] +</programlisting> + <programlisting language="bash"> +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } +</programlisting> + <programlisting language="bash"> +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml new file mode 100644 index 000000000000..f535d94602bd --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml @@ -0,0 +1,55 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-meta-attributes"> + <title>Meta Attributes</title> + <para> + Like Nix packages, NixOS modules can declare meta-attributes to + provide extra information. Module meta attributes are defined in the + <literal>meta.nix</literal> special module. + </para> + <para> + <literal>meta</literal> is a top level attribute like + <literal>options</literal> and <literal>config</literal>. Available + meta-attributes are <literal>maintainers</literal> and + <literal>doc</literal>. + </para> + <para> + Each of the meta-attributes must be defined at most once per module + file. + </para> + <programlisting language="bash"> +{ config, lib, pkgs, ... }: +{ + options = { + ... + }; + + config = { + ... + }; + + meta = { + maintainers = with lib.maintainers; [ ericsagnes ]; + doc = ./default.xml; + }; +} +</programlisting> + <itemizedlist> + <listitem> + <para> + <literal>maintainers</literal> contains a list of the module + maintainers. + </para> + </listitem> + <listitem> + <para> + <literal>doc</literal> points to a valid DocBook file containing + the module documentation. Its contents is automatically added to + <xref linkend="ch-configuration" />. Changes to a module + documentation have to be checked to not break building the NixOS + manual: + </para> + <programlisting> +$ nix-build nixos/release.nix -A manual.x86_64-linux +</programlisting> + </listitem> + </itemizedlist> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml new file mode 100644 index 000000000000..b9ff2269676c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml @@ -0,0 +1,14 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-nixos-tests"> + <title>NixOS Tests</title> + <para> + When you add some feature to NixOS, you should write a test for it. + NixOS tests are kept in the directory + <literal>nixos/tests</literal>, and are executed (using Nix) by a + testing framework that automatically starts one or more virtual + machines containing the NixOS system(s) required for the test. + </para> + <xi:include href="writing-nixos-tests.section.xml" /> + <xi:include href="running-nixos-tests.section.xml" /> + <xi:include href="running-nixos-tests-interactively.section.xml" /> + <xi:include href="linking-nixos-tests-to-packages.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml new file mode 100644 index 000000000000..85a59a543d14 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -0,0 +1,203 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-option-declarations"> + <title>Option Declarations</title> + <para> + An option declaration specifies the name, type and description of a + NixOS configuration option. It is invalid to define an option that + hasn’t been declared in any module. An option declaration generally + looks like this: + </para> + <programlisting language="bash"> +options = { + name = mkOption { + type = type specification; + default = default value; + example = example value; + description = "Description for use in the NixOS manual."; + }; +}; +</programlisting> + <para> + The attribute names within the <literal>name</literal> attribute + path must be camel cased in general but should, as an exception, + match the + <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> + package attribute name</link> when referencing a Nixpkgs package. + For example, the option + <literal>services.nix-serve.bindAddress</literal> references the + <literal>nix-serve</literal> Nixpkgs package. + </para> + <para> + The function <literal>mkOption</literal> accepts the following + arguments. + </para> + <variablelist> + <varlistentry> + <term> + <literal>type</literal> + </term> + <listitem> + <para> + The type of the option (see + <xref linkend="sec-option-types" />). It may be omitted, but + that’s not advisable since it may lead to errors that are hard + to diagnose. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>default</literal> + </term> + <listitem> + <para> + The default value used if no value is defined by any module. A + default is not required; but if a default is not given, then + users of the module will have to define the value of the + option, otherwise an error will be thrown. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>example</literal> + </term> + <listitem> + <para> + An example value that will be shown in the NixOS manual. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>description</literal> + </term> + <listitem> + <para> + A textual description of the option, in DocBook format, that + will be included in the NixOS manual. + </para> + </listitem> + </varlistentry> + </variablelist> + <section xml:id="sec-option-declarations-eot"> + <title>Extensible Option Types</title> + <para> + Extensible option types is a feature that allow to extend certain + types declaration through multiple module files. This feature only + work with a restricted set of types, namely + <literal>enum</literal> and <literal>submodules</literal> and any + composed forms of them. + </para> + <para> + Extensible option types can be used for <literal>enum</literal> + options that affects multiple modules, or as an alternative to + related <literal>enable</literal> options. + </para> + <para> + As an example, we will take the case of display managers. There is + a central display manager module for generic display manager + options and a module file per display manager backend (sddm, gdm + ...). + </para> + <para> + There are two approach to this module structure: + </para> + <itemizedlist> + <listitem> + <para> + Managing the display managers independently by adding an + enable option to every display manager module backend. (NixOS) + </para> + </listitem> + <listitem> + <para> + Managing the display managers in the central module by adding + an option to select which display manager backend to use. + </para> + </listitem> + </itemizedlist> + <para> + Both approaches have problems. + </para> + <para> + Making backends independent can quickly become hard to manage. For + display managers, there can be only one enabled at a time, but the + type system can not enforce this restriction as there is no + relation between each backend <literal>enable</literal> option. As + a result, this restriction has to be done explicitely by adding + assertions in each display manager backend module. + </para> + <para> + On the other hand, managing the display managers backends in the + central module will require to change the central module option + every time a new backend is added or removed. + </para> + <para> + By using extensible option types, it is possible to create a + placeholder option in the central module + (<link linkend="ex-option-declaration-eot-service">Example: + Extensible type placeholder in the service module</link>), and to + extend it in each backend module + (<link linkend="ex-option-declaration-eot-backend-gdm">Example: + Extending + <literal>services.xserver.displayManager.enable</literal> in the + <literal>gdm</literal> module</link>, + <link linkend="ex-option-declaration-eot-backend-sddm">Example: + Extending + <literal>services.xserver.displayManager.enable</literal> in the + <literal>sddm</literal> module</link>). + </para> + <para> + As a result, <literal>displayManager.enable</literal> option + values can be added without changing the main service module file + and the type system automatically enforce that there can only be a + single display manager enabled. + </para> + <anchor xml:id="ex-option-declaration-eot-service" /> + <para> + <emphasis role="strong">Example: Extensible type placeholder in + the service module</emphasis> + </para> + <programlisting language="bash"> +services.xserver.displayManager.enable = mkOption { + description = "Display manager to use"; + type = with types; nullOr (enum [ ]); +}; +</programlisting> + <anchor xml:id="ex-option-declaration-eot-backend-gdm" /> + <para> + <emphasis role="strong">Example: Extending + <literal>services.xserver.displayManager.enable</literal> in the + <literal>gdm</literal> module</emphasis> + </para> + <programlisting language="bash"> +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "gdm" ]); +}; +</programlisting> + <anchor xml:id="ex-option-declaration-eot-backend-sddm" /> + <para> + <emphasis role="strong">Example: Extending + <literal>services.xserver.displayManager.enable</literal> in the + <literal>sddm</literal> module</emphasis> + </para> + <programlisting language="bash"> +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "sddm" ]); +}; +</programlisting> + <para> + The placeholder declaration is a standard + <literal>mkOption</literal> declaration, but it is important that + extensible option declarations only use the + <literal>type</literal> argument. + </para> + <para> + Extensible option types work with any of the composed variants of + <literal>enum</literal> such as + <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> + or + <literal>with types; listOf (enum [ "foo" "bar" ])</literal>. + </para> + </section> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/option-def.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/option-def.section.xml new file mode 100644 index 000000000000..8c9ef181affd --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/option-def.section.xml @@ -0,0 +1,104 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-option-definitions"> + <title>Option Definitions</title> + <para> + Option definitions are generally straight-forward bindings of values + to option names, like + </para> + <programlisting language="bash"> +config = { + services.httpd.enable = true; +}; +</programlisting> + <para> + However, sometimes you need to wrap an option definition or set of + option definitions in a <emphasis>property</emphasis> to achieve + certain effects: + </para> + <section xml:id="sec-option-definitions-delaying-conditionals"> + <title>Delaying Conditionals</title> + <para> + If a set of option definitions is conditional on the value of + another option, you may need to use <literal>mkIf</literal>. + Consider, for instance: + </para> + <programlisting language="bash"> +config = if config.services.httpd.enable then { + environment.systemPackages = [ ... ]; + ... +} else {}; +</programlisting> + <para> + This definition will cause Nix to fail with an <quote>infinite + recursion</quote> error. Why? Because the value of + <literal>config.services.httpd.enable</literal> depends on the + value being constructed here. After all, you could also write the + clearly circular and contradictory: + </para> + <programlisting language="bash"> +config = if config.services.httpd.enable then { + services.httpd.enable = false; +} else { + services.httpd.enable = true; +}; +</programlisting> + <para> + The solution is to write: + </para> + <programlisting language="bash"> +config = mkIf config.services.httpd.enable { + environment.systemPackages = [ ... ]; + ... +}; +</programlisting> + <para> + The special function <literal>mkIf</literal> causes the evaluation + of the conditional to be <quote>pushed down</quote> into the + individual definitions, as if you had written: + </para> + <programlisting language="bash"> +config = { + environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; + ... +}; +</programlisting> + </section> + <section xml:id="sec-option-definitions-setting-priorities"> + <title>Setting Priorities</title> + <para> + A module can override the definitions of an option in other + modules by setting a <emphasis>priority</emphasis>. All option + definitions that do not have the lowest priority value are + discarded. By default, option definitions have priority 1000. You + can specify an explicit priority by using + <literal>mkOverride</literal>, e.g. + </para> + <programlisting language="bash"> +services.openssh.enable = mkOverride 10 false; +</programlisting> + <para> + This definition causes all other definitions with priorities above + 10 to be discarded. The function <literal>mkForce</literal> is + equal to <literal>mkOverride 50</literal>. + </para> + </section> + <section xml:id="sec-option-definitions-merging"> + <title>Merging Configurations</title> + <para> + In conjunction with <literal>mkIf</literal>, it is sometimes + useful for a module to return multiple sets of option definitions, + to be merged together as if they were declared in separate + modules. This can be done using <literal>mkMerge</literal>: + </para> + <programlisting language="bash"> +config = mkMerge + [ # Unconditional stuff. + { environment.systemPackages = [ ... ]; + } + # Conditional stuff. + (mkIf config.services.bla.enable { + environment.systemPackages = [ ... ]; + }) + ]; +</programlisting> + </section> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml new file mode 100644 index 000000000000..c83ffa2add53 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml @@ -0,0 +1,987 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-option-types"> + <title>Options Types</title> + <para> + Option types are a way to put constraints on the values a module + option can take. Types are also responsible of how values are merged + in case of multiple value definitions. + </para> + <section xml:id="sec-option-types-basic"> + <title>Basic Types</title> + <para> + Basic types are the simplest available types in the module system. + Basic types include multiple string types that mainly differ in + how definition merging is handled. + </para> + <variablelist> + <varlistentry> + <term> + <literal>types.bool</literal> + </term> + <listitem> + <para> + A boolean, its values can be <literal>true</literal> or + <literal>false</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.path</literal> + </term> + <listitem> + <para> + A filesystem path, defined as anything that when coerced to + a string starts with a slash. Even if derivations can be + considered as path, the more specific + <literal>types.package</literal> should be preferred. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.package</literal> + </term> + <listitem> + <para> + A derivation or a store path. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.anything</literal> + </term> + <listitem> + <para> + A type that accepts any value and recursively merges + attribute sets together. This type is recommended when the + option type is unknown. + </para> + <anchor xml:id="ex-types-anything" /> + <para> + <emphasis role="strong">Example: + <literal>types.anything</literal> Example</emphasis> + </para> + <para> + Two definitions of this type like + </para> + <programlisting language="bash"> +{ + str = lib.mkDefault "foo"; + pkg.hello = pkgs.hello; + fun.fun = x: x + 1; +} +</programlisting> + <programlisting language="bash"> +{ + str = lib.mkIf true "bar"; + pkg.gcc = pkgs.gcc; + fun.fun = lib.mkForce (x: x + 2); +} +</programlisting> + <para> + will get merged to + </para> + <programlisting language="bash"> +{ + str = "bar"; + pkg.gcc = pkgs.gcc; + pkg.hello = pkgs.hello; + fun.fun = x: x + 2; +} +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.attrs</literal> + </term> + <listitem> + <para> + A free-form attribute set. + </para> + <warning> + <para> + This type will be deprecated in the future because it + doesn't recurse into attribute sets, silently drops + earlier attribute definitions, and doesn't discharge + <literal>lib.mkDefault</literal>, + <literal>lib.mkIf</literal> and co. For allowing arbitrary + attribute sets, prefer + <literal>types.attrsOf types.anything</literal> instead + which doesn't have these problems. + </para> + </warning> + </listitem> + </varlistentry> + </variablelist> + <para> + Integer-related types: + </para> + <variablelist> + <varlistentry> + <term> + <literal>types.int</literal> + </term> + <listitem> + <para> + A signed integer. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.ints.{s8, s16, s32}</literal> + </term> + <listitem> + <para> + Signed integers with a fixed length (8, 16 or 32 bits). They + go from −2^n/2 to 2^n/2−1 respectively (e.g. + <literal>−128</literal> to <literal>127</literal> for 8 + bits). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.ints.unsigned</literal> + </term> + <listitem> + <para> + An unsigned integer (that is >= 0). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.ints.{u8, u16, u32}</literal> + </term> + <listitem> + <para> + Unsigned integers with a fixed length (8, 16 or 32 bits). + They go from 0 to 2^n−1 respectively (e.g. + <literal>0</literal> to <literal>255</literal> for 8 bits). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.ints.positive</literal> + </term> + <listitem> + <para> + A positive integer (that is > 0). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.port</literal> + </term> + <listitem> + <para> + A port number. This type is an alias to + <literal>types.ints.u16</literal>. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + String-related types: + </para> + <variablelist> + <varlistentry> + <term> + <literal>types.str</literal> + </term> + <listitem> + <para> + A string. Multiple definitions cannot be merged. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.lines</literal> + </term> + <listitem> + <para> + A string. Multiple definitions are concatenated with a new + line <literal>"\n"</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.commas</literal> + </term> + <listitem> + <para> + A string. Multiple definitions are concatenated with a comma + <literal>","</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.envVar</literal> + </term> + <listitem> + <para> + A string. Multiple definitions are concatenated with a + collon <literal>":"</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.strMatching</literal> + </term> + <listitem> + <para> + A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is + processed using <literal>builtins.match</literal>. + </para> + </listitem> + </varlistentry> + </variablelist> + </section> + <section xml:id="sec-option-types-value"> + <title>Value Types</title> + <para> + Value types are types that take a value parameter. + </para> + <variablelist> + <varlistentry> + <term> + <literal>types.enum</literal> + <emphasis><literal>l</literal></emphasis> + </term> + <listitem> + <para> + One element of the list + <emphasis><literal>l</literal></emphasis>, e.g. + <literal>types.enum [ "left" "right" ]</literal>. + Multiple definitions cannot be merged. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.separatedString</literal> + <emphasis><literal>sep</literal></emphasis> + </term> + <listitem> + <para> + A string with a custom separator + <emphasis><literal>sep</literal></emphasis>, e.g. + <literal>types.separatedString "|"</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.ints.between</literal> + <emphasis><literal>lowest highest</literal></emphasis> + </term> + <listitem> + <para> + An integer between + <emphasis><literal>lowest</literal></emphasis> and + <emphasis><literal>highest</literal></emphasis> (both + inclusive). Useful for creating types like + <literal>types.port</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.submodule</literal> + <emphasis><literal>o</literal></emphasis> + </term> + <listitem> + <para> + A set of sub options + <emphasis><literal>o</literal></emphasis>. + <emphasis><literal>o</literal></emphasis> can be an + attribute set, a function returning an attribute set, or a + path to a file containing such a value. Submodules are used + in composed types to create modular options. This is + equivalent to + <literal>types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }</literal>. + Submodules are detailed in + <link linkend="section-option-types-submodule">Submodule</link>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.submoduleWith</literal> { + <emphasis><literal>modules</literal></emphasis>, + <emphasis><literal>specialArgs</literal></emphasis> ? {}, + <emphasis><literal>shorthandOnlyDefinesConfig</literal></emphasis> + ? false } + </term> + <listitem> + <para> + Like <literal>types.submodule</literal>, but more flexible + and with better defaults. It has parameters + </para> + <itemizedlist> + <listitem> + <para> + <emphasis><literal>modules</literal></emphasis> A list + of modules to use by default for this submodule type. + This gets combined with all option definitions to build + the final list of modules that will be included. + </para> + <note> + <para> + Only options defined with this argument are included + in rendered documentation. + </para> + </note> + </listitem> + <listitem> + <para> + <emphasis><literal>specialArgs</literal></emphasis> An + attribute set of extra arguments to be passed to the + module functions. The option + <literal>_module.args</literal> should be used instead + for most arguments since it allows overriding. + <emphasis><literal>specialArgs</literal></emphasis> + should only be used for arguments that can't go through + the module fixed-point, because of infinite recursion or + other problems. An example is overriding the + <literal>lib</literal> argument, because + <literal>lib</literal> itself is used to define + <literal>_module.args</literal>, which makes using + <literal>_module.args</literal> to define it impossible. + </para> + </listitem> + <listitem> + <para> + <emphasis><literal>shorthandOnlyDefinesConfig</literal></emphasis> + Whether definitions of this type should default to the + <literal>config</literal> section of a module (see + <link linkend="ex-module-syntax">Example: Structure of + NixOS Modules</link>) if it is an attribute set. + Enabling this only has a benefit when the submodule + defines an option named <literal>config</literal> or + <literal>options</literal>. In such a case it would + allow the option to be set with + <literal>the-submodule.config = "value"</literal> + instead of requiring + <literal>the-submodule.config.config = "value"</literal>. + This is because only when modules + <emphasis>don't</emphasis> set the + <literal>config</literal> or <literal>options</literal> + keys, all keys are interpreted as option definitions in + the <literal>config</literal> section. Enabling this + option implicitly puts all attributes in the + <literal>config</literal> section. + </para> + <para> + With this option enabled, defining a + non-<literal>config</literal> section requires using a + function: + <literal>the-submodule = { ... }: { options = { ... }; }</literal>. + </para> + </listitem> + </itemizedlist> + </listitem> + </varlistentry> + </variablelist> + </section> + <section xml:id="sec-option-types-composed"> + <title>Composed Types</title> + <para> + Composed types are types that take a type as parameter. + <literal>listOf int</literal> and + <literal>either int str</literal> are examples of composed types. + </para> + <variablelist> + <varlistentry> + <term> + <literal>types.listOf</literal> + <emphasis><literal>t</literal></emphasis> + </term> + <listitem> + <para> + A list of <emphasis><literal>t</literal></emphasis> type, + e.g. <literal>types.listOf int</literal>. Multiple + definitions are merged with list concatenation. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.attrsOf</literal> + <emphasis><literal>t</literal></emphasis> + </term> + <listitem> + <para> + An attribute set of where all the values are of + <emphasis><literal>t</literal></emphasis> type. Multiple + definitions result in the joined attribute set. + </para> + <note> + <para> + This type is <emphasis>strict</emphasis> in its values, + which in turn means attributes cannot depend on other + attributes. See <literal> types.lazyAttrsOf</literal> for + a lazy version. + </para> + </note> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.lazyAttrsOf</literal> + <emphasis><literal>t</literal></emphasis> + </term> + <listitem> + <para> + An attribute set of where all the values are of + <emphasis><literal>t</literal></emphasis> type. Multiple + definitions result in the joined attribute set. This is the + lazy version of <literal>types.attrsOf </literal>, allowing + attributes to depend on each other. + </para> + <warning> + <para> + This version does not fully support conditional + definitions! With an option <literal>foo</literal> of this + type and a definition + <literal>foo.attr = lib.mkIf false 10</literal>, + evaluating <literal>foo ? attr</literal> will return + <literal>true</literal> even though it should be false. + Accessing the value will then throw an error. For types + <emphasis><literal>t</literal></emphasis> that have an + <literal>emptyValue</literal> defined, that value will be + returned instead of throwing an error. So if the type of + <literal>foo.attr</literal> was + <literal>lazyAttrsOf (nullOr int)</literal>, + <literal>null</literal> would be returned instead for the + same <literal>mkIf false</literal> definition. + </para> + </warning> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.nullOr</literal> + <emphasis><literal>t</literal></emphasis> + </term> + <listitem> + <para> + <literal>null</literal> or type + <emphasis><literal>t</literal></emphasis>. Multiple + definitions are merged according to type + <emphasis><literal>t</literal></emphasis>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.uniq</literal> + <emphasis><literal>t</literal></emphasis> + </term> + <listitem> + <para> + Ensures that type <emphasis><literal>t</literal></emphasis> + cannot be merged. It is used to ensure option definitions + are declared only once. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.either</literal> + <emphasis><literal>t1 t2</literal></emphasis> + </term> + <listitem> + <para> + Type <emphasis><literal>t1</literal></emphasis> or type + <emphasis><literal>t2</literal></emphasis>, e.g. + <literal>with types; either int str</literal>. Multiple + definitions cannot be merged. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.oneOf</literal> [ + <emphasis><literal>t1 t2</literal></emphasis> ... ] + </term> + <listitem> + <para> + Type <emphasis><literal>t1</literal></emphasis> or type + <emphasis><literal>t2</literal></emphasis> and so forth, + e.g. <literal>with types; oneOf [ int str bool ]</literal>. + Multiple definitions cannot be merged. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>types.coercedTo</literal> + <emphasis><literal>from f to</literal></emphasis> + </term> + <listitem> + <para> + Type <emphasis><literal>to</literal></emphasis> or type + <emphasis><literal>from</literal></emphasis> which will be + coerced to type <emphasis><literal>to</literal></emphasis> + using function <emphasis><literal>f</literal></emphasis> + which takes an argument of type + <emphasis><literal>from</literal></emphasis> and return a + value of type <emphasis><literal>to</literal></emphasis>. + Can be used to preserve backwards compatibility of an option + if its type was changed. + </para> + </listitem> + </varlistentry> + </variablelist> + </section> + <section xml:id="section-option-types-submodule"> + <title>Submodule</title> + <para> + <literal>submodule</literal> is a very powerful type that defines + a set of sub-options that are handled like a separate module. + </para> + <para> + It takes a parameter <emphasis><literal>o</literal></emphasis>, + that should be a set, or a function returning a set with an + <literal>options</literal> key defining the sub-options. Submodule + option definitions are type-checked accordingly to the + <literal>options</literal> declarations. Of course, you can nest + submodule option definitons for even higher modularity. + </para> + <para> + The option set can be defined directly + (<link linkend="ex-submodule-direct">Example: Directly defined + submodule</link>) or as reference + (<link linkend="ex-submodule-reference">Example: Submodule defined + as a reference</link>). + </para> + <anchor xml:id="ex-submodule-direct" /> + <para> + <emphasis role="strong">Example: Directly defined + submodule</emphasis> + </para> + <programlisting language="bash"> +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }; +}; +</programlisting> + <anchor xml:id="ex-submodule-reference" /> + <para> + <emphasis role="strong">Example: Submodule defined as a + reference</emphasis> + </para> + <programlisting language="bash"> +let + modOptions = { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = int; + }; + }; + }; +in +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule modOptions; +}; +</programlisting> + <para> + The <literal>submodule</literal> type is especially interesting + when used with composed types like <literal>attrsOf</literal> or + <literal>listOf</literal>. When composed with + <literal>listOf</literal> + (<link linkend="ex-submodule-listof-declaration">Example: + Declaration of a list of submodules</link>), + <literal>submodule</literal> allows multiple definitions of the + submodule option set + (<link linkend="ex-submodule-listof-definition">Example: + Definition of a list of submodules</link>). + </para> + <anchor xml:id="ex-submodule-listof-declaration" /> + <para> + <emphasis role="strong">Example: Declaration of a list of + submodules</emphasis> + </para> + <programlisting language="bash"> +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; +</programlisting> + <anchor xml:id="ex-submodule-listof-definition" /> + <para> + <emphasis role="strong">Example: Definition of a list of + submodules</emphasis> + </para> + <programlisting language="bash"> +config.mod = [ + { foo = 1; bar = "one"; } + { foo = 2; bar = "two"; } +]; +</programlisting> + <para> + When composed with <literal>attrsOf</literal> + (<link linkend="ex-submodule-attrsof-declaration">Example: + Declaration of attribute sets of submodules</link>), + <literal>submodule</literal> allows multiple named definitions of + the submodule option set + (<link linkend="ex-submodule-attrsof-definition">Example: + Definition of attribute sets of submodules</link>). + </para> + <anchor xml:id="ex-submodule-attrsof-declaration" /> + <para> + <emphasis role="strong">Example: Declaration of attribute sets of + submodules</emphasis> + </para> + <programlisting language="bash"> +options.mod = mkOption { + description = "submodule example"; + type = with types; attrsOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; +</programlisting> + <anchor xml:id="ex-submodule-attrsof-definition" /> + <para> + <emphasis role="strong">Example: Definition of attribute sets of + submodules</emphasis> + </para> + <programlisting language="bash"> +config.mod.one = { foo = 1; bar = "one"; }; +config.mod.two = { foo = 2; bar = "two"; }; +</programlisting> + </section> + <section xml:id="sec-option-types-extending"> + <title>Extending types</title> + <para> + Types are mainly characterized by their <literal>check</literal> + and <literal>merge</literal> functions. + </para> + <variablelist> + <varlistentry> + <term> + <literal>check</literal> + </term> + <listitem> + <para> + The function to type check the value. Takes a value as + parameter and return a boolean. It is possible to extend a + type check with the <literal>addCheck</literal> function + (<link linkend="ex-extending-type-check-1">Example: Adding a + type check</link>), or to fully override the check function + (<link linkend="ex-extending-type-check-2">Example: + Overriding a type check</link>). + </para> + <anchor xml:id="ex-extending-type-check-1" /> + <para> + <emphasis role="strong">Example: Adding a type + check</emphasis> + </para> + <programlisting language="bash"> +byte = mkOption { + description = "An integer between 0 and 255."; + type = types.addCheck types.int (x: x >= 0 && x <= 255); +}; +</programlisting> + <anchor xml:id="ex-extending-type-check-2" /> + <para> + <emphasis role="strong">Example: Overriding a type + check</emphasis> + </para> + <programlisting language="bash"> +nixThings = mkOption { + description = "words that start with 'nix'"; + type = types.str // { + check = (x: lib.hasPrefix "nix" x) + }; +}; +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>merge</literal> + </term> + <listitem> + <para> + Function to merge the options values when multiple values + are set. The function takes two parameters, + <literal>loc</literal> the option path as a list of strings, + and <literal>defs</literal> the list of defined values as a + list. It is possible to override a type merge function for + custom needs. + </para> + </listitem> + </varlistentry> + </variablelist> + </section> + <section xml:id="sec-option-types-custom"> + <title>Custom Types</title> + <para> + Custom types can be created with the + <literal>mkOptionType</literal> function. As type creation + includes some more complex topics such as submodule handling, it + is recommended to get familiar with <literal>types.nix</literal> + code before creating a new type. + </para> + <para> + The only required parameter is <literal>name</literal>. + </para> + <variablelist> + <varlistentry> + <term> + <literal>name</literal> + </term> + <listitem> + <para> + A string representation of the type function name. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>definition</literal> + </term> + <listitem> + <para> + Description of the type used in documentation. Give + information of the type and any of its arguments. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>check</literal> + </term> + <listitem> + <para> + A function to type check the definition value. Takes the + definition value as a parameter and returns a boolean + indicating the type check result, <literal>true</literal> + for success and <literal>false</literal> for failure. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>merge</literal> + </term> + <listitem> + <para> + A function to merge multiple definitions values. Takes two + parameters: + </para> + <variablelist> + <varlistentry> + <term> + <emphasis><literal>loc</literal></emphasis> + </term> + <listitem> + <para> + The option path as a list of strings, e.g. + <literal>["boot" "loader "grub" "enable"]</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <emphasis><literal>defs</literal></emphasis> + </term> + <listitem> + <para> + The list of sets of defined <literal>value</literal> + and <literal>file</literal> where the value was + defined, e.g. + <literal>[ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]</literal>. + The <literal>merge</literal> function should return + the merged value or throw an error in case the values + are impossible or not meant to be merged. + </para> + </listitem> + </varlistentry> + </variablelist> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>getSubOptions</literal> + </term> + <listitem> + <para> + For composed types that can take a submodule as type + parameter, this function generate sub-options documentation. + It takes the current option prefix as a list and return the + set of sub-options. Usually defined in a recursive manner by + adding a term to the prefix, e.g. + <literal>prefix: elemType.getSubOptions (prefix ++ ["prefix"])</literal> + where + <emphasis><literal>"prefix"</literal></emphasis> + is the newly added prefix. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>getSubModules</literal> + </term> + <listitem> + <para> + For composed types that can take a submodule as type + parameter, this function should return the type parameters + submodules. If the type parameter is called + <literal>elemType</literal>, the function should just + recursively look into submodules by returning + <literal>elemType.getSubModules;</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>substSubModules</literal> + </term> + <listitem> + <para> + For composed types that can take a submodule as type + parameter, this function can be used to substitute the + parameter of a submodule type. It takes a module as + parameter and return the type with the submodule options + substituted. It is usually defined as a type function call + with a recursive call to <literal>substSubModules</literal>, + e.g for a type <literal>composedType</literal> that take an + <literal>elemtype</literal> type parameter, this function + should be defined as + <literal>m: composedType (elemType.substSubModules m)</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>typeMerge</literal> + </term> + <listitem> + <para> + A function to merge multiple type declarations. Takes the + type to merge <literal>functor</literal> as parameter. A + <literal>null</literal> return value means that type cannot + be merged. + </para> + <variablelist> + <varlistentry> + <term> + <emphasis><literal>f</literal></emphasis> + </term> + <listitem> + <para> + The type to merge <literal>functor</literal>. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + Note: There is a generic <literal>defaultTypeMerge</literal> + that work with most of value and composed types. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>functor</literal> + </term> + <listitem> + <para> + An attribute set representing the type. It is used for type + operations and has the following keys: + </para> + <variablelist> + <varlistentry> + <term> + <literal>type</literal> + </term> + <listitem> + <para> + The type function. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wrapped</literal> + </term> + <listitem> + <para> + Holds the type parameter for composed types. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>payload</literal> + </term> + <listitem> + <para> + Holds the value parameter for value types. The types + that have a <literal>payload</literal> are the + <literal>enum</literal>, + <literal>separatedString</literal> and + <literal>submodule</literal> types. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>binOp</literal> + </term> + <listitem> + <para> + A binary operation that can merge the payloads of two + same types. Defined as a function that take two + payloads as parameters and return the payloads merged. + </para> + </listitem> + </varlistentry> + </variablelist> + </listitem> + </varlistentry> + </variablelist> + </section> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/replace-modules.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/replace-modules.section.xml new file mode 100644 index 000000000000..cf8a39ba844f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/replace-modules.section.xml @@ -0,0 +1,70 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-replace-modules"> + <title>Replace Modules</title> + <para> + Modules that are imported can also be disabled. The option + declarations, config implementation and the imports of a disabled + module will be ignored, allowing another to take it's place. This + can be used to import a set of modules from another channel while + keeping the rest of the system on a stable release. + </para> + <para> + <literal>disabledModules</literal> is a top level attribute like + <literal>imports</literal>, <literal>options</literal> and + <literal>config</literal>. It contains a list of modules that will + be disabled. This can either be the full path to the module or a + string with the filename relative to the modules path (eg. + <nixpkgs/nixos/modules> for nixos). + </para> + <para> + This example will replace the existing postgresql module with the + version defined in the nixos-unstable channel while keeping the rest + of the modules and packages from the original nixos channel. This + only overrides the module definition, this won't use postgresql from + nixos-unstable unless explicitly configured to do so. + </para> + <programlisting language="bash"> +{ config, lib, pkgs, ... }: + +{ + disabledModules = [ "services/databases/postgresql.nix" ]; + + imports = + [ # Use postgresql service from nixos-unstable channel. + # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable + <nixos-unstable/nixos/modules/services/databases/postgresql.nix> + ]; + + services.postgresql.enable = true; +} +</programlisting> + <para> + This example shows how to define a custom module as a replacement + for an existing module. Importing this module will disable the + original module without having to know it's implementation details. + </para> + <programlisting language="bash"> +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.man; +in + +{ + disabledModules = [ "services/programs/man.nix" ]; + + options = { + programs.man.enable = mkOption { + type = types.bool; + default = true; + description = "Whether to enable manual pages."; + }; + }; + + config = mkIf cfg.enabled { + warnings = [ "disabled manpages for production deployments." ]; + }; +} +</programlisting> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml new file mode 100644 index 000000000000..c9430b77579c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -0,0 +1,285 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-settings-options"> + <title>Options for Program Settings</title> + <para> + Many programs have configuration files where program-specific + settings can be declared. File formats can be separated into two + categories: + </para> + <itemizedlist> + <listitem> + <para> + Nix-representable ones: These can trivially be mapped to a + subset of Nix syntax. E.g. JSON is an example, since its values + like <literal>{"foo":{"bar":10}}</literal> + can be mapped directly to Nix: + <literal>{ foo = { bar = 10; }; }</literal>. Other examples are + INI, YAML and TOML. The following section explains the + convention for these settings. + </para> + </listitem> + <listitem> + <para> + Non-nix-representable ones: These can't be trivially mapped to a + subset of Nix syntax. Most generic programming languages are in + this group, e.g. bash, since the statement + <literal>if true; then echo hi; fi</literal> doesn't have a + trivial representation in Nix. + </para> + <para> + Currently there are no fixed conventions for these, but it is + common to have a <literal>configFile</literal> option for + setting the configuration file path directly. The default value + of <literal>configFile</literal> can be an auto-generated file, + with convenient options for controlling the contents. For + example an option of type <literal>attrsOf str</literal> can be + used for representing environment variables which generates a + section like <literal>export FOO="foo"</literal>. + Often it can also be useful to also include an + <literal>extraConfig</literal> option of type + <literal>lines</literal> to allow arbitrary text after the + autogenerated part of the file. + </para> + </listitem> + </itemizedlist> + <section xml:id="sec-settings-nix-representable"> + <title>Nix-representable Formats (JSON, YAML, TOML, INI, + ...)</title> + <para> + By convention, formats like this are handled with a generic + <literal>settings</literal> option, representing the full program + configuration as a Nix value. The type of this option should + represent the format. The most common formats have a predefined + type and string generator already declared under + <literal>pkgs.formats</literal>: + </para> + <variablelist> + <varlistentry> + <term> + <literal>pkgs.formats.json</literal> { } + </term> + <listitem> + <para> + A function taking an empty attribute set (for future + extensibility) and returning a set with JSON-specific + attributes <literal>type</literal> and + <literal>generate</literal> as specified + <link linkend="pkgs-formats-result">below</link>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>pkgs.formats.yaml</literal> { } + </term> + <listitem> + <para> + A function taking an empty attribute set (for future + extensibility) and returning a set with YAML-specific + attributes <literal>type</literal> and + <literal>generate</literal> as specified + <link linkend="pkgs-formats-result">below</link>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>pkgs.formats.ini</literal> { + <emphasis><literal>listsAsDuplicateKeys</literal></emphasis> ? + false, <emphasis><literal>listToValue</literal></emphasis> ? + null, ... } + </term> + <listitem> + <para> + A function taking an attribute set with values + </para> + <variablelist> + <varlistentry> + <term> + <literal>listsAsDuplicateKeys</literal> + </term> + <listitem> + <para> + A boolean for controlling whether list values can be + used to represent duplicate INI keys + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>listToValue</literal> + </term> + <listitem> + <para> + A function for turning a list of values into a single + value. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + It returns a set with INI-specific attributes + <literal>type</literal> and <literal>generate</literal> as + specified <link linkend="pkgs-formats-result">below</link>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>pkgs.formats.toml</literal> { } + </term> + <listitem> + <para> + A function taking an empty attribute set (for future + extensibility) and returning a set with TOML-specific + attributes <literal>type</literal> and + <literal>generate</literal> as specified + <link linkend="pkgs-formats-result">below</link>. + </para> + </listitem> + </varlistentry> + </variablelist> + <para xml:id="pkgs-formats-result"> + These functions all return an attribute set with these values: + </para> + <variablelist> + <varlistentry> + <term> + <literal>type</literal> + </term> + <listitem> + <para> + A module system type representing a value of the format + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>generate</literal> + <emphasis><literal>filename jsonValue</literal></emphasis> + </term> + <listitem> + <para> + A function that can render a value of the format to a file. + Returns a file path. + </para> + <note> + <para> + This function puts the value contents in the Nix store. So + this should be avoided for secrets. + </para> + </note> + </listitem> + </varlistentry> + </variablelist> + <anchor xml:id="ex-settings-nix-representable" /> + <para> + <emphasis role="strong">Example: Module with conventional + <literal>settings</literal> option</emphasis> + </para> + <para> + The following shows a module for an example program that uses a + JSON configuration file. It demonstrates how above values can be + used, along with some other related best practices. See the + comments for explanations. + </para> + <programlisting language="bash"> +{ options, config, lib, pkgs, ... }: +let + cfg = config.services.foo; + # Define the settings format used for this program + settingsFormat = pkgs.formats.json {}; +in { + + options.services.foo = { + enable = lib.mkEnableOption "foo service"; + + settings = lib.mkOption { + # Setting this type allows for correct merging behavior + type = settingsFormat.type; + default = {}; + description = '' + Configuration for foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported settings. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + # We can assign some default settings here to make the service work by just + # enabling it. We use `mkDefault` for values that can be changed without + # problems + services.foo.settings = { + # Fails at runtime without any value set + log_level = lib.mkDefault "WARN"; + + # We assume systemd's `StateDirectory` is used, so we require this value, + # therefore no mkDefault + data_path = "/var/lib/foo"; + + # Since we use this to create a user we need to know the default value at + # eval time + user = lib.mkDefault "foo"; + }; + + environment.etc."foo.json".source = + # The formats generator function takes a filename and the Nix value + # representing the format value and produces a filepath with that value + # rendered in the format + settingsFormat.generate "foo-config.json" cfg.settings; + + # We know that the `user` attribute exists because we set a default value + # for it above, allowing us to use it without worries here + users.users.${cfg.settings.user} = { isSystemUser = true; }; + + # ... + }; +} +</programlisting> + <section xml:id="sec-settings-attrs-options"> + <title>Option declarations for attributes</title> + <para> + Some <literal>settings</literal> attributes may deserve some + extra care. They may need a different type, default or merging + behavior, or they are essential options that should show their + documentation in the manual. This can be done using + <xref linkend="sec-freeform-modules" />. + </para> + <para> + We extend above example using freeform modules to declare an + option for the port, which will enforce it to be a valid integer + and make it show up in the manual. + </para> + <anchor xml:id="ex-settings-typed-attrs" /> + <para> + <emphasis role="strong">Example: Declaring a type-checked + <literal>settings</literal> attribute</emphasis> + </para> + <programlisting language="bash"> +settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = settingsFormat.type; + + # Declare an option for the port such that the type is checked and this option + # is shown in the manual. + options.port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + Which port this service should listen on. + ''; + }; + + }; + default = {}; + description = '' + Configuration for Foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported values. + ''; +}; +</programlisting> + </section> + </section> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/sources.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/development/sources.chapter.xml new file mode 100644 index 000000000000..aac18c9d06c8 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/sources.chapter.xml @@ -0,0 +1,90 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-getting-sources"> + <title>Getting the Sources</title> + <para> + By default, NixOS’s <literal>nixos-rebuild</literal> command uses + the NixOS and Nixpkgs sources provided by the + <literal>nixos</literal> channel (kept in + <literal>/nix/var/nix/profiles/per-user/root/channels/nixos</literal>). + To modify NixOS, however, you should check out the latest sources + from Git. This is as follows: + </para> + <programlisting> +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +$ git remote update origin +</programlisting> + <para> + This will check out the latest Nixpkgs sources to + <literal>./nixpkgs</literal> the NixOS sources to + <literal>./nixpkgs/nixos</literal>. (The NixOS source tree lives in + a subdirectory of the Nixpkgs repository.) The + <literal>nixpkgs</literal> repository has branches that correspond + to each Nixpkgs/NixOS channel (see <xref linkend="sec-upgrading" /> + for more information about channels). Thus, the Git branch + <literal>origin/nixos-17.03</literal> will contain the latest built + and tested version available in the <literal>nixos-17.03</literal> + channel. + </para> + <para> + It’s often inconvenient to develop directly on the master branch, + since if somebody has just committed (say) a change to GCC, then the + binary cache may not have caught up yet and you’ll have to rebuild + everything from source. So you may want to create a local branch + based on your current NixOS version: + </para> + <programlisting> +$ nixos-version +17.09pre104379.6e0b727 (Hummingbird) + +$ git checkout -b local 6e0b727 +</programlisting> + <para> + Or, to base your local branch on the latest version available in a + NixOS channel: + </para> + <programlisting> +$ git remote update origin +$ git checkout -b local origin/nixos-17.03 +</programlisting> + <para> + (Replace <literal>nixos-17.03</literal> with the name of the channel + you want to use.) You can use <literal>git merge</literal> or + <literal>git rebase</literal> to keep your local branch in sync with + the channel, e.g. + </para> + <programlisting> +$ git remote update origin +$ git merge origin/nixos-17.03 +</programlisting> + <para> + You can use <literal>git cherry-pick</literal> to copy commits from + your local branch to the upstream branch. + </para> + <para> + If you want to rebuild your system using your (modified) sources, + you need to tell <literal>nixos-rebuild</literal> about them using + the <literal>-I</literal> flag: + </para> + <programlisting> +# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs +</programlisting> + <para> + If you want <literal>nix-env</literal> to use the expressions in + <literal>/my/sources</literal>, use + <literal>nix-env -f /my/sources/nixpkgs</literal>, or change the + default by adding a symlink in <literal>~/.nix-defexpr</literal>: + </para> + <programlisting> +$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs +</programlisting> + <para> + You may want to delete the symlink + <literal>~/.nix-defexpr/channels_root</literal> to prevent root’s + NixOS channel from clashing with your own tree (this may break the + command-not-found utility though). If you want to go back to the + default state, you may just remove the + <literal>~/.nix-defexpr</literal> directory completely, log out and + log in again and it should have been recreated with a link to the + root channels. + </para> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/testing-installer.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/development/testing-installer.chapter.xml new file mode 100644 index 000000000000..286d49f3c291 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/testing-installer.chapter.xml @@ -0,0 +1,22 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ch-testing-installer"> + <title>Testing the Installer</title> + <para> + Building, burning, and booting from an installation CD is rather + tedious, so here is a quick way to see if the installer works + properly: + </para> + <programlisting> +# mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install +# ./result/bin/nixos-install +</programlisting> + <para> + To start a login shell in the new NixOS installation in + <literal>/mnt</literal>: + </para> + <programlisting> +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter +</programlisting> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml new file mode 100644 index 000000000000..079c80060576 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml @@ -0,0 +1,144 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-writing-documentation"> + <title>Writing NixOS Documentation</title> + <para> + As NixOS grows, so too does the need for a catalogue and explanation + of its extensive functionality. Collecting pertinent information + from disparate sources and presenting it in an accessible style + would be a worthy contribution to the project. + </para> + <section xml:id="sec-writing-docs-building-the-manual"> + <title>Building the Manual</title> + <para> + The DocBook sources of the <xref linkend="book-nixos-manual" /> + are in the + <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><literal>nixos/doc/manual</literal></link> + subdirectory of the Nixpkgs repository. + </para> + <para> + You can quickly validate your edits with <literal>make</literal>: + </para> + <programlisting> +$ cd /path/to/nixpkgs/nixos/doc/manual +$ nix-shell +nix-shell$ make +</programlisting> + <para> + Once you are done making modifications to the manual, it's + important to build it before committing. You can do that as + follows: + </para> + <programlisting> +nix-build nixos/release.nix -A manual.x86_64-linux +</programlisting> + <para> + When this command successfully finishes, it will tell you where + the manual got generated. The HTML will be accessible through the + <literal>result</literal> symlink at + <literal>./result/share/doc/nixos/index.html</literal>. + </para> + </section> + <section xml:id="sec-writing-docs-editing-docbook-xml"> + <title>Editing DocBook XML</title> + <para> + For general information on how to write in DocBook, see + <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html">DocBook + 5: The Definitive Guide</link>. + </para> + <para> + Emacs nXML Mode is very helpful for editing DocBook XML because it + validates the document as you write, and precisely locates errors. + To use it, see <xref linkend="sec-emacs-docbook-xml" />. + </para> + <para> + <link xlink:href="http://pandoc.org">Pandoc</link> can generate + DocBook XML from a multitude of formats, which makes a good + starting point. Here is an example of Pandoc invocation to convert + GitHub-Flavoured MarkDown to DocBook 5 XML: + </para> + <programlisting> +pandoc -f markdown_github -t docbook5 docs.md -o my-section.md +</programlisting> + <para> + Pandoc can also quickly convert a single + <literal>section.xml</literal> to HTML, which is helpful when + drafting. + </para> + <para> + Sometimes writing valid DocBook is simply too difficult. In this + case, submit your documentation updates in a + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub + Issue</link> and someone will handle the conversion to XML for + you. + </para> + </section> + <section xml:id="sec-writing-docs-creating-a-topic"> + <title>Creating a Topic</title> + <para> + You can use an existing topic as a basis for the new topic or + create a topic from scratch. + </para> + <para> + Keep the following guidelines in mind when you create and add a + topic: + </para> + <itemizedlist> + <listitem> + <para> + The NixOS + <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><literal>book</literal></link> + element is in <literal>nixos/doc/manual/manual.xml</literal>. + It includes several + <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><literal>parts</literal></link> + which are in subdirectories. + </para> + </listitem> + <listitem> + <para> + Store the topic file in the same directory as the + <literal>part</literal> to which it belongs. If your topic is + about configuring a NixOS module, then the XML file can be + stored alongside the module definition <literal>nix</literal> + file. + </para> + </listitem> + <listitem> + <para> + If you include multiple words in the file name, separate the + words with a dash. For example: + <literal>ipv6-config.xml</literal>. + </para> + </listitem> + <listitem> + <para> + Make sure that the <literal>xml:id</literal> value is unique. + You can use abbreviations if the ID is too long. For example: + <literal>nixos-config</literal>. + </para> + </listitem> + <listitem> + <para> + Determine whether your topic is a chapter or a section. If you + are unsure, open an existing topic file and check whether the + main element is chapter or section. + </para> + </listitem> + </itemizedlist> + </section> + <section xml:id="sec-writing-docs-adding-a-topic"> + <title>Adding a Topic to the Book</title> + <para> + Open the parent XML file and add an <literal>xi:include</literal> + element to the list of chapters with the file name of the topic + that you created. If you created a <literal>section</literal>, you + add the file to the <literal>chapter</literal> file. If you + created a <literal>chapter</literal>, you add the file to the + <literal>part</literal> file. + </para> + <para> + If the topic is about configuring a NixOS module, it can be + automatically included in the manual by using the + <literal>meta.doc</literal> attribute. See + <xref linkend="sec-meta-attributes" /> for an explanation. + </para> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/development/writing-modules.chapter.xml new file mode 100644 index 000000000000..e33c24f4f12c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/development/writing-modules.chapter.xml @@ -0,0 +1,196 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-writing-modules"> + <title>Writing NixOS Modules</title> + <para> + NixOS has a modular system for declarative configuration. This + system combines multiple <emphasis>modules</emphasis> to produce the + full system configuration. One of the modules that constitute the + configuration is <literal>/etc/nixos/configuration.nix</literal>. + Most of the others live in the + <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><literal>nixos/modules</literal></link> + subdirectory of the Nixpkgs tree. + </para> + <para> + Each NixOS module is a file that handles one logical aspect of the + configuration, such as a specific kind of hardware, a service, or + network settings. A module configuration does not have to handle + everything from scratch; it can use the functionality provided by + other modules for its implementation. Thus a module can + <emphasis>declare</emphasis> options that can be used by other + modules, and conversely can <emphasis>define</emphasis> options + provided by other modules in its own implementation. For example, + the module + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><literal>pam.nix</literal></link> + declares the option <literal>security.pam.services</literal> that + allows other modules (e.g. + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><literal>sshd.nix</literal></link>) + to define PAM services; and it defines the option + <literal>environment.etc</literal> (declared by + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><literal>etc.nix</literal></link>) + to cause files to be created in <literal>/etc/pam.d</literal>. + </para> + <para> + In <xref linkend="sec-configuration-syntax" />, we saw the following + structure of NixOS modules: + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ option definitions +} +</programlisting> + <para> + This is actually an <emphasis>abbreviated</emphasis> form of module + that only defines options, but does not declare any. The structure + of full NixOS modules is shown in + <link linkend="ex-module-syntax">Example: Structure of NixOS + Modules</link>. + </para> + <anchor xml:id="ex-module-syntax" /> + <para> + <emphasis role="strong">Example: Structure of NixOS + Modules</emphasis> + </para> + <programlisting language="bash"> +{ config, pkgs, ... }: + +{ + imports = + [ paths of other modules + ]; + + options = { + option declarations + }; + + config = { + option definitions + }; +} +</programlisting> + <para> + The meaning of each part is as follows. + </para> + <itemizedlist> + <listitem> + <para> + The first line makes the current Nix expression a function. The + variable <literal>pkgs</literal> contains Nixpkgs (by default, + it takes the <literal>nixpkgs</literal> entry of + <literal>NIX_PATH</literal>, see the + <link xlink:href="https://nixos.org/manual/nix/stable/#sec-common-env">Nix + manual</link> for further details), while + <literal>config</literal> contains the full system + configuration. This line can be omitted if there is no reference + to <literal>pkgs</literal> and <literal>config</literal> inside + the module. + </para> + </listitem> + <listitem> + <para> + This <literal>imports</literal> list enumerates the paths to + other NixOS modules that should be included in the evaluation of + the system configuration. A default set of modules is defined in + the file <literal>modules/module-list.nix</literal>. These don't + need to be added in the import list. + </para> + </listitem> + <listitem> + <para> + The attribute <literal>options</literal> is a nested set of + <emphasis>option declarations</emphasis> (described below). + </para> + </listitem> + <listitem> + <para> + The attribute <literal>config</literal> is a nested set of + <emphasis>option definitions</emphasis> (also described below). + </para> + </listitem> + </itemizedlist> + <para> + <link linkend="locate-example">Example: NixOS Module for the + <quote>locate</quote> Service</link> shows a module that handles the + regular update of the <quote>locate</quote> database, an index of + all files in the file system. This module declares two options that + can be defined by other modules (typically the user’s + <literal>configuration.nix</literal>): + <literal>services.locate.enable</literal> (whether the database + should be updated) and <literal>services.locate.interval</literal> + (when the update should be done). It implements its functionality by + defining two options declared by other modules: + <literal>systemd.services</literal> (the set of all systemd + services) and <literal>systemd.timers</literal> (the list of + commands to be executed periodically by <literal>systemd</literal>). + </para> + <anchor xml:id="locate-example" /> + <para> + <emphasis role="strong">Example: NixOS Module for the + <quote>locate</quote> Service</emphasis> + </para> + <programlisting language="bash"> +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.locate; +in { + options.services.locate = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically update the database of + files used by the locate command. + ''; + }; + + interval = mkOption { + type = types.str; + default = "02:15"; + example = "hourly"; + description = '' + Update the locate database at this interval. Updates by + default at 2:15 AM every day. + + The format is described in + systemd.time(7). + ''; + }; + + # Other options omitted for documentation + }; + + config = { + systemd.services.update-locatedb = + { description = "Update Locate Database"; + path = [ pkgs.su ]; + script = + '' + mkdir -m 0755 -p $(dirname ${toString cfg.output}) + exec updatedb \ + --localuser=${cfg.localuser} \ + ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ + --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} + ''; + }; + + systemd.timers.update-locatedb = mkIf cfg.enable + { description = "Update timer for locate database"; + partOf = [ "update-locatedb.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.interval; + }; + }; +} +</programlisting> + <xi:include href="option-declarations.section.xml" /> + <xi:include href="option-types.section.xml" /> + <xi:include href="option-def.section.xml" /> + <xi:include href="assertions.section.xml" /> + <xi:include href="meta-attributes.section.xml" /> + <xi:include href="importing-modules.section.xml" /> + <xi:include href="replace-modules.section.xml" /> + <xi:include href="freeform-modules.section.xml" /> + <xi:include href="settings-options.section.xml" /> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/installation/changing-config.chapter.xml new file mode 100644 index 000000000000..86f0b15b41c5 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/changing-config.chapter.xml @@ -0,0 +1,117 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-changing-config"> + <title>Changing the Configuration</title> + <para> + The file <literal>/etc/nixos/configuration.nix</literal> contains + the current configuration of your machine. Whenever you’ve + <link linkend="ch-configuration">changed something</link> in that + file, you should do + </para> + <programlisting> +# nixos-rebuild switch +</programlisting> + <para> + to build the new configuration, make it the default configuration + for booting, and try to realise the configuration in the running + system (e.g., by restarting system services). + </para> + <warning> + <para> + This command doesn't start/stop + <link linkend="opt-systemd.user.services">user services</link> + automatically. <literal>nixos-rebuild</literal> only runs a + <literal>daemon-reload</literal> for each user with running user + services. + </para> + </warning> + <warning> + <para> + These commands must be executed as root, so you should either run + them from a root shell or by prefixing them with + <literal>sudo -i</literal>. + </para> + </warning> + <para> + You can also do + </para> + <programlisting> +# nixos-rebuild test +</programlisting> + <para> + to build the configuration and switch the running system to it, but + without making it the boot default. So if (say) the configuration + locks up your machine, you can just reboot to get back to a working + configuration. + </para> + <para> + There is also + </para> + <programlisting> +# nixos-rebuild boot +</programlisting> + <para> + to build the configuration and make it the boot default, but not + switch to it now (so it will only take effect after the next + reboot). + </para> + <para> + You can make your configuration show up in a different submenu of + the GRUB 2 boot screen by giving it a different <emphasis>profile + name</emphasis>, e.g. + </para> + <programlisting> +# nixos-rebuild switch -p test +</programlisting> + <para> + which causes the new configuration (and previous ones created using + <literal>-p test</literal>) to show up in the GRUB submenu + <quote>NixOS - Profile 'test'</quote>. This can be useful to + separate test configurations from <quote>stable</quote> + configurations. + </para> + <para> + Finally, you can do + </para> + <programlisting> +$ nixos-rebuild build +</programlisting> + <para> + to build the configuration but nothing more. This is useful to see + whether everything compiles cleanly. + </para> + <para> + If you have a machine that supports hardware virtualisation, you can + also test the new configuration in a sandbox by building and running + a QEMU <emphasis>virtual machine</emphasis> that contains the + desired configuration. Just do + </para> + <programlisting> +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm +</programlisting> + <para> + The VM does not have any data from your host system, so your + existing user accounts and home directories will not be available + unless you have set <literal>mutableUsers = false</literal>. Another + way is to temporarily add the following to your configuration: + </para> + <programlisting language="bash"> +users.users.your-user.initialHashedPassword = "test"; +</programlisting> + <para> + <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if + you have started the virtual machine at least once without the right + users, otherwise the changes will not get picked up. You can forward + ports on the host to the guest. For instance, the following will + forward host port 2222 to guest port 22 (SSH): + </para> + <programlisting> +$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm +</programlisting> + <para> + allowing you to log in via SSH (assuming you have set the + appropriate passwords or SSH authorized keys): + </para> + <programlisting> +$ ssh -p 2222 localhost +</programlisting> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml b/nixpkgs/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml new file mode 100644 index 000000000000..a551807cd47c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml @@ -0,0 +1,41 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-installing-behind-proxy"> + <title>Installing behind a proxy</title> + <para> + To install NixOS behind a proxy, do the following before running + <literal>nixos-install</literal>. + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + Update proxy configuration in + <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the + internet accessible after reboot. + </para> + <programlisting language="bash"> +networking.proxy.default = "http://user:password@proxy:port/"; +networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; +</programlisting> + </listitem> + <listitem> + <para> + Setup the proxy environment variables in the shell where you are + running <literal>nixos-install</literal>. + </para> + <programlisting> +# proxy_url="http://user:password@proxy:port/" +# export http_proxy="$proxy_url" +# export HTTP_PROXY="$proxy_url" +# export https_proxy="$proxy_url" +# export HTTPS_PROXY="$proxy_url" +</programlisting> + </listitem> + </orderedlist> + <note> + <para> + If you are switching networks with different proxy configurations, + use the <literal>specialisation</literal> option in + <literal>configuration.nix</literal> to switch proxies at runtime. + Refer to <xref linkend="ch-options" /> for more information. + </para> + </note> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixpkgs/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml new file mode 100644 index 000000000000..525531a47813 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -0,0 +1,388 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-installing-from-other-distro"> + <title>Installing from another Linux distribution</title> + <para> + Because Nix (the package manager) & Nixpkgs (the Nix packages + collection) can both be installed on any (most?) Linux + distributions, they can be used to install NixOS in various creative + ways. You can, for instance: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + Install NixOS on another partition, from your existing Linux + distribution (without the use of a USB or optical device!) + </para> + </listitem> + <listitem> + <para> + Install NixOS on the same partition (in place!), from your + existing non-NixOS Linux distribution using + <literal>NIXOS_LUSTRATE</literal>. + </para> + </listitem> + <listitem> + <para> + Install NixOS on your hard drive from the Live CD of any Linux + distribution. + </para> + </listitem> + </orderedlist> + <para> + The first steps to all these are the same: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + Install the Nix package manager: + </para> + <para> + Short version: + </para> + <programlisting> +$ curl -L https://nixos.org/nix/install | sh +$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell +</programlisting> + <para> + More details in the + <link xlink:href="https://nixos.org/nix/manual/#chap-quick-start"> + Nix manual</link> + </para> + </listitem> + <listitem> + <para> + Switch to the NixOS channel: + </para> + <para> + If you've just installed Nix on a non-NixOS distribution, you + will be on the <literal>nixpkgs</literal> channel by default. + </para> + <programlisting> +$ nix-channel --list +nixpkgs https://nixos.org/channels/nixpkgs-unstable +</programlisting> + <para> + As that channel gets released without running the NixOS tests, + it will be safer to use the <literal>nixos-*</literal> channels + instead: + </para> + <programlisting> +$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs +</programlisting> + <para> + You may want to throw in a + <literal>nix-channel --update</literal> for good measure. + </para> + </listitem> + <listitem> + <para> + Install the NixOS installation tools: + </para> + <para> + You'll need <literal>nixos-generate-config</literal> and + <literal>nixos-install</literal>, but this also makes some man + pages and <literal>nixos-enter</literal> available, just in case + you want to chroot into your NixOS partition. NixOS installs + these by default, but you don't have NixOS yet.. + </para> + <programlisting> +$ nix-env -f '<nixpkgs>' -iA nixos-install-tools +</programlisting> + </listitem> + <listitem> + <note> + <para> + The following 5 steps are only for installing NixOS to another + partition. For installing NixOS in place using + <literal>NIXOS_LUSTRATE</literal>, skip ahead. + </para> + </note> + <para> + Prepare your target partition: + </para> + <para> + At this point it is time to prepare your target partition. + Please refer to the partitioning, file-system creation, and + mounting steps of <xref linkend="sec-installation" /> + </para> + <para> + If you're about to install NixOS in place using + <literal>NIXOS_LUSTRATE</literal> there is nothing to do for + this step. + </para> + </listitem> + <listitem> + <para> + Generate your NixOS configuration: + </para> + <programlisting> +$ sudo `which nixos-generate-config` --root /mnt +</programlisting> + <para> + You'll probably want to edit the configuration files. Refer to + the <literal>nixos-generate-config</literal> step in + <xref linkend="sec-installation" /> for more information. + </para> + <para> + Consider setting up the NixOS bootloader to give you the ability + to boot on your existing Linux partition. For instance, if + you're using GRUB and your existing distribution is running + Ubuntu, you may want to add something like this to your + <literal>configuration.nix</literal>: + </para> + <programlisting language="bash"> +boot.loader.grub.extraEntries = '' + menuentry "Ubuntu" { + search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e + configfile "($ubuntu)/boot/grub/grub.cfg" + } +''; +</programlisting> + <para> + (You can find the appropriate UUID for your partition in + <literal>/dev/disk/by-uuid</literal>) + </para> + </listitem> + <listitem> + <para> + Create the <literal>nixbld</literal> group and user on your + original distribution: + </para> + <programlisting> +$ sudo groupadd -g 30000 nixbld +$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld +</programlisting> + </listitem> + <listitem> + <para> + Download/build/install NixOS: + </para> + <warning> + <para> + Once you complete this step, you might no longer be able to + boot on existing systems without the help of a rescue USB + drive or similar. + </para> + </warning> + <note> + <para> + On some distributions there are separate PATHS for programs + intended only for root. In order for the installation to + succeed, you might have to use + <literal>PATH="$PATH:/usr/sbin:/sbin"</literal> in + the following command. + </para> + </note> + <programlisting> +$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt +</programlisting> + <para> + Again, please refer to the <literal>nixos-install</literal> step + in <xref linkend="sec-installation" /> for more information. + </para> + <para> + That should be it for installation to another partition! + </para> + </listitem> + <listitem> + <para> + Optionally, you may want to clean up your non-NixOS + distribution: + </para> + <programlisting> +$ sudo userdel nixbld +$ sudo groupdel nixbld +</programlisting> + <para> + If you do not wish to keep the Nix package manager installed + either, run something like + <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the line + that the Nix installer added to your + <literal>~/.profile</literal>. + </para> + </listitem> + <listitem> + <note> + <para> + The following steps are only for installing NixOS in place + using <literal>NIXOS_LUSTRATE</literal>: + </para> + </note> + <para> + Generate your NixOS configuration: + </para> + <programlisting> +$ sudo `which nixos-generate-config` --root / +</programlisting> + <para> + Note that this will place the generated configuration files in + <literal>/etc/nixos</literal>. You'll probably want to edit the + configuration files. Refer to the + <literal>nixos-generate-config</literal> step in + <xref linkend="sec-installation" /> for more information. + </para> + <para> + You'll likely want to set a root password for your first boot + using the configuration files because you won't have a chance to + enter a password until after you reboot. You can initalize the + root password to an empty one with this line: (and of course + don't forget to set one once you've rebooted or to lock the + account with <literal>sudo passwd -l root</literal> if you use + <literal>sudo</literal>) + </para> + <programlisting language="bash"> +users.users.root.initialHashedPassword = ""; +</programlisting> + </listitem> + <listitem> + <para> + Build the NixOS closure and install it in the + <literal>system</literal> profile: + </para> + <programlisting> +$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system +</programlisting> + </listitem> + <listitem> + <para> + Change ownership of the <literal>/nix</literal> tree to root + (since your Nix install was probably single user): + </para> + <programlisting> +$ sudo chown -R 0.0 /nix +</programlisting> + </listitem> + <listitem> + <para> + Set up the <literal>/etc/NIXOS</literal> and + <literal>/etc/NIXOS_LUSTRATE</literal> files: + </para> + <para> + <literal>/etc/NIXOS</literal> officializes that this is now a + NixOS partition (the bootup scripts require its presence). + </para> + <para> + <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup + scripts to move <emphasis>everything</emphasis> that's in the + root partition to <literal>/old-root</literal>. This will move + your existing distribution out of the way in the very early + stages of the NixOS bootup. There are exceptions (we do need to + keep NixOS there after all), so the NixOS lustrate process will + not touch: + </para> + <itemizedlist> + <listitem> + <para> + The <literal>/nix</literal> directory + </para> + </listitem> + <listitem> + <para> + The <literal>/boot</literal> directory + </para> + </listitem> + <listitem> + <para> + Any file or directory listed in + <literal>/etc/NIXOS_LUSTRATE</literal> (one per line) + </para> + </listitem> + </itemizedlist> + <note> + <para> + Support for <literal>NIXOS_LUSTRATE</literal> was added in + NixOS 16.09. The act of "lustrating" refers to the + wiping of the existing distribution. Creating + <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on + NixOS to remove all mutable files from your root partition + (anything that's not in <literal>/nix</literal> or + <literal>/boot</literal> gets "lustrated" on the + next boot. + </para> + <para> + lustrate /ˈlʌstreɪt/ verb. + </para> + <para> + purify by expiatory sacrifice, ceremonial washing, or some + other ritual action. + </para> + </note> + <para> + Let's create the files: + </para> + <programlisting> +$ sudo touch /etc/NIXOS +$ sudo touch /etc/NIXOS_LUSTRATE +</programlisting> + <para> + Let's also make sure the NixOS configuration files are kept once + we reboot on NixOS: + </para> + <programlisting> +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE +</programlisting> + </listitem> + <listitem> + <para> + Finally, move the <literal>/boot</literal> directory of your + current distribution out of the way (the lustrate process will + take care of the rest once you reboot, but this one must be + moved out now because NixOS needs to install its own boot files: + </para> + <warning> + <para> + Once you complete this step, your current distribution will no + longer be bootable! If you didn't get all the NixOS + configuration right, especially those settings pertaining to + boot loading and root partition, NixOS may not be bootable + either. Have a USB rescue device ready in case this happens. + </para> + </warning> + <programlisting> +$ sudo mv -v /boot /boot.bak && +sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot +</programlisting> + <para> + Cross your fingers, reboot, hopefully you should get a NixOS + prompt! + </para> + </listitem> + <listitem> + <para> + If for some reason you want to revert to the old distribution, + you'll need to boot on a USB rescue disk and do something along + these lines: + </para> + <programlisting> +# mkdir root +# mount /dev/sdaX root +# mkdir root/nixos-root +# mv -v root/* root/nixos-root/ +# mv -v root/nixos-root/old-root/* root/ +# mv -v root/boot.bak root/boot # We had renamed this by hand earlier +# umount root +# reboot +</programlisting> + <para> + This may work as is or you might also need to reinstall the boot + loader. + </para> + <para> + And of course, if you're happy with NixOS and no longer need the + old distribution: + </para> + <programlisting> +sudo rm -rf /old-root +</programlisting> + </listitem> + <listitem> + <para> + It's also worth noting that this whole process can be automated. + This is especially useful for Cloud VMs, where provider do not + provide NixOS. For instance, + <link xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> + uses the lustrate process to convert Digital Ocean droplets to + NixOS from other distributions automatically. + </para> + </listitem> + </orderedlist> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixpkgs/nixos/doc/manual/from_md/installation/installing-pxe.section.xml new file mode 100644 index 000000000000..1dd15ddacba8 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/installing-pxe.section.xml @@ -0,0 +1,42 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-booting-from-pxe"> + <title>Booting from the <quote>netboot</quote> media (PXE)</title> + <para> + Advanced users may wish to install NixOS using an existing PXE or + iPXE setup. + </para> + <para> + These instructions assume that you have an existing PXE or iPXE + infrastructure and simply want to add the NixOS installer as another + option. To build the necessary files from a recent version of + nixpkgs, you can run: + </para> + <programlisting> +nix-build -A netboot.x86_64-linux nixos/release.nix +</programlisting> + <para> + This will create a <literal>result</literal> directory containing: * + <literal>bzImage</literal> – the Linux kernel * + <literal>initrd</literal> – the initrd file * + <literal>netboot.ipxe</literal> – an example ipxe script + demonstrating the appropriate kernel command line arguments for this + image + </para> + <para> + If you’re using plain PXE, configure your boot loader to use the + <literal>bzImage</literal> and <literal>initrd</literal> files and + have it provide the same kernel command line arguments found in + <literal>netboot.ipxe</literal>. + </para> + <para> + If you’re using iPXE, depending on how your HTTP/FTP/etc. server is + configured you may be able to use <literal>netboot.ipxe</literal> + unmodified, or you may need to update the paths to the files to + match your server’s directory layout. + </para> + <para> + In the future we may begin making these files available as build + products from hydra at which point we will update this documentation + with instructions on how to obtain them either for placing on a + dedicated TFTP server or to boot them directly over the internet. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/nixpkgs/nixos/doc/manual/from_md/installation/installing-usb.section.xml new file mode 100644 index 000000000000..b46a1d565557 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/installing-usb.section.xml @@ -0,0 +1,35 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-booting-from-usb"> + <title>Booting from a USB Drive</title> + <para> + For systems without CD drive, the NixOS live CD can be booted from a + USB stick. You can use the <literal>dd</literal> utility to write + the image: <literal>dd if=path-to-image of=/dev/sdX</literal>. Be + careful about specifying the correct drive; you can use the + <literal>lsblk</literal> command to get a list of block devices. + </para> + <note> + <title>On macOS</title> + <programlisting> +$ diskutil list +[..] +/dev/diskN (external, physical): + #: TYPE NAME SIZE IDENTIFIER +[..] +$ diskutil unmountDisk diskN +Unmount of all volumes on diskN was successful +$ sudo dd if=nix.iso of=/dev/rdiskN +</programlisting> + <para> + Using the 'raw' <literal>rdiskN</literal> device instead of + <literal>diskN</literal> completes in minutes instead of hours. + After <literal>dd</literal> completes, a GUI dialog "The disk + you inserted was not readable by this computer" will pop up, + which can be ignored. + </para> + </note> + <para> + The <literal>dd</literal> utility will write the image verbatim to + the drive, making it the recommended option for both UEFI and + non-UEFI installations. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml b/nixpkgs/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml new file mode 100644 index 000000000000..c8bb286c8f33 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml @@ -0,0 +1,92 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-instaling-virtualbox-guest"> + <title>Installing in a VirtualBox guest</title> + <para> + Installing NixOS into a VirtualBox guest is convenient for users who + want to try NixOS without installing it on bare metal. If you want + to use a pre-made VirtualBox appliance, it is available at + <link xlink:href="https://nixos.org/nixos/download.html">the + downloads page</link>. If you want to set up a VirtualBox guest + manually, follow these instructions: + </para> + <orderedlist numeration="arabic"> + <listitem> + <para> + Add a New Machine in VirtualBox with OS Type "Linux / Other + Linux" + </para> + </listitem> + <listitem> + <para> + Base Memory Size: 768 MB or higher. + </para> + </listitem> + <listitem> + <para> + New Hard Disk of 8 GB or higher. + </para> + </listitem> + <listitem> + <para> + Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) + </para> + </listitem> + <listitem> + <para> + Click on Settings / System / Processor and enable PAE/NX + </para> + </listitem> + <listitem> + <para> + Click on Settings / System / Acceleration and enable + "VT-x/AMD-V" acceleration + </para> + </listitem> + <listitem> + <para> + Click on Settings / Display / Screen and select VMSVGA as + Graphics Controller + </para> + </listitem> + <listitem> + <para> + Save the settings, start the virtual machine, and continue + installation like normal + </para> + </listitem> + </orderedlist> + <para> + There are a few modifications you should make in configuration.nix. + Enable booting: + </para> + <programlisting language="bash"> +boot.loader.grub.device = "/dev/sda"; +</programlisting> + <para> + Also remove the fsck that runs at startup. It will always fail to + run, stopping your boot until you press <literal>*</literal>. + </para> + <programlisting language="bash"> +boot.initrd.checkJournalingFS = false; +</programlisting> + <para> + Shared folders can be given a name and a path in the host system in + the VirtualBox settings (Machine / Settings / Shared Folders, then + click on the "Add" icon). Add the following to the + <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. + If you do not add <literal>"nofail"</literal>, the system + will not boot properly. + </para> + <programlisting language="bash"> +{ config, pkgs, ...} : +{ + fileSystems."/virtualboxshare" = { + fsType = "vboxsf"; + device = "nameofthesharedfolder"; + options = [ "rw" "nofail" ]; + }; +} +</programlisting> + <para> + The folder will be available directly under the root directory. + </para> +</section> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml new file mode 100644 index 000000000000..91ab71682977 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -0,0 +1,642 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-installation"> + <title>Installing NixOS</title> + <section xml:id="sec-installation-booting"> + <title>Booting the system</title> + <para> + NixOS can be installed on BIOS or UEFI systems. The procedure for + a UEFI installation is by and large the same as a BIOS + installation. The differences are mentioned in the steps that + follow. + </para> + <para> + The installation media can be burned to a CD, or now more + commonly, <quote>burned</quote> to a USB drive (see + <xref linkend="sec-booting-from-usb" />). + </para> + <para> + The installation media contains a basic NixOS installation. When + it’s finished booting, it should have detected most of your + hardware. + </para> + <para> + The NixOS manual is available by running + <literal>nixos-help</literal>. + </para> + <para> + You are logged-in automatically as <literal>nixos</literal>. The + <literal>nixos</literal> user account has an empty password so you + can use <literal>sudo</literal> without a password. + </para> + <para> + If you downloaded the graphical ISO image, you can run + <literal>systemctl start display-manager</literal> to start the + desktop environment. If you want to continue on the terminal, you + can use <literal>loadkeys</literal> to switch to your preferred + keyboard layout. (We even provide neo2 via + <literal>loadkeys de neo</literal>!) + </para> + <para> + If the text is too small to be legible, try + <literal>setfont ter-v32n</literal> to increase the font size. + </para> + <para> + To install over a serial port connect with + <literal>115200n8</literal> (e.g. + <literal>picocom -b 115200 /dev/ttyUSB0</literal>). When the + bootloader lists boot entries, select the serial console boot + entry. + </para> + <section xml:id="sec-installation-booting-networking"> + <title>Networking in the installer</title> + <para> + The boot process should have brought up networking (check + <literal>ip a</literal>). Networking is necessary for the + installer, since it will download lots of stuff (such as source + tarballs or Nixpkgs channel binaries). It’s best if you have a + DHCP server on your network. Otherwise configure networking + manually using <literal>ifconfig</literal>. + </para> + <para> + On the graphical installer, you can configure the network, wifi + included, through NetworkManager. Using the + <literal>nmtui</literal> program, you can do so even in a + non-graphical session. If you prefer to configure the network + manually, disable NetworkManager with + <literal>systemctl stop NetworkManager</literal>. + </para> + <para> + On the minimal installer, NetworkManager is not available, so + configuration must be perfomed manually. To configure the wifi, + first start wpa_supplicant with + <literal>sudo systemctl start wpa_supplicant</literal>, then run + <literal>wpa_cli</literal>. For most home networks, you need to + type in the following commands: + </para> + <programlisting> +> add_network +0 +> set_network 0 ssid "myhomenetwork" +OK +> set_network 0 psk "mypassword" +OK +> set_network 0 key_mgmt WPA-PSK +OK +> enable_network 0 +OK +</programlisting> + <para> + For enterprise networks, for example + <emphasis>eduroam</emphasis>, instead do: + </para> + <programlisting> +> add_network +0 +> set_network 0 ssid "eduroam" +OK +> set_network 0 identity "myname@example.com" +OK +> set_network 0 password "mypassword" +OK +> set_network 0 key_mgmt WPA-EAP +OK +> enable_network 0 +OK +</programlisting> + <para> + When successfully connected, you should see a line such as this + one + </para> + <programlisting> +<3>CTRL-EVENT-CONNECTED - Connection to 32:85:ab:ef:24:5c completed [id=0 id_str=] +</programlisting> + <para> + you can now leave <literal>wpa_cli</literal> by typing + <literal>quit</literal>. + </para> + <para> + If you would like to continue the installation from a different + machine you can use activated SSH daemon. You need to copy your + ssh key to either + <literal>/home/nixos/.ssh/authorized_keys</literal> or + <literal>/root/.ssh/authorized_keys</literal> (Tip: For + installers with a modifiable filesystem such as the sd-card + installer image a key can be manually placed by mounting the + image on a different machine). Alternatively you must set a + password for either <literal>root</literal> or + <literal>nixos</literal> with <literal>passwd</literal> to be + able to login. + </para> + </section> + </section> + <section xml:id="sec-installation-partitioning"> + <title>Partitioning and formatting</title> + <para> + The NixOS installer doesn’t do any partitioning or formatting, so + you need to do that yourself. + </para> + <para> + The NixOS installer ships with multiple partitioning tools. The + examples below use <literal>parted</literal>, but also provides + <literal>fdisk</literal>, <literal>gdisk</literal>, + <literal>cfdisk</literal>, and <literal>cgdisk</literal>. + </para> + <para> + The recommended partition scheme differs depending if the computer + uses <emphasis>Legacy Boot</emphasis> or + <emphasis>UEFI</emphasis>. + </para> + <section xml:id="sec-installation-partitioning-UEFI"> + <title>UEFI (GPT)</title> + <para> + Here's an example partition scheme for UEFI, using + <literal>/dev/sda</literal> as the device. + </para> + <note> + <para> + You can safely ignore <literal>parted</literal>'s + informational message about needing to update /etc/fstab. + </para> + </note> + <orderedlist numeration="arabic"> + <listitem> + <para> + Create a <emphasis>GPT</emphasis> partition table. + </para> + <programlisting> +# parted /dev/sda -- mklabel gpt +</programlisting> + </listitem> + <listitem> + <para> + Add the <emphasis>root</emphasis> partition. This will fill + the disk except for the end part, where the swap will live, + and the space left in front (512MiB) which will be used by + the boot partition. + </para> + <programlisting> +# parted /dev/sda -- mkpart primary 512MiB -8GiB +</programlisting> + </listitem> + <listitem> + <para> + Next, add a <emphasis>swap</emphasis> partition. The size + required will vary according to needs, here a 8GiB one is + created. + </para> + <programlisting> +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +</programlisting> + <note> + <para> + The swap partition size rules are no different than for + other Linux distributions. + </para> + </note> + </listitem> + <listitem> + <para> + Finally, the <emphasis>boot</emphasis> partition. NixOS by + default uses the ESP (EFI system partition) as its + <emphasis>/boot</emphasis> partition. It uses the initially + reserved 512MiB at the start of the disk. + </para> + <programlisting> +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- set 3 esp on +</programlisting> + </listitem> + </orderedlist> + <para> + Once complete, you can follow with + <xref linkend="sec-installation-partitioning-formatting" />. + </para> + </section> + <section xml:id="sec-installation-partitioning-MBR"> + <title>Legacy Boot (MBR)</title> + <para> + Here's an example partition scheme for Legacy Boot, using + <literal>/dev/sda</literal> as the device. + </para> + <note> + <para> + You can safely ignore <literal>parted</literal>'s + informational message about needing to update /etc/fstab. + </para> + </note> + <orderedlist numeration="arabic"> + <listitem> + <para> + Create a <emphasis>MBR</emphasis> partition table. + </para> + <programlisting> +# parted /dev/sda -- mklabel msdos +</programlisting> + </listitem> + <listitem> + <para> + Add the <emphasis>root</emphasis> partition. This will fill + the the disk except for the end part, where the swap will + live. + </para> + <programlisting> +# parted /dev/sda -- mkpart primary 1MiB -8GiB +</programlisting> + </listitem> + <listitem> + <para> + Finally, add a <emphasis>swap</emphasis> partition. The size + required will vary according to needs, here a 8GiB one is + created. + </para> + <programlisting> +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +</programlisting> + <note> + <para> + The swap partition size rules are no different than for + other Linux distributions. + </para> + </note> + </listitem> + </orderedlist> + <para> + Once complete, you can follow with + <xref linkend="sec-installation-partitioning-formatting" />. + </para> + </section> + <section xml:id="sec-installation-partitioning-formatting"> + <title>Formatting</title> + <para> + Use the following commands: + </para> + <itemizedlist> + <listitem> + <para> + For initialising Ext4 partitions: + <literal>mkfs.ext4</literal>. It is recommended that you + assign a unique symbolic label to the file system using the + option <literal>-L label</literal>, since this makes the + file system configuration independent from device changes. + For example: + </para> + <programlisting> +# mkfs.ext4 -L nixos /dev/sda1 +</programlisting> + </listitem> + <listitem> + <para> + For creating swap partitions: <literal>mkswap</literal>. + Again it’s recommended to assign a label to the swap + partition: <literal>-L label</literal>. For example: + </para> + <programlisting> +# mkswap -L swap /dev/sda2 +</programlisting> + </listitem> + <listitem> + <para> + <emphasis role="strong">UEFI systems</emphasis> + </para> + <para> + For creating boot partitions: <literal>mkfs.fat</literal>. + Again it’s recommended to assign a label to the boot + partition: <literal>-n label</literal>. For example: + </para> + <programlisting> +# mkfs.fat -F 32 -n boot /dev/sda3 +</programlisting> + </listitem> + <listitem> + <para> + For creating LVM volumes, the LVM commands, e.g., + <literal>pvcreate</literal>, <literal>vgcreate</literal>, + and <literal>lvcreate</literal>. + </para> + </listitem> + <listitem> + <para> + For creating software RAID devices, use + <literal>mdadm</literal>. + </para> + </listitem> + </itemizedlist> + </section> + </section> + <section xml:id="sec-installation-installing"> + <title>Installing</title> + <orderedlist numeration="arabic"> + <listitem> + <para> + Mount the target file system on which NixOS should be + installed on <literal>/mnt</literal>, e.g. + </para> + <programlisting> +# mount /dev/disk/by-label/nixos /mnt +</programlisting> + </listitem> + <listitem> + <para> + <emphasis role="strong">UEFI systems</emphasis> + </para> + <para> + Mount the boot file system on <literal>/mnt/boot</literal>, + e.g. + </para> + <programlisting> +# mkdir -p /mnt/boot +# mount /dev/disk/by-label/boot /mnt/boot +</programlisting> + </listitem> + <listitem> + <para> + If your machine has a limited amount of memory, you may want + to activate swap devices now + (<literal>swapon device</literal>). The installer (or rather, + the build actions that it may spawn) may need quite a bit of + RAM, depending on your configuration. + </para> + <programlisting> +# swapon /dev/sda2 +</programlisting> + </listitem> + <listitem> + <para> + You now need to create a file + <literal>/mnt/etc/nixos/configuration.nix</literal> that + specifies the intended configuration of the system. This is + because NixOS has a <emphasis>declarative</emphasis> + configuration model: you create or edit a description of the + desired configuration of your system, and then NixOS takes + care of making it happen. The syntax of the NixOS + configuration file is described in + <xref linkend="sec-configuration-syntax" />, while a list of + available configuration options appears in + <xref linkend="ch-options" />. A minimal example is shown in + <link linkend="ex-config">Example: NixOS Configuration</link>. + </para> + <para> + The command <literal>nixos-generate-config</literal> can + generate an initial configuration file for you: + </para> + <programlisting> +# nixos-generate-config --root /mnt +</programlisting> + <para> + You should then edit + <literal>/mnt/etc/nixos/configuration.nix</literal> to suit + your needs: + </para> + <programlisting> +# nano /mnt/etc/nixos/configuration.nix +</programlisting> + <para> + If you’re using the graphical ISO image, other editors may be + available (such as <literal>vim</literal>). If you have + network access, you can also install other editors – for + instance, you can install Emacs by running + <literal>nix-env -f '<nixpkgs>' -iA emacs</literal>. + </para> + <variablelist> + <varlistentry> + <term> + BIOS systems + </term> + <listitem> + <para> + You <emphasis>must</emphasis> set the option + <xref linkend="opt-boot.loader.grub.device" /> to + specify on which disk the GRUB boot loader is to be + installed. Without it, NixOS cannot boot. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + UEFI systems + </term> + <listitem> + <para> + You <emphasis>must</emphasis> set the option + <xref linkend="opt-boot.loader.systemd-boot.enable" /> + to <literal>true</literal>. + <literal>nixos-generate-config</literal> should do this + automatically for new configurations when booted in UEFI + mode. + </para> + <para> + You may want to look at the options starting with + <link linkend="opt-boot.loader.efi.canTouchEfiVariables"><literal>boot.loader.efi</literal></link> + and + <link linkend="opt-boot.loader.systemd-boot.enable"><literal>boot.loader.systemd-boot</literal></link> + as well. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + If there are other operating systems running on the machine + before installing NixOS, the + <xref linkend="opt-boot.loader.grub.useOSProber" /> option can + be set to <literal>true</literal> to automatically add them to + the grub menu. + </para> + <para> + If you need to configure networking for your machine the + configuration options are described in + <xref linkend="sec-networking" />. In particular, while wifi + is supported on the installation image, it is not enabled by + default in the configuration generated by + <literal>nixos-generate-config</literal>. + </para> + <para> + Another critical option is <literal>fileSystems</literal>, + specifying the file systems that need to be mounted by NixOS. + However, you typically don’t need to set it yourself, because + <literal>nixos-generate-config</literal> sets it automatically + in + <literal>/mnt/etc/nixos/hardware-configuration.nix</literal> + from your currently mounted file systems. (The configuration + file <literal>hardware-configuration.nix</literal> is included + from <literal>configuration.nix</literal> and will be + overwritten by future invocations of + <literal>nixos-generate-config</literal>; thus, you generally + should not modify it.) Additionally, you may want to look at + <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware + configuration for known-hardware</link> at this point or after + installation. + </para> + <note> + <para> + Depending on your hardware configuration or type of file + system, you may need to set the option + <literal>boot.initrd.kernelModules</literal> to include the + kernel modules that are necessary for mounting the root file + system, otherwise the installed system will not be able to + boot. (If this happens, boot from the installation media + again, mount the target file system on + <literal>/mnt</literal>, fix + <literal>/mnt/etc/nixos/configuration.nix</literal> and + rerun <literal>nixos-install</literal>.) In most cases, + <literal>nixos-generate-config</literal> will figure out the + required modules. + </para> + </note> + </listitem> + <listitem> + <para> + Do the installation: + </para> + <programlisting> +# nixos-install +</programlisting> + <para> + This will install your system based on the configuration you + provided. If anything fails due to a configuration problem or + any other issue (such as a network outage while downloading + binaries from the NixOS binary cache), you can re-run + <literal>nixos-install</literal> after fixing your + <literal>configuration.nix</literal>. + </para> + <para> + As the last step, <literal>nixos-install</literal> will ask + you to set the password for the <literal>root</literal> user, + e.g. + </para> + <programlisting> +setting root password... +New password: *** +Retype new password: *** +</programlisting> + <note> + <para> + For unattended installations, it is possible to use + <literal>nixos-install --no-root-passwd</literal> in order + to disable the password prompt entirely. + </para> + </note> + </listitem> + <listitem> + <para> + If everything went well: + </para> + <programlisting> +# reboot +</programlisting> + </listitem> + <listitem> + <para> + You should now be able to boot into the installed NixOS. The + GRUB boot menu shows a list of <emphasis>available + configurations</emphasis> (initially just one). Every time you + change the NixOS configuration (see + <link linkend="sec-changing-config">Changing + Configuration</link>), a new item is added to the menu. This + allows you to easily roll back to a previous configuration if + something goes wrong. + </para> + <para> + You should log in and change the <literal>root</literal> + password with <literal>passwd</literal>. + </para> + <para> + You’ll probably want to create some user accounts as well, + which can be done with <literal>useradd</literal>: + </para> + <programlisting> +$ useradd -c 'Eelco Dolstra' -m eelco +$ passwd eelco +</programlisting> + <para> + You may also want to install some software. This will be + covered in <xref linkend="sec-package-management" />. + </para> + </listitem> + </orderedlist> + </section> + <section xml:id="sec-installation-summary"> + <title>Installation summary</title> + <para> + To summarise, <link linkend="ex-install-sequence">Example: + Commands for Installing NixOS on + <literal>/dev/sda</literal></link> shows a typical sequence of + commands for installing NixOS on an empty hard drive (here + <literal>/dev/sda</literal>). <link linkend="ex-config">Example: + NixOS Configuration</link> shows a corresponding configuration Nix + expression. + </para> + <anchor xml:id="ex-partition-scheme-MBR" /> + <para> + <emphasis role="strong">Example: Example partition schemes for + NixOS on <literal>/dev/sda</literal> (MBR)</emphasis> + </para> + <programlisting> +# parted /dev/sda -- mklabel msdos +# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +</programlisting> + <anchor xml:id="ex-partition-scheme-UEFI" /> + <para> + <emphasis role="strong">Example: Example partition schemes for + NixOS on <literal>/dev/sda</literal> (UEFI)</emphasis> + </para> + <programlisting> +# parted /dev/sda -- mklabel gpt +# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- set 3 esp on +</programlisting> + <anchor xml:id="ex-install-sequence" /> + <para> + <emphasis role="strong">Example: Commands for Installing NixOS on + <literal>/dev/sda</literal></emphasis> + </para> + <para> + With a partitioned disk. + </para> + <programlisting> +# mkfs.ext4 -L nixos /dev/sda1 +# mkswap -L swap /dev/sda2 +# swapon /dev/sda2 +# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) +# mount /dev/disk/by-label/nixos /mnt +# mkdir -p /mnt/boot # (for UEFI systems only) +# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) +# nixos-generate-config --root /mnt +# nano /mnt/etc/nixos/configuration.nix +# nixos-install +# reboot +</programlisting> + <anchor xml:id="ex-config" /> + <para> + <emphasis role="strong">Example: NixOS Configuration</emphasis> + </para> + <programlisting> +{ config, pkgs, ... }: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) + boot.loader.systemd-boot.enable = true; # (for UEFI systems only) + + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; + + # Enable the OpenSSH server. + services.sshd.enable = true; +} +</programlisting> + </section> + <section xml:id="sec-installation-additional-notes"> + <title>Additional installation notes</title> + <xi:include href="installing-usb.section.xml" /> + <xi:include href="installing-pxe.section.xml" /> + <xi:include href="installing-virtualbox-guest.section.xml" /> + <xi:include href="installing-from-other-distro.section.xml" /> + <xi:include href="installing-behind-a-proxy.section.xml" /> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/obtaining.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/installation/obtaining.chapter.xml new file mode 100644 index 000000000000..a922feda2536 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/obtaining.chapter.xml @@ -0,0 +1,48 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-obtaining"> + <title>Obtaining NixOS</title> + <para> + NixOS ISO images can be downloaded from the + <link xlink:href="https://nixos.org/nixos/download.html">NixOS + download page</link>. There are a number of installation options. If + you happen to have an optical drive and a spare CD, burning the + image to CD and booting from that is probably the easiest option. + Most people will need to prepare a USB stick to boot from. + <xref linkend="sec-booting-from-usb" /> describes the preferred + method to prepare a USB stick. A number of alternative methods are + presented in the + <link xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS + Wiki</link>. + </para> + <para> + As an alternative to installing NixOS yourself, you can get a + running NixOS system through several other means: + </para> + <itemizedlist> + <listitem> + <para> + Using virtual appliances in Open Virtualization Format (OVF) + that can be imported into VirtualBox. These are available from + the + <link xlink:href="https://nixos.org/nixos/download.html">NixOS + download page</link>. + </para> + </listitem> + <listitem> + <para> + Using AMIs for Amazon’s EC2. To find one for your region and + instance type, please refer to the + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list + of most recent AMIs</link>. + </para> + </listitem> + <listitem> + <para> + Using NixOps, the NixOS-based cloud deployment tool, which + allows you to provision VirtualBox and EC2 NixOS instances from + declarative specifications. Check out the + <link xlink:href="https://nixos.org/nixops">NixOps + homepage</link> for details. + </para> + </listitem> + </itemizedlist> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/installation/upgrading.chapter.xml new file mode 100644 index 000000000000..c0c5a2190fb2 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/from_md/installation/upgrading.chapter.xml @@ -0,0 +1,152 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-upgrading"> + <title>Upgrading NixOS</title> + <para> + The best way to keep your NixOS installation up to date is to use + one of the NixOS <emphasis>channels</emphasis>. A channel is a Nix + mechanism for distributing Nix expressions and associated binaries. + The NixOS channels are updated automatically from NixOS’s Git + repository after certain tests have passed and all packages have + been built. These channels are: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>Stable channels</emphasis>, such as + <link xlink:href="https://nixos.org/channels/nixos-21.05"><literal>nixos-21.05</literal></link>. + These only get conservative bug fixes and package upgrades. For + instance, a channel update may cause the Linux kernel on your + system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), + but not from 4.19.x to 4.20.x (a major change that has the + potential to break things). Stable channels are generally + maintained until the next stable branch is created. + </para> + </listitem> + <listitem> + <para> + The <emphasis>unstable channel</emphasis>, + <link xlink:href="https://nixos.org/channels/nixos-unstable"><literal>nixos-unstable</literal></link>. + This corresponds to NixOS’s main development branch, and may + thus see radical changes between channel updates. It’s not + recommended for production systems. + </para> + </listitem> + <listitem> + <para> + <emphasis>Small channels</emphasis>, such as + <link xlink:href="https://nixos.org/channels/nixos-21.05-small"><literal>nixos-21.05-small</literal></link> + or + <link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>. + These are identical to the stable and unstable channels + described above, except that they contain fewer binary packages. + This means they get updated faster than the regular channels + (for instance, when a critical security patch is committed to + NixOS’s source tree), but may require more packages to be built + from source than usual. They’re mostly intended for server + environments and as such contain few GUI applications. + </para> + </listitem> + </itemizedlist> + <para> + To see what channels are available, go to + <link xlink:href="https://nixos.org/channels">https://nixos.org/channels</link>. + (Note that the URIs of the various channels redirect to a directory + that contains the channel’s latest version and includes ISO images + and VirtualBox appliances.) Please note that during the release + process, channels that are not yet released will be present here as + well. See the Getting NixOS page + <link xlink:href="https://nixos.org/nixos/download.html">https://nixos.org/nixos/download.html</link> + to find the newest supported stable release. + </para> + <para> + When you first install NixOS, you’re automatically subscribed to the + NixOS channel that corresponds to your installation source. For + instance, if you installed from a 21.05 ISO, you will be subscribed + to the <literal>nixos-21.05</literal> channel. To see which NixOS + channel you’re subscribed to, run the following as root: + </para> + <programlisting> +# nix-channel --list | grep nixos +nixos https://nixos.org/channels/nixos-unstable +</programlisting> + <para> + To switch to a different NixOS channel, do + </para> + <programlisting> +# nix-channel --add https://nixos.org/channels/channel-name nixos +</programlisting> + <para> + (Be sure to include the <literal>nixos</literal> parameter at the + end.) For instance, to use the NixOS 21.05 stable channel: + </para> + <programlisting> +# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos +</programlisting> + <para> + If you have a server, you may want to use the <quote>small</quote> + channel instead: + </para> + <programlisting> +# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos +</programlisting> + <para> + And if you want to live on the bleeding edge: + </para> + <programlisting> +# nix-channel --add https://nixos.org/channels/nixos-unstable nixos +</programlisting> + <para> + You can then upgrade NixOS to the latest version in your chosen + channel by running + </para> + <programlisting> +# nixos-rebuild switch --upgrade +</programlisting> + <para> + which is equivalent to the more verbose + <literal>nix-channel --update nixos; nixos-rebuild switch</literal>. + </para> + <note> + <para> + Channels are set per user. This means that running + <literal>nix-channel --add</literal> as a non root user (or + without sudo) will not affect configuration in + <literal>/etc/nixos/configuration.nix</literal> + </para> + </note> + <warning> + <para> + It is generally safe to switch back and forth between channels. + The only exception is that a newer NixOS may also have a newer Nix + version, which may involve an upgrade of Nix’s database schema. + This cannot be undone easily, so in that case you will not be able + to go back to your original channel. + </para> + </warning> + <section xml:id="sec-upgrading-automatic"> + <title>Automatic Upgrades</title> + <para> + You can keep a NixOS system up-to-date automatically by adding the + following to <literal>configuration.nix</literal>: + </para> + <programlisting language="bash"> +system.autoUpgrade.enable = true; +system.autoUpgrade.allowReboot = true; +</programlisting> + <para> + This enables a periodically executed systemd service named + <literal>nixos-upgrade.service</literal>. If the + <literal>allowReboot</literal> option is <literal>false</literal>, + it runs <literal>nixos-rebuild switch --upgrade</literal> to + upgrade NixOS to the latest version in the current channel. (To + see when the service runs, see + <literal>systemctl list-timers</literal>.) If + <literal>allowReboot</literal> is <literal>true</literal>, then + the system will automatically reboot if the new generation + contains a different kernel, initrd or kernel modules. You can + also specify a channel explicitly, e.g. + </para> + <programlisting language="bash"> +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; +</programlisting> + </section> +</chapter> diff --git a/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml index c74d850b2c62..edebd92b327a 100644 --- a/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml +++ b/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml @@ -1684,13 +1684,17 @@ CREATE ROLE postgres LOGIN SUPERUSER; </listitem> <listitem> <para> - The notmuch package move its emacs-related binaries and emacs + The notmuch package moves its emacs-related binaries and emacs lisp files to a separate output. They're not part of the default <literal>out</literal> output anymore - if you relied on the <literal>notmuch-emacs-mua</literal> binary or the emacs lisp files, access them via the - <literal>notmuch.emacs</literal> output. Device tree overlay - support was improved in + <literal>notmuch.emacs</literal> output. + </para> + </listitem> + <listitem> + <para> + Device tree overlay support was improved in <link xlink:href="https://github.com/NixOS/nixpkgs/pull/79370">#79370</link> and now uses <link xlink:href="options.html#opt-hardware.deviceTree.kernelPackage">hardware.deviceTree.kernelPackage</link> diff --git a/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 1b0371a0179a..b18e29191470 100644 --- a/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -37,6 +37,17 @@ PostgreSQL now defaults to major version 13. </para> </listitem> + <listitem> + <para> + Activation scripts can now opt int to be run when running + <literal>nixos-rebuild dry-activate</literal> and detect the + dry activation by reading <literal>$NIXOS_ACTION</literal>. + This allows activation scripts to output what they would + change if the activation was really run. The users/modules + activation script supports this and outputs some of is + actions. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-new-services"> @@ -221,6 +232,13 @@ <link linkend="opt-services.nats.enable">services.nats</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://git-scm.com">git</link>, a + distributed version control system. Available as + <link xlink:href="options.html#opt-programs.git.enable">programs.git</link>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-incompatibilities"> @@ -1121,6 +1139,24 @@ Superuser created successfully. rofi’s changelog</link>. </para> </listitem> + <listitem> + <para> + ipfs now defaults to not listening on you local network. This + setting was change as server providers won’t accept port + scanning on their private network. If you have several ipfs + instances running on a network you own, feel free to change + the setting <literal>ipfs.localDiscovery = true;</literal>. + localDiscovery enables different instances to discover each + other and share data. + </para> + </listitem> + <listitem> + <para> + <literal>lua</literal> and <literal>luajit</literal> + interpreters have been patched to avoid looking into /usr/lib + directories, thus increasing the purity of the build. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixpkgs/nixos/doc/manual/installation/changing-config.chapter.md b/nixpkgs/nixos/doc/manual/installation/changing-config.chapter.md new file mode 100644 index 000000000000..8a404f085d7c --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/changing-config.chapter.md @@ -0,0 +1,100 @@ +# Changing the Configuration {#sec-changing-config} + +The file `/etc/nixos/configuration.nix` contains the current +configuration of your machine. Whenever you've [changed +something](#ch-configuration) in that file, you should do + +```ShellSession +# nixos-rebuild switch +``` + +to build the new configuration, make it the default configuration for +booting, and try to realise the configuration in the running system +(e.g., by restarting system services). + +::: {.warning} +This command doesn\'t start/stop [user services](#opt-systemd.user.services) +automatically. `nixos-rebuild` only runs a `daemon-reload` for each user with running +user services. +::: + +::: {.warning} +These commands must be executed as root, so you should either run them +from a root shell or by prefixing them with `sudo -i`. +::: + +You can also do + +```ShellSession +# nixos-rebuild test +``` + +to build the configuration and switch the running system to it, but +without making it the boot default. So if (say) the configuration locks +up your machine, you can just reboot to get back to a working +configuration. + +There is also + +```ShellSession +# nixos-rebuild boot +``` + +to build the configuration and make it the boot default, but not switch +to it now (so it will only take effect after the next reboot). + +You can make your configuration show up in a different submenu of the +GRUB 2 boot screen by giving it a different *profile name*, e.g. + +```ShellSession +# nixos-rebuild switch -p test +``` + +which causes the new configuration (and previous ones created using +`-p test`) to show up in the GRUB submenu "NixOS - Profile \'test\'". +This can be useful to separate test configurations from "stable" +configurations. + +Finally, you can do + +```ShellSession +$ nixos-rebuild build +``` + +to build the configuration but nothing more. This is useful to see +whether everything compiles cleanly. + +If you have a machine that supports hardware virtualisation, you can +also test the new configuration in a sandbox by building and running a +QEMU *virtual machine* that contains the desired configuration. Just do + +```ShellSession +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm +``` + +The VM does not have any data from your host system, so your existing +user accounts and home directories will not be available unless you have +set `mutableUsers = false`. Another way is to temporarily add the +following to your configuration: + +```nix +users.users.your-user.initialHashedPassword = "test"; +``` + +*Important:* delete the \$hostname.qcow2 file if you have started the +virtual machine at least once without the right users, otherwise the +changes will not get picked up. You can forward ports on the host to the +guest. For instance, the following will forward host port 2222 to guest +port 22 (SSH): + +```ShellSession +$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm +``` + +allowing you to log in via SSH (assuming you have set the appropriate +passwords or SSH authorized keys): + +```ShellSession +$ ssh -p 2222 localhost +``` diff --git a/nixpkgs/nixos/doc/manual/installation/changing-config.xml b/nixpkgs/nixos/doc/manual/installation/changing-config.xml deleted file mode 100644 index 4288806d5eb2..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/changing-config.xml +++ /dev/null @@ -1,97 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - version="5.0" - xml:id="sec-changing-config"> - <title>Changing the Configuration</title> - <para> - The file <filename>/etc/nixos/configuration.nix</filename> contains the - current configuration of your machine. Whenever you’ve - <link linkend="ch-configuration">changed something</link> in that file, you - should do -<screen> -<prompt># </prompt>nixos-rebuild switch -</screen> - to build the new configuration, make it the default configuration for - booting, and try to realise the configuration in the running system (e.g., by - restarting system services). - <warning> - <para> - This command doesn't start/stop <link linkend="opt-systemd.user.services">user - services</link> automatically. <command>nixos-rebuild</command> only runs a - <literal>daemon-reload</literal> for each user with running user services. - </para> - </warning> - </para> - <warning> - <para> - These commands must be executed as root, so you should either run them from - a root shell or by prefixing them with <literal>sudo -i</literal>. - </para> - </warning> - <para> - You can also do -<screen> -<prompt># </prompt>nixos-rebuild test -</screen> - to build the configuration and switch the running system to it, but without - making it the boot default. So if (say) the configuration locks up your - machine, you can just reboot to get back to a working configuration. - </para> - <para> - There is also -<screen> -<prompt># </prompt>nixos-rebuild boot -</screen> - to build the configuration and make it the boot default, but not switch to it - now (so it will only take effect after the next reboot). - </para> - <para> - You can make your configuration show up in a different submenu of the GRUB 2 - boot screen by giving it a different <emphasis>profile name</emphasis>, e.g. -<screen> -<prompt># </prompt>nixos-rebuild switch -p test -</screen> - which causes the new configuration (and previous ones created using - <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile - 'test'”. This can be useful to separate test configurations from - “stable” configurations. - </para> - <para> - Finally, you can do -<screen> -<prompt>$ </prompt>nixos-rebuild build -</screen> - to build the configuration but nothing more. This is useful to see whether - everything compiles cleanly. - </para> - <para> - If you have a machine that supports hardware virtualisation, you can also - test the new configuration in a sandbox by building and running a QEMU - <emphasis>virtual machine</emphasis> that contains the desired configuration. - Just do -<screen> -<prompt>$ </prompt>nixos-rebuild build-vm -<prompt>$ </prompt>./result/bin/run-*-vm -</screen> - The VM does not have any data from your host system, so your existing user - accounts and home directories will not be available unless you have set - <literal>mutableUsers = false</literal>. Another way is to temporarily add - the following to your configuration: -<screen> -<link linkend="opt-users.users._name_.initialHashedPassword">users.users.your-user.initialHashedPassword</link> = "test"; -</screen> - <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have - started the virtual machine at least once without the right users, otherwise - the changes will not get picked up. You can forward ports on the host to the - guest. For instance, the following will forward host port 2222 to guest port - 22 (SSH): -<screen> -<prompt>$ </prompt>QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm -</screen> - allowing you to log in via SSH (assuming you have set the appropriate - passwords or SSH authorized keys): -<screen> -<prompt>$ </prompt>ssh -p 2222 localhost -</screen> - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/installation/installation.xml b/nixpkgs/nixos/doc/manual/installation/installation.xml index 2901f462dee0..1d443bbd0ee1 100644 --- a/nixpkgs/nixos/doc/manual/installation/installation.xml +++ b/nixpkgs/nixos/doc/manual/installation/installation.xml @@ -10,8 +10,8 @@ first-time use. </para> </partintro> - <xi:include href="obtaining.xml" /> - <xi:include href="installing.xml" /> - <xi:include href="changing-config.xml" /> - <xi:include href="upgrading.xml" /> + <xi:include href="../from_md/installation/obtaining.chapter.xml" /> + <xi:include href="../from_md/installation/installing.chapter.xml" /> + <xi:include href="../from_md/installation/changing-config.chapter.xml" /> + <xi:include href="../from_md/installation/upgrading.chapter.xml" /> </part> diff --git a/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.section.md b/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.section.md new file mode 100644 index 000000000000..aca151531d0f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.section.md @@ -0,0 +1,29 @@ +# Installing behind a proxy {#sec-installing-behind-proxy} + +To install NixOS behind a proxy, do the following before running +`nixos-install`. + +1. Update proxy configuration in `/mnt/etc/nixos/configuration.nix` to + keep the internet accessible after reboot. + + ```nix + networking.proxy.default = "http://user:password@proxy:port/"; + networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + ``` + +1. Setup the proxy environment variables in the shell where you are + running `nixos-install`. + + ```ShellSession + # proxy_url="http://user:password@proxy:port/" + # export http_proxy="$proxy_url" + # export HTTP_PROXY="$proxy_url" + # export https_proxy="$proxy_url" + # export HTTPS_PROXY="$proxy_url" + ``` + +::: {.note} +If you are switching networks with different proxy configurations, use +the `specialisation` option in `configuration.nix` to switch proxies at +runtime. Refer to [](#ch-options) for more information. +::: diff --git a/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml deleted file mode 100644 index 6788882aa8c0..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml +++ /dev/null @@ -1,48 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-installing-behind-proxy"> - <title>Installing behind a proxy</title> - - <para> - To install NixOS behind a proxy, do the following before running - <literal>nixos-install</literal>. - </para> - - <orderedlist numeration="arabic"> - <listitem> - <para> - Update proxy configuration in - <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet - accessible after reboot. - </para> -<programlisting> -networking.proxy.default = "http://user:password@proxy:port/"; -networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; -</programlisting> - </listitem> - <listitem> - <para> - Setup the proxy environment variables in the shell where you are running - <literal>nixos-install</literal>. - </para> -<screen> -<prompt># </prompt>proxy_url="http://user:password@proxy:port/" -<prompt># </prompt>export http_proxy="$proxy_url" -<prompt># </prompt>export HTTP_PROXY="$proxy_url" -<prompt># </prompt>export https_proxy="$proxy_url" -<prompt># </prompt>export HTTPS_PROXY="$proxy_url" -</screen> - </listitem> - </orderedlist> - - <note> - <para> - If you are switching networks with different proxy configurations, use the - <literal>specialisation</literal> option in - <literal>configuration.nix</literal> to switch proxies at runtime. Refer to - <xref linkend="ch-options" /> for more information. - </para> - </note> -</section> diff --git a/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.section.md new file mode 100644 index 000000000000..d9060eb89c37 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -0,0 +1,279 @@ +# Installing from another Linux distribution {#sec-installing-from-other-distro} + +Because Nix (the package manager) & Nixpkgs (the Nix packages +collection) can both be installed on any (most?) Linux distributions, +they can be used to install NixOS in various creative ways. You can, for +instance: + +1. Install NixOS on another partition, from your existing Linux + distribution (without the use of a USB or optical device!) + +1. Install NixOS on the same partition (in place!), from your existing + non-NixOS Linux distribution using `NIXOS_LUSTRATE`. + +1. Install NixOS on your hard drive from the Live CD of any Linux + distribution. + +The first steps to all these are the same: + +1. Install the Nix package manager: + + Short version: + + ```ShellSession + $ curl -L https://nixos.org/nix/install | sh + $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell + ``` + + More details in the [ Nix + manual](https://nixos.org/nix/manual/#chap-quick-start) + +1. Switch to the NixOS channel: + + If you\'ve just installed Nix on a non-NixOS distribution, you will + be on the `nixpkgs` channel by default. + + ```ShellSession + $ nix-channel --list + nixpkgs https://nixos.org/channels/nixpkgs-unstable + ``` + + As that channel gets released without running the NixOS tests, it + will be safer to use the `nixos-*` channels instead: + + ```ShellSession + $ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs + ``` + + You may want to throw in a `nix-channel --update` for good measure. + +1. Install the NixOS installation tools: + + You\'ll need `nixos-generate-config` and `nixos-install`, but this + also makes some man pages and `nixos-enter` available, just in case + you want to chroot into your NixOS partition. NixOS installs these + by default, but you don\'t have NixOS yet.. + + ```ShellSession + $ nix-env -f '<nixpkgs>' -iA nixos-install-tools + ``` + +1. ::: {.note} + The following 5 steps are only for installing NixOS to another + partition. For installing NixOS in place using `NIXOS_LUSTRATE`, + skip ahead. + ::: + + Prepare your target partition: + + At this point it is time to prepare your target partition. Please + refer to the partitioning, file-system creation, and mounting steps + of [](#sec-installation) + + If you\'re about to install NixOS in place using `NIXOS_LUSTRATE` + there is nothing to do for this step. + +1. Generate your NixOS configuration: + + ```ShellSession + $ sudo `which nixos-generate-config` --root /mnt + ``` + + You\'ll probably want to edit the configuration files. Refer to the + `nixos-generate-config` step in [](#sec-installation) for more + information. + + Consider setting up the NixOS bootloader to give you the ability to + boot on your existing Linux partition. For instance, if you\'re + using GRUB and your existing distribution is running Ubuntu, you may + want to add something like this to your `configuration.nix`: + + ```nix + boot.loader.grub.extraEntries = '' + menuentry "Ubuntu" { + search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e + configfile "($ubuntu)/boot/grub/grub.cfg" + } + ''; + ``` + + (You can find the appropriate UUID for your partition in + `/dev/disk/by-uuid`) + +1. Create the `nixbld` group and user on your original distribution: + + ```ShellSession + $ sudo groupadd -g 30000 nixbld + $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld + ``` + +1. Download/build/install NixOS: + + ::: {.warning} + Once you complete this step, you might no longer be able to boot on + existing systems without the help of a rescue USB drive or similar. + ::: + + ::: {.note} + On some distributions there are separate PATHS for programs intended + only for root. In order for the installation to succeed, you might + have to use `PATH="$PATH:/usr/sbin:/sbin"` in the following command. + ::: + + ```ShellSession + $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + ``` + + Again, please refer to the `nixos-install` step in + [](#sec-installation) for more information. + + That should be it for installation to another partition! + +1. Optionally, you may want to clean up your non-NixOS distribution: + + ```ShellSession + $ sudo userdel nixbld + $ sudo groupdel nixbld + ``` + + If you do not wish to keep the Nix package manager installed either, + run something like `sudo rm -rv ~/.nix-* /nix` and remove the line + that the Nix installer added to your `~/.profile`. + +1. ::: {.note} + The following steps are only for installing NixOS in place using + `NIXOS_LUSTRATE`: + ::: + + Generate your NixOS configuration: + + ```ShellSession + $ sudo `which nixos-generate-config` --root / + ``` + + Note that this will place the generated configuration files in + `/etc/nixos`. You\'ll probably want to edit the configuration files. + Refer to the `nixos-generate-config` step in + [](#sec-installation) for more information. + + You\'ll likely want to set a root password for your first boot using + the configuration files because you won\'t have a chance to enter a + password until after you reboot. You can initalize the root password + to an empty one with this line: (and of course don\'t forget to set + one once you\'ve rebooted or to lock the account with + `sudo passwd -l root` if you use `sudo`) + + ```nix + users.users.root.initialHashedPassword = ""; + ``` + +1. Build the NixOS closure and install it in the `system` profile: + + ```ShellSession + $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system + ``` + +1. Change ownership of the `/nix` tree to root (since your Nix install + was probably single user): + + ```ShellSession + $ sudo chown -R 0.0 /nix + ``` + +1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files: + + `/etc/NIXOS` officializes that this is now a NixOS partition (the + bootup scripts require its presence). + + `/etc/NIXOS_LUSTRATE` tells the NixOS bootup scripts to move + *everything* that\'s in the root partition to `/old-root`. This will + move your existing distribution out of the way in the very early + stages of the NixOS bootup. There are exceptions (we do need to keep + NixOS there after all), so the NixOS lustrate process will not + touch: + + - The `/nix` directory + + - The `/boot` directory + + - Any file or directory listed in `/etc/NIXOS_LUSTRATE` (one per + line) + + ::: {.note} + Support for `NIXOS_LUSTRATE` was added in NixOS 16.09. The act of + \"lustrating\" refers to the wiping of the existing distribution. + Creating `/etc/NIXOS_LUSTRATE` can also be used on NixOS to remove + all mutable files from your root partition (anything that\'s not in + `/nix` or `/boot` gets \"lustrated\" on the next boot. + + lustrate /ˈlʌstreɪt/ verb. + + purify by expiatory sacrifice, ceremonial washing, or some other + ritual action. + ::: + + Let\'s create the files: + + ```ShellSession + $ sudo touch /etc/NIXOS + $ sudo touch /etc/NIXOS_LUSTRATE + ``` + + Let\'s also make sure the NixOS configuration files are kept once we + reboot on NixOS: + + ```ShellSession + $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + ``` + +1. Finally, move the `/boot` directory of your current distribution out + of the way (the lustrate process will take care of the rest once you + reboot, but this one must be moved out now because NixOS needs to + install its own boot files: + + ::: {.warning} + Once you complete this step, your current distribution will no + longer be bootable! If you didn\'t get all the NixOS configuration + right, especially those settings pertaining to boot loading and root + partition, NixOS may not be bootable either. Have a USB rescue + device ready in case this happens. + ::: + + ```ShellSession + $ sudo mv -v /boot /boot.bak && + sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot + ``` + + Cross your fingers, reboot, hopefully you should get a NixOS prompt! + +1. If for some reason you want to revert to the old distribution, + you\'ll need to boot on a USB rescue disk and do something along + these lines: + + ```ShellSession + # mkdir root + # mount /dev/sdaX root + # mkdir root/nixos-root + # mv -v root/* root/nixos-root/ + # mv -v root/nixos-root/old-root/* root/ + # mv -v root/boot.bak root/boot # We had renamed this by hand earlier + # umount root + # reboot + ``` + + This may work as is or you might also need to reinstall the boot + loader. + + And of course, if you\'re happy with NixOS and no longer need the + old distribution: + + ```ShellSession + sudo rm -rf /old-root + ``` + +1. It\'s also worth noting that this whole process can be automated. + This is especially useful for Cloud VMs, where provider do not + provide NixOS. For instance, + [nixos-infect](https://github.com/elitak/nixos-infect) uses the + lustrate process to convert Digital Ocean droplets to NixOS from + other distributions automatically. diff --git a/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml deleted file mode 100644 index 63d1d52b01b2..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml +++ /dev/null @@ -1,364 +0,0 @@ -<!-- vim: set expandtab ts=2 softtabstop=2 shiftwidth=2 smarttab textwidth=80 wrapmargin=2 --> -<section - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-installing-from-other-distro"> - <title>Installing from another Linux distribution</title> - - <para> - Because Nix (the package manager) & Nixpkgs (the Nix packages collection) - can both be installed on any (most?) Linux distributions, they can be used to - install NixOS in various creative ways. You can, for instance: - </para> - - <orderedlist> - <listitem> - <para> - Install NixOS on another partition, from your existing Linux distribution - (without the use of a USB or optical device!) - </para> - </listitem> - <listitem> - <para> - Install NixOS on the same partition (in place!), from your existing - non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>. - </para> - </listitem> - <listitem> - <para> - Install NixOS on your hard drive from the Live CD of any Linux - distribution. - </para> - </listitem> - </orderedlist> - - <para> - The first steps to all these are the same: - </para> - - <orderedlist> - <listitem> - <para> - Install the Nix package manager: - </para> - <para> - Short version: - </para> -<screen> -<prompt>$ </prompt>curl -L https://nixos.org/nix/install | sh -<prompt>$ </prompt>. $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen> - <para> - More details in the - <link - xlink:href="https://nixos.org/nix/manual/#chap-quick-start"> - Nix manual</link> - </para> - </listitem> - <listitem> - <para> - Switch to the NixOS channel: - </para> - <para> - If you've just installed Nix on a non-NixOS distribution, you will be on - the <literal>nixpkgs</literal> channel by default. - </para> -<screen> -<prompt>$ </prompt>nix-channel --list -nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen> - <para> - As that channel gets released without running the NixOS tests, it will be - safer to use the <literal>nixos-*</literal> channels instead: - </para> -<screen> -<prompt>$ </prompt>nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</replaceable> nixpkgs</screen> - <para> - You may want to throw in a <literal>nix-channel --update</literal> for good - measure. - </para> - </listitem> - <listitem> - <para> - Install the NixOS installation tools: - </para> - <para> - You'll need <literal>nixos-generate-config</literal> and - <literal>nixos-install</literal>, but this also makes some man pages - and <literal>nixos-enter</literal> available, just in case you want to chroot into your - NixOS partition. NixOS installs these by default, but you don't have - NixOS yet.. - </para> - <screen><prompt>$ </prompt>nix-env -f '<nixpkgs>' -iA nixos-install-tools</screen> - </listitem> - <listitem> - <note> - <para> - The following 5 steps are only for installing NixOS to another partition. - For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>, - skip ahead. - </para> - </note> - <para> - Prepare your target partition: - </para> - <para> - At this point it is time to prepare your target partition. Please refer to - the partitioning, file-system creation, and mounting steps of - <xref linkend="sec-installation" /> - </para> - <para> - If you're about to install NixOS in place using - <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step. - </para> - </listitem> - <listitem> - <para> - Generate your NixOS configuration: - </para> -<screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /mnt</screen> - <para> - You'll probably want to edit the configuration files. Refer to the - <literal>nixos-generate-config</literal> step in - <xref - linkend="sec-installation" /> for more - information. - </para> - <para> - Consider setting up the NixOS bootloader to give you the ability to boot on - your existing Linux partition. For instance, if you're using GRUB and your - existing distribution is running Ubuntu, you may want to add something like - this to your <literal>configuration.nix</literal>: - </para> -<programlisting> -<xref linkend="opt-boot.loader.grub.extraEntries"/> = '' - menuentry "Ubuntu" { - search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e - configfile "($ubuntu)/boot/grub/grub.cfg" - } -'';</programlisting> - <para> - (You can find the appropriate UUID for your partition in - <literal>/dev/disk/by-uuid</literal>) - </para> - </listitem> - <listitem> - <para> - Create the <literal>nixbld</literal> group and user on your original - distribution: - </para> -<screen> -<prompt>$ </prompt>sudo groupadd -g 30000 nixbld -<prompt>$ </prompt>sudo useradd -u 30000 -g nixbld -G nixbld nixbld</screen> - </listitem> - <listitem> - <para> - Download/build/install NixOS: - </para> - <warning> - <para> - Once you complete this step, you might no longer be able to boot on - existing systems without the help of a rescue USB drive or similar. - </para> - </warning> - <note> - <para> - On some distributions there are separate PATHS for programs intended only for root. - In order for the installation to succeed, you might have to use <literal>PATH="$PATH:/usr/sbin:/sbin"</literal> - in the following command. - </para> - </note> -<screen><prompt>$ </prompt>sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen> - <para> - Again, please refer to the <literal>nixos-install</literal> step in - <xref linkend="sec-installation" /> for more information. - </para> - <para> - That should be it for installation to another partition! - </para> - </listitem> - <listitem> - <para> - Optionally, you may want to clean up your non-NixOS distribution: - </para> -<screen> -<prompt>$ </prompt>sudo userdel nixbld -<prompt>$ </prompt>sudo groupdel nixbld</screen> - <para> - If you do not wish to keep the Nix package manager installed either, run - something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the - line that the Nix installer added to your <literal>~/.profile</literal>. - </para> - </listitem> - <listitem> - <note> - <para> - The following steps are only for installing NixOS in place using - <literal>NIXOS_LUSTRATE</literal>: - </para> - </note> - <para> - Generate your NixOS configuration: - </para> -<screen><prompt>$ </prompt>sudo `which nixos-generate-config` --root /</screen> - <para> - Note that this will place the generated configuration files in - <literal>/etc/nixos</literal>. You'll probably want to edit the - configuration files. Refer to the <literal>nixos-generate-config</literal> - step in <xref - linkend="sec-installation" /> for more - information. - </para> - <para> - You'll likely want to set a root password for your first boot using the - configuration files because you won't have a chance to enter a password - until after you reboot. You can initalize the root password to an empty one - with this line: (and of course don't forget to set one once you've rebooted - or to lock the account with <literal>sudo passwd -l root</literal> if you - use <literal>sudo</literal>) - </para> -<programlisting> -<link linkend="opt-users.users._name_.initialHashedPassword">users.users.root.initialHashedPassword</link> = ""; -</programlisting> - </listitem> - <listitem> - <para> - Build the NixOS closure and install it in the <literal>system</literal> - profile: - </para> -<screen><prompt>$ </prompt>nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system</screen> - </listitem> - <listitem> - <para> - Change ownership of the <literal>/nix</literal> tree to root (since your - Nix install was probably single user): - </para> -<screen><prompt>$ </prompt>sudo chown -R 0.0 /nix</screen> - </listitem> - <listitem> - <para> - Set up the <literal>/etc/NIXOS</literal> and - <literal>/etc/NIXOS_LUSTRATE</literal> files: - </para> - <para> - <literal>/etc/NIXOS</literal> officializes that this is now a NixOS - partition (the bootup scripts require its presence). - </para> - <para> - <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to - move <emphasis>everything</emphasis> that's in the root partition to - <literal>/old-root</literal>. This will move your existing distribution out - of the way in the very early stages of the NixOS bootup. There are - exceptions (we do need to keep NixOS there after all), so the NixOS - lustrate process will not touch: - </para> - <itemizedlist> - <listitem> - <para> - The <literal>/nix</literal> directory - </para> - </listitem> - <listitem> - <para> - The <literal>/boot</literal> directory - </para> - </listitem> - <listitem> - <para> - Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal> - (one per line) - </para> - </listitem> - </itemizedlist> - <note> - <para> - Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09. - The act of "lustrating" refers to the wiping of the existing distribution. - Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS - to remove all mutable files from your root partition (anything that's not - in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on - the next boot. - </para> - <para> - lustrate /ˈlʌstreɪt/ verb. - </para> - <para> - purify by expiatory sacrifice, ceremonial washing, or some other ritual - action. - </para> - </note> - <para> - Let's create the files: - </para> -<screen> -<prompt>$ </prompt>sudo touch /etc/NIXOS -<prompt>$ </prompt>sudo touch /etc/NIXOS_LUSTRATE -</screen> - <para> - Let's also make sure the NixOS configuration files are kept once we reboot - on NixOS: - </para> -<screen> -<prompt>$ </prompt>echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE -</screen> - </listitem> - <listitem> - <para> - Finally, move the <literal>/boot</literal> directory of your current - distribution out of the way (the lustrate process will take care of the - rest once you reboot, but this one must be moved out now because NixOS - needs to install its own boot files: - </para> - <warning> - <para> - Once you complete this step, your current distribution will no longer be - bootable! If you didn't get all the NixOS configuration right, especially - those settings pertaining to boot loading and root partition, NixOS may - not be bootable either. Have a USB rescue device ready in case this - happens. - </para> - </warning> -<screen> -<prompt>$ </prompt>sudo mv -v /boot /boot.bak && -sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot -</screen> - <para> - Cross your fingers, reboot, hopefully you should get a NixOS prompt! - </para> - </listitem> - <listitem> - <para> - If for some reason you want to revert to the old distribution, you'll need - to boot on a USB rescue disk and do something along these lines: - </para> -<screen> -<prompt># </prompt>mkdir root -<prompt># </prompt>mount /dev/sdaX root -<prompt># </prompt>mkdir root/nixos-root -<prompt># </prompt>mv -v root/* root/nixos-root/ -<prompt># </prompt>mv -v root/nixos-root/old-root/* root/ -<prompt># </prompt>mv -v root/boot.bak root/boot # We had renamed this by hand earlier -<prompt># </prompt>umount root -<prompt># </prompt>reboot</screen> - <para> - This may work as is or you might also need to reinstall the boot loader - </para> - <para> - And of course, if you're happy with NixOS and no longer need the old - distribution: - </para> -<screen>sudo rm -rf /old-root</screen> - </listitem> - <listitem> - <para> - It's also worth noting that this whole process can be automated. This is - especially useful for Cloud VMs, where provider do not provide NixOS. For - instance, - <link - xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> - uses the lustrate process to convert Digital Ocean droplets to NixOS from - other distributions automatically. - </para> - </listitem> - </orderedlist> -</section> diff --git a/nixpkgs/nixos/doc/manual/installation/installing-pxe.section.md b/nixpkgs/nixos/doc/manual/installation/installing-pxe.section.md new file mode 100644 index 000000000000..2016a258251f --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/installing-pxe.section.md @@ -0,0 +1,32 @@ +# Booting from the "netboot" media (PXE) {#sec-booting-from-pxe} + +Advanced users may wish to install NixOS using an existing PXE or iPXE +setup. + +These instructions assume that you have an existing PXE or iPXE +infrastructure and simply want to add the NixOS installer as another +option. To build the necessary files from a recent version of nixpkgs, +you can run: + +```ShellSession +nix-build -A netboot.x86_64-linux nixos/release.nix +``` + +This will create a `result` directory containing: \* `bzImage` -- the +Linux kernel \* `initrd` -- the initrd file \* `netboot.ipxe` -- an +example ipxe script demonstrating the appropriate kernel command line +arguments for this image + +If you're using plain PXE, configure your boot loader to use the +`bzImage` and `initrd` files and have it provide the same kernel command +line arguments found in `netboot.ipxe`. + +If you're using iPXE, depending on how your HTTP/FTP/etc. server is +configured you may be able to use `netboot.ipxe` unmodified, or you may +need to update the paths to the files to match your server's directory +layout. + +In the future we may begin making these files available as build +products from hydra at which point we will update this documentation +with instructions on how to obtain them either for placing on a +dedicated TFTP server or to boot them directly over the internet. diff --git a/nixpkgs/nixos/doc/manual/installation/installing-pxe.xml b/nixpkgs/nixos/doc/manual/installation/installing-pxe.xml deleted file mode 100644 index ea88fbdad7e2..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/installing-pxe.xml +++ /dev/null @@ -1,50 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-booting-from-pxe"> - <title>Booting from the <quote>netboot</quote> media (PXE)</title> - - <para> - Advanced users may wish to install NixOS using an existing PXE or iPXE setup. - </para> - - <para> - These instructions assume that you have an existing PXE or iPXE - infrastructure and simply want to add the NixOS installer as another option. - To build the necessary files from a recent version of nixpkgs, you can run: - </para> - -<programlisting> -nix-build -A netboot.x86_64-linux nixos/release.nix -</programlisting> - - <para> - This will create a <literal>result</literal> directory containing: * - <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal> - – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe - script demonstrating the appropriate kernel command line arguments for this - image - </para> - - <para> - If you’re using plain PXE, configure your boot loader to use the - <literal>bzImage</literal> and <literal>initrd</literal> files and have it - provide the same kernel command line arguments found in - <literal>netboot.ipxe</literal>. - </para> - - <para> - If you’re using iPXE, depending on how your HTTP/FTP/etc. server is - configured you may be able to use <literal>netboot.ipxe</literal> unmodified, - or you may need to update the paths to the files to match your server’s - directory layout - </para> - - <para> - In the future we may begin making these files available as build products - from hydra at which point we will update this documentation with instructions - on how to obtain them either for placing on a dedicated TFTP server or to - boot them directly over the internet. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/installation/installing-usb.section.md b/nixpkgs/nixos/doc/manual/installation/installing-usb.section.md new file mode 100644 index 000000000000..ae58c08e5237 --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/installing-usb.section.md @@ -0,0 +1,31 @@ +# Booting from a USB Drive {#sec-booting-from-usb} + +For systems without CD drive, the NixOS live CD can be booted from a USB +stick. You can use the `dd` utility to write the image: +`dd if=path-to-image of=/dev/sdX`. Be careful about specifying the correct +drive; you can use the `lsblk` command to get a list of block devices. + +::: {.note} +::: {.title} +On macOS +::: + +```ShellSession +$ diskutil list +[..] +/dev/diskN (external, physical): + #: TYPE NAME SIZE IDENTIFIER +[..] +$ diskutil unmountDisk diskN +Unmount of all volumes on diskN was successful +$ sudo dd if=nix.iso of=/dev/rdiskN +``` + +Using the \'raw\' `rdiskN` device instead of `diskN` completes in +minutes instead of hours. After `dd` completes, a GUI dialog \"The disk +you inserted was not readable by this computer\" will pop up, which can +be ignored. +::: + +The `dd` utility will write the image verbatim to the drive, making it +the recommended option for both UEFI and non-UEFI installations. diff --git a/nixpkgs/nixos/doc/manual/installation/installing-usb.xml b/nixpkgs/nixos/doc/manual/installation/installing-usb.xml deleted file mode 100644 index 83598635acca..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/installing-usb.xml +++ /dev/null @@ -1,40 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-booting-from-usb"> - <title>Booting from a USB Drive</title> - - <para> - For systems without CD drive, the NixOS live CD can be booted from a USB - stick. You can use the <command>dd</command> utility to write the image: - <command>dd if=<replaceable>path-to-image</replaceable> - of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying - the correct drive; you can use the <command>lsblk</command> command to get a - list of block devices. - <note> - <title>On macOS</title> - <para> -<screen> -<prompt>$ </prompt>diskutil list -[..] -/dev/diskN (external, physical): - #: TYPE NAME SIZE IDENTIFIER -[..] -<prompt>$ </prompt>diskutil unmountDisk diskN -Unmount of all volumes on diskN was successful -<prompt>$ </prompt>sudo dd if=nix.iso of=/dev/rdiskN -</screen> - Using the 'raw' <command>rdiskN</command> device instead of - <command>diskN</command> completes in minutes instead of hours. After - <command>dd</command> completes, a GUI dialog "The disk you inserted was - not readable by this computer" will pop up, which can be ignored. - </para> - </note> - </para> - - <para> - The <command>dd</command> utility will write the image verbatim to the drive, - making it the recommended option for both UEFI and non-UEFI installations. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.section.md new file mode 100644 index 000000000000..e9c2a621c1bb --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.section.md @@ -0,0 +1,59 @@ +# Installing in a VirtualBox guest {#sec-instaling-virtualbox-guest} + +Installing NixOS into a VirtualBox guest is convenient for users who +want to try NixOS without installing it on bare metal. If you want to +use a pre-made VirtualBox appliance, it is available at [the downloads +page](https://nixos.org/nixos/download.html). If you want to set up a +VirtualBox guest manually, follow these instructions: + +1. Add a New Machine in VirtualBox with OS Type \"Linux / Other Linux\" + +1. Base Memory Size: 768 MB or higher. + +1. New Hard Disk of 8 GB or higher. + +1. Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) + +1. Click on Settings / System / Processor and enable PAE/NX + +1. Click on Settings / System / Acceleration and enable \"VT-x/AMD-V\" + acceleration + +1. Click on Settings / Display / Screen and select VMSVGA as Graphics + Controller + +1. Save the settings, start the virtual machine, and continue + installation like normal + +There are a few modifications you should make in configuration.nix. +Enable booting: + +```nix +boot.loader.grub.device = "/dev/sda"; +``` + +Also remove the fsck that runs at startup. It will always fail to run, +stopping your boot until you press `*`. + +```nix +boot.initrd.checkJournalingFS = false; +``` + +Shared folders can be given a name and a path in the host system in the +VirtualBox settings (Machine / Settings / Shared Folders, then click on +the \"Add\" icon). Add the following to the +`/etc/nixos/configuration.nix` to auto-mount them. If you do not add +`"nofail"`, the system will not boot properly. + +```nix +{ config, pkgs, ...} : +{ + fileSystems."/virtualboxshare" = { + fsType = "vboxsf"; + device = "nameofthesharedfolder"; + options = [ "rw" "nofail" ]; + }; +} +``` + +The folder will be available directly under the root directory. diff --git a/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml deleted file mode 100644 index 019e5098a8e2..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ /dev/null @@ -1,103 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-instaling-virtualbox-guest"> - <title>Installing in a VirtualBox guest</title> - - <para> - Installing NixOS into a VirtualBox guest is convenient for users who want to - try NixOS without installing it on bare metal. If you want to use a pre-made - VirtualBox appliance, it is available at - <link - xlink:href="https://nixos.org/nixos/download.html">the downloads - page</link>. If you want to set up a VirtualBox guest manually, follow these - instructions: - </para> - - <orderedlist> - <listitem> - <para> - Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" - </para> - </listitem> - <listitem> - <para> - Base Memory Size: 768 MB or higher. - </para> - </listitem> - <listitem> - <para> - New Hard Disk of 8 GB or higher. - </para> - </listitem> - <listitem> - <para> - Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) - </para> - </listitem> - <listitem> - <para> - Click on Settings / System / Processor and enable PAE/NX - </para> - </listitem> - <listitem> - <para> - Click on Settings / System / Acceleration and enable "VT-x/AMD-V" - acceleration - </para> - </listitem> - <listitem> - <para> - Click on Settings / Display / Screen and select VMSVGA as Graphics Controller - </para> - </listitem> - <listitem> - <para> - Save the settings, start the virtual machine, and continue installation - like normal - </para> - </listitem> - </orderedlist> - - <para> - There are a few modifications you should make in configuration.nix. Enable - booting: - </para> - -<programlisting> -<xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda"; -</programlisting> - - <para> - Also remove the fsck that runs at startup. It will always fail to run, - stopping your boot until you press <literal>*</literal>. - </para> - -<programlisting> -<xref linkend="opt-boot.initrd.checkJournalingFS"/> = false; -</programlisting> - - <para> - Shared folders can be given a name and a path in the host system in the - VirtualBox settings (Machine / Settings / Shared Folders, then click on the - "Add" icon). Add the following to the - <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do - not add <literal>"nofail"</literal>, the system will not boot properly. - </para> - -<programlisting> -{ config, pkgs, ...} : -{ - fileSystems."/virtualboxshare" = { - fsType = "vboxsf"; - device = "nameofthesharedfolder"; - options = [ "rw" "nofail" ]; - }; -} -</programlisting> - - <para> - The folder will be available directly under the root directory. - </para> -</section> diff --git a/nixpkgs/nixos/doc/manual/installation/installing.chapter.md b/nixpkgs/nixos/doc/manual/installation/installing.chapter.md new file mode 100644 index 000000000000..a0823b51e9cb --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/installing.chapter.md @@ -0,0 +1,479 @@ +# Installing NixOS {#sec-installation} + +## Booting the system {#sec-installation-booting} + +NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI +installation is by and large the same as a BIOS installation. The +differences are mentioned in the steps that follow. + +The installation media can be burned to a CD, or now more commonly, +"burned" to a USB drive (see [](#sec-booting-from-usb)). + +The installation media contains a basic NixOS installation. When it's +finished booting, it should have detected most of your hardware. + +The NixOS manual is available by running `nixos-help`. + +You are logged-in automatically as `nixos`. The `nixos` user account has +an empty password so you can use `sudo` without a password. + +If you downloaded the graphical ISO image, you can run `systemctl +start display-manager` to start the desktop environment. If you want +to continue on the terminal, you can use `loadkeys` to switch to your +preferred keyboard layout. (We even provide neo2 via `loadkeys de +neo`!) + +If the text is too small to be legible, try `setfont ter-v32n` to +increase the font size. + +To install over a serial port connect with `115200n8` (e.g. +`picocom -b 115200 /dev/ttyUSB0`). When the bootloader lists boot +entries, select the serial console boot entry. + +### Networking in the installer {#sec-installation-booting-networking} + +The boot process should have brought up networking (check `ip +a`). Networking is necessary for the installer, since it will +download lots of stuff (such as source tarballs or Nixpkgs channel +binaries). It's best if you have a DHCP server on your network. +Otherwise configure networking manually using `ifconfig`. + +On the graphical installer, you can configure the network, wifi +included, through NetworkManager. Using the `nmtui` program, you can do +so even in a non-graphical session. If you prefer to configure the +network manually, disable NetworkManager with +`systemctl stop NetworkManager`. + +On the minimal installer, NetworkManager is not available, so +configuration must be perfomed manually. To configure the wifi, first +start wpa_supplicant with `sudo systemctl start wpa_supplicant`, then +run `wpa_cli`. For most home networks, you need to type in the following +commands: + +```plain +> add_network +0 +> set_network 0 ssid "myhomenetwork" +OK +> set_network 0 psk "mypassword" +OK +> set_network 0 key_mgmt WPA-PSK +OK +> enable_network 0 +OK +``` + +For enterprise networks, for example *eduroam*, instead do: + +```plain +> add_network +0 +> set_network 0 ssid "eduroam" +OK +> set_network 0 identity "myname@example.com" +OK +> set_network 0 password "mypassword" +OK +> set_network 0 key_mgmt WPA-EAP +OK +> enable_network 0 +OK +``` + +When successfully connected, you should see a line such as this one + +```plain +<3>CTRL-EVENT-CONNECTED - Connection to 32:85:ab:ef:24:5c completed [id=0 id_str=] +``` + +you can now leave `wpa_cli` by typing `quit`. + +If you would like to continue the installation from a different machine +you can use activated SSH daemon. You need to copy your ssh key to +either `/home/nixos/.ssh/authorized_keys` or +`/root/.ssh/authorized_keys` (Tip: For installers with a modifiable +filesystem such as the sd-card installer image a key can be manually +placed by mounting the image on a different machine). Alternatively you +must set a password for either `root` or `nixos` with `passwd` to be +able to login. + +## Partitioning and formatting {#sec-installation-partitioning} + +The NixOS installer doesn't do any partitioning or formatting, so you +need to do that yourself. + +The NixOS installer ships with multiple partitioning tools. The examples +below use `parted`, but also provides `fdisk`, `gdisk`, `cfdisk`, and +`cgdisk`. + +The recommended partition scheme differs depending if the computer uses +*Legacy Boot* or *UEFI*. + +### UEFI (GPT) {#sec-installation-partitioning-UEFI} + +Here\'s an example partition scheme for UEFI, using `/dev/sda` as the +device. + +::: {.note} +You can safely ignore `parted`\'s informational message about needing to +update /etc/fstab. +::: + +1. Create a *GPT* partition table. + + ```ShellSession + # parted /dev/sda -- mklabel gpt + ``` + +2. Add the *root* partition. This will fill the disk except for the end + part, where the swap will live, and the space left in front (512MiB) + which will be used by the boot partition. + + ```ShellSession + # parted /dev/sda -- mkpart primary 512MiB -8GiB + ``` + +3. Next, add a *swap* partition. The size required will vary according + to needs, here a 8GiB one is created. + + ```ShellSession + # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% + ``` + + ::: {.note} + The swap partition size rules are no different than for other Linux + distributions. + ::: + +4. Finally, the *boot* partition. NixOS by default uses the ESP (EFI + system partition) as its */boot* partition. It uses the initially + reserved 512MiB at the start of the disk. + + ```ShellSession + # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB + # parted /dev/sda -- set 3 esp on + ``` + +Once complete, you can follow with +[](#sec-installation-partitioning-formatting). + +### Legacy Boot (MBR) {#sec-installation-partitioning-MBR} + +Here\'s an example partition scheme for Legacy Boot, using `/dev/sda` as +the device. + +::: {.note} +You can safely ignore `parted`\'s informational message about needing to +update /etc/fstab. +::: + +1. Create a *MBR* partition table. + + ```ShellSession + # parted /dev/sda -- mklabel msdos + ``` + +2. Add the *root* partition. This will fill the the disk except for the + end part, where the swap will live. + + ```ShellSession + # parted /dev/sda -- mkpart primary 1MiB -8GiB + ``` + +3. Finally, add a *swap* partition. The size required will vary + according to needs, here a 8GiB one is created. + + ```ShellSession + # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% + ``` + + ::: {.note} + The swap partition size rules are no different than for other Linux + distributions. + ::: + +Once complete, you can follow with +[](#sec-installation-partitioning-formatting). + +### Formatting {#sec-installation-partitioning-formatting} + +Use the following commands: + +- For initialising Ext4 partitions: `mkfs.ext4`. It is recommended + that you assign a unique symbolic label to the file system using the + option `-L label`, since this makes the file system configuration + independent from device changes. For example: + + ```ShellSession + # mkfs.ext4 -L nixos /dev/sda1 + ``` + +- For creating swap partitions: `mkswap`. Again it's recommended to + assign a label to the swap partition: `-L label`. For example: + + ```ShellSession + # mkswap -L swap /dev/sda2 + ``` + +- **UEFI systems** + + For creating boot partitions: `mkfs.fat`. Again it's recommended + to assign a label to the boot partition: `-n label`. For + example: + + ```ShellSession + # mkfs.fat -F 32 -n boot /dev/sda3 + ``` + +- For creating LVM volumes, the LVM commands, e.g., `pvcreate`, + `vgcreate`, and `lvcreate`. + +- For creating software RAID devices, use `mdadm`. + +## Installing {#sec-installation-installing} + +1. Mount the target file system on which NixOS should be installed on + `/mnt`, e.g. + + ```ShellSession + # mount /dev/disk/by-label/nixos /mnt + ``` + +2. **UEFI systems** + + Mount the boot file system on `/mnt/boot`, e.g. + + ```ShellSession + # mkdir -p /mnt/boot + # mount /dev/disk/by-label/boot /mnt/boot + ``` + +3. If your machine has a limited amount of memory, you may want to + activate swap devices now (`swapon device`). + The installer (or rather, the build actions that it + may spawn) may need quite a bit of RAM, depending on your + configuration. + + ```ShellSession + # swapon /dev/sda2 + ``` + +4. You now need to create a file `/mnt/etc/nixos/configuration.nix` + that specifies the intended configuration of the system. This is + because NixOS has a *declarative* configuration model: you create or + edit a description of the desired configuration of your system, and + then NixOS takes care of making it happen. The syntax of the NixOS + configuration file is described in [](#sec-configuration-syntax), + while a list of available configuration options appears in + [](#ch-options). A minimal example is shown in + [Example: NixOS Configuration](#ex-config). + + The command `nixos-generate-config` can generate an initial + configuration file for you: + + ```ShellSession + # nixos-generate-config --root /mnt + ``` + + You should then edit `/mnt/etc/nixos/configuration.nix` to suit your + needs: + + ```ShellSession + # nano /mnt/etc/nixos/configuration.nix + ``` + + If you're using the graphical ISO image, other editors may be + available (such as `vim`). If you have network access, you can also + install other editors -- for instance, you can install Emacs by + running `nix-env -f '<nixpkgs>' -iA emacs`. + + BIOS systems + + : You *must* set the option [](#opt-boot.loader.grub.device) to + specify on which disk the GRUB boot loader is to be installed. + Without it, NixOS cannot boot. + + UEFI systems + + : You *must* set the option [](#opt-boot.loader.systemd-boot.enable) + to `true`. `nixos-generate-config` should do this automatically + for new configurations when booted in UEFI mode. + + You may want to look at the options starting with + [`boot.loader.efi`](#opt-boot.loader.efi.canTouchEfiVariables) and + [`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable) + as well. + + If there are other operating systems running on the machine before + installing NixOS, the [](#opt-boot.loader.grub.useOSProber) + option can be set to `true` to automatically add them to the grub + menu. + + If you need to configure networking for your machine the + configuration options are described in [](#sec-networking). In + particular, while wifi is supported on the installation image, it is + not enabled by default in the configuration generated by + `nixos-generate-config`. + + Another critical option is `fileSystems`, specifying the file + systems that need to be mounted by NixOS. However, you typically + don't need to set it yourself, because `nixos-generate-config` sets + it automatically in `/mnt/etc/nixos/hardware-configuration.nix` from + your currently mounted file systems. (The configuration file + `hardware-configuration.nix` is included from `configuration.nix` + and will be overwritten by future invocations of + `nixos-generate-config`; thus, you generally should not modify it.) + Additionally, you may want to look at [Hardware configuration for + known-hardware](https://github.com/NixOS/nixos-hardware) at this + point or after installation. + + ::: {.note} + Depending on your hardware configuration or type of file system, you + may need to set the option `boot.initrd.kernelModules` to include + the kernel modules that are necessary for mounting the root file + system, otherwise the installed system will not be able to boot. (If + this happens, boot from the installation media again, mount the + target file system on `/mnt`, fix `/mnt/etc/nixos/configuration.nix` + and rerun `nixos-install`.) In most cases, `nixos-generate-config` + will figure out the required modules. + ::: + +5. Do the installation: + + ```ShellSession + # nixos-install + ``` + + This will install your system based on the configuration you + provided. If anything fails due to a configuration problem or any + other issue (such as a network outage while downloading binaries + from the NixOS binary cache), you can re-run `nixos-install` after + fixing your `configuration.nix`. + + As the last step, `nixos-install` will ask you to set the password + for the `root` user, e.g. + + ```plain + setting root password... + New password: *** + Retype new password: *** + ``` + + ::: {.note} + For unattended installations, it is possible to use + `nixos-install --no-root-passwd` in order to disable the password + prompt entirely. + ::: + +6. If everything went well: + + ```ShellSession + # reboot + ``` + +7. You should now be able to boot into the installed NixOS. The GRUB + boot menu shows a list of *available configurations* (initially just + one). Every time you change the NixOS configuration (see [Changing + Configuration](#sec-changing-config)), a new item is added to the + menu. This allows you to easily roll back to a previous + configuration if something goes wrong. + + You should log in and change the `root` password with `passwd`. + + You'll probably want to create some user accounts as well, which can + be done with `useradd`: + + ```ShellSession + $ useradd -c 'Eelco Dolstra' -m eelco + $ passwd eelco + ``` + + You may also want to install some software. This will be covered in + [](#sec-package-management). + +## Installation summary {#sec-installation-summary} + +To summarise, [Example: Commands for Installing NixOS on `/dev/sda`](#ex-install-sequence) +shows a typical sequence of commands for installing NixOS on an empty hard +drive (here `/dev/sda`). [Example: NixOS Configuration](#ex-config) shows a +corresponding configuration Nix expression. + +::: {#ex-partition-scheme-MBR .example} +::: {.title} +**Example: Example partition schemes for NixOS on `/dev/sda` (MBR)** +::: +```ShellSession +# parted /dev/sda -- mklabel msdos +# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +``` +::: + +::: {#ex-partition-scheme-UEFI .example} +::: {.title} +**Example: Example partition schemes for NixOS on `/dev/sda` (UEFI)** +::: +```ShellSession +# parted /dev/sda -- mklabel gpt +# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- set 3 esp on +``` +::: + +::: {#ex-install-sequence .example} +::: {.title} +**Example: Commands for Installing NixOS on `/dev/sda`** +::: +With a partitioned disk. + +```ShellSession +# mkfs.ext4 -L nixos /dev/sda1 +# mkswap -L swap /dev/sda2 +# swapon /dev/sda2 +# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) +# mount /dev/disk/by-label/nixos /mnt +# mkdir -p /mnt/boot # (for UEFI systems only) +# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) +# nixos-generate-config --root /mnt +# nano /mnt/etc/nixos/configuration.nix +# nixos-install +# reboot +``` +::: + +::: {#ex-config .example} +::: {.title} +**Example: NixOS Configuration** +::: +```ShellSession +{ config, pkgs, ... }: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) + boot.loader.systemd-boot.enable = true; # (for UEFI systems only) + + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; + + # Enable the OpenSSH server. + services.sshd.enable = true; +} +``` +::: + +## Additional installation notes {#sec-installation-additional-notes} + +```{=docbook} +<xi:include href="installing-usb.section.xml" /> +<xi:include href="installing-pxe.section.xml" /> +<xi:include href="installing-virtualbox-guest.section.xml" /> +<xi:include href="installing-from-other-distro.section.xml" /> +<xi:include href="installing-behind-a-proxy.section.xml" /> +``` diff --git a/nixpkgs/nixos/doc/manual/installation/installing.xml b/nixpkgs/nixos/doc/manual/installation/installing.xml deleted file mode 100644 index ff2425e725e8..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/installing.xml +++ /dev/null @@ -1,616 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-installation"> - <title>Installing NixOS</title> - <section xml:id="sec-installation-booting"> - <title>Booting the system</title> - - <para> - NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI - installation is by and large the same as a BIOS installation. The - differences are mentioned in the steps that follow. - </para> - - <para> - The installation media can be burned to a CD, or now more commonly, "burned" - to a USB drive (see <xref linkend="sec-booting-from-usb"/>). - </para> - - <para> - The installation media contains a basic NixOS installation. When it’s - finished booting, it should have detected most of your hardware. - </para> - - <para> - The NixOS manual is available by running <command>nixos-help</command>. - </para> - - <para> - You are logged-in automatically as <literal>nixos</literal>. - The <literal>nixos</literal> user account has an empty password so you - can use <command>sudo</command> without a password. - </para> - - <para> - If you downloaded the graphical ISO image, you can run <command>systemctl - start display-manager</command> to start the desktop environment. If you want to continue on the - terminal, you can use <command>loadkeys</command> to switch to your - preferred keyboard layout. (We even provide neo2 via <command>loadkeys de - neo</command>!) - </para> - - <para> - If the text is too small to be legible, try <command>setfont ter-v32n</command> - to increase the font size. - </para> - - <para> - To install over a serial port connect with <literal>115200n8</literal> - (e.g. <command>picocom -b 115200 /dev/ttyUSB0</command>). When the - bootloader lists boot entries, select the serial console boot entry. - </para> - - <section xml:id="sec-installation-booting-networking"> - <title>Networking in the installer</title> - - <para> - The boot process should have brought up networking (check <command>ip - a</command>). Networking is necessary for the installer, since it will - download lots of stuff (such as source tarballs or Nixpkgs channel - binaries). It’s best if you have a DHCP server on your network. Otherwise - configure networking manually using <command>ifconfig</command>. - </para> - - <para> - On the graphical installer, you can configure the network, wifi included, - through NetworkManager. Using the <command>nmtui</command> program, you - can do so even in a non-graphical session. If you prefer to configure the - network manually, disable NetworkManager with - <command>systemctl stop NetworkManager</command>. - </para> - - <para> - On the minimal installer, NetworkManager is not available, so configuration - must be perfomed manually. To configure the wifi, first start wpa_supplicant - with <command>sudo systemctl start wpa_supplicant</command>, then run - <command>wpa_cli</command>. For most home networks, you need to type - in the following commands: - <programlisting> -<prompt>> </prompt>add_network -0 -<prompt>> </prompt>set_network 0 ssid "myhomenetwork" -OK -<prompt>> </prompt>set_network 0 psk "mypassword" -OK -<prompt>> </prompt>set_network 0 key_mgmt WPA-PSK -OK -<prompt>> </prompt>enable_network 0 -OK - </programlisting> - For enterprise networks, for example <emphasis>eduroam</emphasis>, instead do: - <programlisting> -<prompt>> </prompt>add_network -0 -<prompt>> </prompt>set_network 0 ssid "eduroam" -OK -<prompt>> </prompt>set_network 0 identity "myname@example.com" -OK -<prompt>> </prompt>set_network 0 password "mypassword" -OK -<prompt>> </prompt>set_network 0 key_mgmt WPA-EAP -OK -<prompt>> </prompt>enable_network 0 -OK - </programlisting> - When successfully connected, you should see a line such as this one - <programlisting> -<3>CTRL-EVENT-CONNECTED - Connection to 32:85:ab:ef:24:5c completed [id=0 id_str=] - </programlisting> - you can now leave <command>wpa_cli</command> by typing <command>quit</command>. - </para> - - <para> - If you would like to continue the installation from a different machine you - can use activated SSH daemon. You need to copy your ssh key to either - <literal>/home/nixos/.ssh/authorized_keys</literal> or - <literal>/root/.ssh/authorized_keys</literal> (Tip: For installers with a - modifiable filesystem such as the sd-card installer image a key can be manually - placed by mounting the image on a different machine). Alternatively you must set - a password for either <literal>root</literal> or <literal>nixos</literal> with - <command>passwd</command> to be able to login. - </para> - </section> - </section> - <section xml:id="sec-installation-partitioning"> - <title>Partitioning and formatting</title> - - <para> - The NixOS installer doesn’t do any partitioning or formatting, so you need - to do that yourself. - </para> - - <para> - The NixOS installer ships with multiple partitioning tools. The examples - below use <command>parted</command>, but also provides - <command>fdisk</command>, <command>gdisk</command>, - <command>cfdisk</command>, and <command>cgdisk</command>. - </para> - - <para> - The recommended partition scheme differs depending if the computer uses - <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>. - </para> - - <section xml:id="sec-installation-partitioning-UEFI"> - <title>UEFI (GPT)</title> - - <para> - Here's an example partition scheme for UEFI, using - <filename>/dev/sda</filename> as the device. - <note> - <para> - You can safely ignore <command>parted</command>'s informational message - about needing to update /etc/fstab. - </para> - </note> - </para> - - <para> - <orderedlist> - <listitem> - <para> - Create a <emphasis>GPT</emphasis> partition table. -<screen language="commands"><prompt># </prompt>parted /dev/sda -- mklabel gpt</screen> - </para> - </listitem> - <listitem> - <para> - Add the <emphasis>root</emphasis> partition. This will fill the disk - except for the end part, where the swap will live, and the space left in - front (512MiB) which will be used by the boot partition. -<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 512MiB -8GiB</screen> - </para> - </listitem> - <listitem> - <para> - Next, add a <emphasis>swap</emphasis> partition. The size required will - vary according to needs, here a 8GiB one is created. -<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen> - <note> - <para> - The swap partition size rules are no different than for other Linux - distributions. - </para> - </note> - </para> - </listitem> - <listitem> - <para> - Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses - the ESP (EFI system partition) as its <emphasis>/boot</emphasis> - partition. It uses the initially reserved 512MiB at the start of the - disk. -<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -<prompt># </prompt>parted /dev/sda -- set 3 esp on</screen> - </para> - </listitem> - </orderedlist> - </para> - - <para> - Once complete, you can follow with - <xref linkend="sec-installation-partitioning-formatting"/>. - </para> - </section> - - <section xml:id="sec-installation-partitioning-MBR"> - <title>Legacy Boot (MBR)</title> - - <para> - Here's an example partition scheme for Legacy Boot, using - <filename>/dev/sda</filename> as the device. - <note> - <para> - You can safely ignore <command>parted</command>'s informational message - about needing to update /etc/fstab. - </para> - </note> - </para> - - <para> - <orderedlist> - <listitem> - <para> - Create a <emphasis>MBR</emphasis> partition table. -<screen language="commands"><prompt># </prompt>parted /dev/sda -- mklabel msdos</screen> - </para> - </listitem> - <listitem> - <para> - Add the <emphasis>root</emphasis> partition. This will fill the the disk - except for the end part, where the swap will live. -<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary 1MiB -8GiB</screen> - </para> - </listitem> - <listitem> - <para> - Finally, add a <emphasis>swap</emphasis> partition. The size required - will vary according to needs, here a 8GiB one is created. -<screen language="commands"><prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen> - <note> - <para> - The swap partition size rules are no different than for other Linux - distributions. - </para> - </note> - </para> - </listitem> - </orderedlist> - </para> - - <para> - Once complete, you can follow with - <xref linkend="sec-installation-partitioning-formatting"/>. - </para> - </section> - - <section xml:id="sec-installation-partitioning-formatting"> - <title>Formatting</title> - - <para> - Use the following commands: - <itemizedlist> - <listitem> - <para> - For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is - recommended that you assign a unique symbolic label to the file system - using the option <option>-L <replaceable>label</replaceable></option>, - since this makes the file system configuration independent from device - changes. For example: -<screen> -<prompt># </prompt>mkfs.ext4 -L nixos /dev/sda1</screen> - </para> - </listitem> - <listitem> - <para> - For creating swap partitions: <command>mkswap</command>. Again it’s - recommended to assign a label to the swap partition: <option>-L - <replaceable>label</replaceable></option>. For example: -<screen> -<prompt># </prompt>mkswap -L swap /dev/sda2</screen> - </para> - </listitem> - <listitem> - <variablelist> - <varlistentry> - <term> - UEFI systems - </term> - <listitem> - <para> - For creating boot partitions: <command>mkfs.fat</command>. Again - it’s recommended to assign a label to the boot partition: - <option>-n <replaceable>label</replaceable></option>. For example: -<screen> -<prompt># </prompt>mkfs.fat -F 32 -n boot /dev/sda3</screen> - </para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - <listitem> - <para> - For creating LVM volumes, the LVM commands, e.g., - <command>pvcreate</command>, <command>vgcreate</command>, and - <command>lvcreate</command>. - </para> - </listitem> - <listitem> - <para> - For creating software RAID devices, use <command>mdadm</command>. - </para> - </listitem> - </itemizedlist> - </para> - </section> - </section> - <section xml:id="sec-installation-installing"> - <title>Installing</title> - - <orderedlist> - <listitem> - <para> - Mount the target file system on which NixOS should be installed on - <filename>/mnt</filename>, e.g. -<screen> -<prompt># </prompt>mount /dev/disk/by-label/nixos /mnt -</screen> - </para> - </listitem> - <listitem> - <variablelist> - <varlistentry> - <term> - UEFI systems - </term> - <listitem> - <para> - Mount the boot file system on <filename>/mnt/boot</filename>, e.g. -<screen> -<prompt># </prompt>mkdir -p /mnt/boot -<prompt># </prompt>mount /dev/disk/by-label/boot /mnt/boot -</screen> - </para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - <listitem> - <para> - If your machine has a limited amount of memory, you may want to activate - swap devices now (<command>swapon - <replaceable>device</replaceable></command>). The installer (or rather, - the build actions that it may spawn) may need quite a bit of RAM, - depending on your configuration. -<screen> -<prompt># </prompt>swapon /dev/sda2</screen> - </para> - </listitem> - <listitem> - <para> - You now need to create a file - <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the - intended configuration of the system. This is because NixOS has a - <emphasis>declarative</emphasis> configuration model: you create or edit a - description of the desired configuration of your system, and then NixOS - takes care of making it happen. The syntax of the NixOS configuration file - is described in <xref linkend="sec-configuration-syntax"/>, while a list - of available configuration options appears in - <xref - linkend="ch-options"/>. A minimal example is shown in - <xref - linkend="ex-config"/>. - </para> - <para> - The command <command>nixos-generate-config</command> can generate an - initial configuration file for you: -<screen> -<prompt># </prompt>nixos-generate-config --root /mnt</screen> - You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename> - to suit your needs: -<screen> -<prompt># </prompt>nano /mnt/etc/nixos/configuration.nix -</screen> - If you’re using the graphical ISO image, other editors may be available - (such as <command>vim</command>). If you have network access, you can also - install other editors — for instance, you can install Emacs by running - <literal>nix-env -f '<nixpkgs>' -iA emacs</literal>. - </para> - <variablelist> - <varlistentry> - <term> - BIOS systems - </term> - <listitem> - <para> - You <emphasis>must</emphasis> set the option - <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot boot. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - UEFI systems - </term> - <listitem> - <para> - You <emphasis>must</emphasis> set the option - <xref linkend="opt-boot.loader.systemd-boot.enable"/> to - <literal>true</literal>. <command>nixos-generate-config</command> - should do this automatically for new configurations when booted in UEFI - mode. - </para> - <para> - You may want to look at the options starting with - <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option> - and - <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd-boot</link></option> - as well. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - If there are other operating systems running on the machine before - installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/> - option can be set to <literal>true</literal> to automatically add them to - the grub menu. - </para> - <para> - If you need to configure networking for your machine the configuration - options are described in <xref linkend="sec-networking"/>. In particular, - while wifi is supported on the installation image, it is not enabled by - default in the configuration generated by - <command>nixos-generate-config</command>. - </para> - <para> - Another critical option is <option>fileSystems</option>, specifying the - file systems that need to be mounted by NixOS. However, you typically - don’t need to set it yourself, because - <command>nixos-generate-config</command> sets it automatically in - <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your - currently mounted file systems. (The configuration file - <filename>hardware-configuration.nix</filename> is included from - <filename>configuration.nix</filename> and will be overwritten by future - invocations of <command>nixos-generate-config</command>; thus, you - generally should not modify it.) Additionally, you may want to look at - <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware - configuration for known-hardware</link> at this point or after - installation. - - </para> - <note> - <para> - Depending on your hardware configuration or type of file system, you may - need to set the option <option>boot.initrd.kernelModules</option> to - include the kernel modules that are necessary for mounting the root file - system, otherwise the installed system will not be able to boot. (If this - happens, boot from the installation media again, mount the target file - system on <filename>/mnt</filename>, fix - <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun - <filename>nixos-install</filename>.) In most cases, - <command>nixos-generate-config</command> will figure out the required - modules. - </para> - </note> - </listitem> - <listitem> - <para> - Do the installation: -<screen> -<prompt># </prompt>nixos-install</screen> - This will install your system based on the configuration you provided. - If anything fails due to a configuration problem or any other issue - (such as a network outage while downloading binaries from the NixOS - binary cache), you can re-run <command>nixos-install</command> after - fixing your <filename>configuration.nix</filename>. - </para> - <para> - As the last step, <command>nixos-install</command> will ask you to set the - password for the <literal>root</literal> user, e.g. -<screen> -setting root password... -New password: *** -Retype new password: ***</screen> - <note> - <para> - For unattended installations, it is possible to use - <command>nixos-install --no-root-passwd</command> in order to disable - the password prompt entirely. - </para> - </note> - </para> - </listitem> - <listitem> - <para> - If everything went well: -<screen> -<prompt># </prompt>reboot</screen> - </para> - </listitem> - <listitem> - <para> - You should now be able to boot into the installed NixOS. The GRUB boot - menu shows a list of <emphasis>available configurations</emphasis> - (initially just one). Every time you change the NixOS configuration (see - <link - linkend="sec-changing-config">Changing Configuration</link> - ), a new item is added to the menu. This allows you to easily roll back to - a previous configuration if something goes wrong. - </para> - <para> - You should log in and change the <literal>root</literal> password with - <command>passwd</command>. - </para> - <para> - You’ll probably want to create some user accounts as well, which can be - done with <command>useradd</command>: -<screen> -<prompt>$ </prompt>useradd -c 'Eelco Dolstra' -m eelco -<prompt>$ </prompt>passwd eelco</screen> - </para> - <para> - You may also want to install some software. This will be covered - in <xref linkend="sec-package-management" />. - </para> - </listitem> - </orderedlist> - </section> - <section xml:id="sec-installation-summary"> - <title>Installation summary</title> - - <para> - To summarise, <xref linkend="ex-install-sequence" /> shows a typical - sequence of commands for installing NixOS on an empty hard drive (here - <filename>/dev/sda</filename>). <xref linkend="ex-config" -/> shows a - corresponding configuration Nix expression. - </para> - - <example xml:id="ex-partition-scheme-MBR"> - <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR)</title> -<screen language="commands"> -<prompt># </prompt>parted /dev/sda -- mklabel msdos -<prompt># </prompt>parted /dev/sda -- mkpart primary 1MiB -8GiB -<prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen> - </example> - - <example xml:id="ex-partition-scheme-UEFI"> - <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI)</title> -<screen language="commands"> -<prompt># </prompt>parted /dev/sda -- mklabel gpt -<prompt># </prompt>parted /dev/sda -- mkpart primary 512MiB -8GiB -<prompt># </prompt>parted /dev/sda -- mkpart primary linux-swap -8GiB 100% -<prompt># </prompt>parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -<prompt># </prompt>parted /dev/sda -- set 3 esp on</screen> - </example> - - <example xml:id="ex-install-sequence"> - <title>Commands for Installing NixOS on <filename>/dev/sda</filename></title> - <para> - With a partitioned disk. -<screen language="commands"> -<prompt># </prompt>mkfs.ext4 -L nixos /dev/sda1 -<prompt># </prompt>mkswap -L swap /dev/sda2 -<prompt># </prompt>swapon /dev/sda2 -<prompt># </prompt>mkfs.fat -F 32 -n boot /dev/sda3 # <lineannotation>(for UEFI systems only)</lineannotation> -<prompt># </prompt>mount /dev/disk/by-label/nixos /mnt -<prompt># </prompt>mkdir -p /mnt/boot # <lineannotation>(for UEFI systems only)</lineannotation> -<prompt># </prompt>mount /dev/disk/by-label/boot /mnt/boot # <lineannotation>(for UEFI systems only)</lineannotation> -<prompt># </prompt>nixos-generate-config --root /mnt -<prompt># </prompt>nano /mnt/etc/nixos/configuration.nix -<prompt># </prompt>nixos-install -<prompt># </prompt>reboot</screen> - </para> - </example> - - <example xml:id='ex-config'> - <title>NixOS Configuration</title> -<programlisting> -{ config, pkgs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - <xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda"; # <lineannotation>(for BIOS systems only)</lineannotation> - <xref linkend="opt-boot.loader.systemd-boot.enable"/> = true; # <lineannotation>(for UEFI systems only)</lineannotation> - - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #<link linkend="opt-fileSystems._name_.device">fileSystems."/".device</link> = "/dev/disk/by-label/nixos"; - - # Enable the OpenSSH server. - services.sshd.enable = true; -} -</programlisting> - </example> - </section> - <section xml:id="sec-installation-additional-notes"> - <title>Additional installation notes</title> - - <xi:include href="installing-usb.xml" /> - - <xi:include href="installing-pxe.xml" /> - - <xi:include href="installing-virtualbox-guest.xml" /> - - <xi:include href="installing-from-other-distro.xml" /> - - <xi:include href="installing-behind-a-proxy.xml" /> - </section> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/installation/obtaining.chapter.md b/nixpkgs/nixos/doc/manual/installation/obtaining.chapter.md new file mode 100644 index 000000000000..832ec6146a9d --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/obtaining.chapter.md @@ -0,0 +1,26 @@ +# Obtaining NixOS {#sec-obtaining} + +NixOS ISO images can be downloaded from the [NixOS download +page](https://nixos.org/nixos/download.html). There are a number of +installation options. If you happen to have an optical drive and a spare +CD, burning the image to CD and booting from that is probably the +easiest option. Most people will need to prepare a USB stick to boot +from. [](#sec-booting-from-usb) describes the preferred method to +prepare a USB stick. A number of alternative methods are presented in +the [NixOS Wiki](https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media). + +As an alternative to installing NixOS yourself, you can get a running +NixOS system through several other means: + +- Using virtual appliances in Open Virtualization Format (OVF) that + can be imported into VirtualBox. These are available from the [NixOS + download page](https://nixos.org/nixos/download.html). + +- Using AMIs for Amazon's EC2. To find one for your region and + instance type, please refer to the [list of most recent + AMIs](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix). + +- Using NixOps, the NixOS-based cloud deployment tool, which allows + you to provision VirtualBox and EC2 NixOS instances from declarative + specifications. Check out the [NixOps + homepage](https://nixos.org/nixops) for details. diff --git a/nixpkgs/nixos/doc/manual/installation/obtaining.xml b/nixpkgs/nixos/doc/manual/installation/obtaining.xml deleted file mode 100644 index 3b8671782ded..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/obtaining.xml +++ /dev/null @@ -1,54 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-obtaining"> - <title>Obtaining NixOS</title> - <para> - NixOS ISO images can be downloaded from the - <link -xlink:href="https://nixos.org/nixos/download.html">NixOS download - page</link>. There are a number of installation options. If you happen to - have an optical drive and a spare CD, burning the image to CD and booting - from that is probably the easiest option. Most people will need to prepare a - USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the - preferred method to prepare a USB stick. A number of alternative methods are - presented in the - <link -xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS - Wiki</link>. - </para> - <para> - As an alternative to installing NixOS yourself, you can get a running NixOS - system through several other means: - <itemizedlist> - <listitem> - <para> - Using virtual appliances in Open Virtualization Format (OVF) that can be - imported into VirtualBox. These are available from the - <link xlink:href="https://nixos.org/nixos/download.html">NixOS download - page</link>. - </para> - </listitem> - <listitem> - <para> - Using AMIs for Amazon’s EC2. To find one for your region and instance - type, please refer to the - <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list - of most recent AMIs</link>. - </para> - </listitem> - <listitem> - <para> - Using NixOps, the NixOS-based cloud deployment tool, which allows you to - provision VirtualBox and EC2 NixOS instances from declarative - specifications. Check out the - <link - xlink:href="https://nixos.org/nixops">NixOps homepage</link> for - details. - </para> - </listitem> - </itemizedlist> - </para> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/installation/upgrading.chapter.md b/nixpkgs/nixos/doc/manual/installation/upgrading.chapter.md new file mode 100644 index 000000000000..b7903b9d3cbb --- /dev/null +++ b/nixpkgs/nixos/doc/manual/installation/upgrading.chapter.md @@ -0,0 +1,118 @@ +# Upgrading NixOS {#sec-upgrading} + +The best way to keep your NixOS installation up to date is to use one of +the NixOS *channels*. A channel is a Nix mechanism for distributing Nix +expressions and associated binaries. The NixOS channels are updated +automatically from NixOS's Git repository after certain tests have +passed and all packages have been built. These channels are: + +- *Stable channels*, such as [`nixos-21.05`](https://nixos.org/channels/nixos-21.05). + These only get conservative bug fixes and package upgrades. For + instance, a channel update may cause the Linux kernel on your system + to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not + from 4.19.x to 4.20.x (a major change that has the potential to break things). + Stable channels are generally maintained until the next stable + branch is created. + +- The *unstable channel*, [`nixos-unstable`](https://nixos.org/channels/nixos-unstable). + This corresponds to NixOS's main development branch, and may thus see + radical changes between channel updates. It's not recommended for + production systems. + +- *Small channels*, such as [`nixos-21.05-small`](https://nixos.org/channels/nixos-21.05-small) + or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small). + These are identical to the stable and unstable channels described above, + except that they contain fewer binary packages. This means they get updated + faster than the regular channels (for instance, when a critical security patch + is committed to NixOS's source tree), but may require more packages to be + built from source than usual. They're mostly intended for server environments + and as such contain few GUI applications. + +To see what channels are available, go to <https://nixos.org/channels>. +(Note that the URIs of the various channels redirect to a directory that +contains the channel's latest version and includes ISO images and +VirtualBox appliances.) Please note that during the release process, +channels that are not yet released will be present here as well. See the +Getting NixOS page <https://nixos.org/nixos/download.html> to find the +newest supported stable release. + +When you first install NixOS, you're automatically subscribed to the +NixOS channel that corresponds to your installation source. For +instance, if you installed from a 21.05 ISO, you will be subscribed to +the `nixos-21.05` channel. To see which NixOS channel you're subscribed +to, run the following as root: + +```ShellSession +# nix-channel --list | grep nixos +nixos https://nixos.org/channels/nixos-unstable +``` + +To switch to a different NixOS channel, do + +```ShellSession +# nix-channel --add https://nixos.org/channels/channel-name nixos +``` + +(Be sure to include the `nixos` parameter at the end.) For instance, to +use the NixOS 21.05 stable channel: + +```ShellSession +# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos +``` + +If you have a server, you may want to use the "small" channel instead: + +```ShellSession +# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos +``` + +And if you want to live on the bleeding edge: + +```ShellSession +# nix-channel --add https://nixos.org/channels/nixos-unstable nixos +``` + +You can then upgrade NixOS to the latest version in your chosen channel +by running + +```ShellSession +# nixos-rebuild switch --upgrade +``` + +which is equivalent to the more verbose `nix-channel --update nixos; nixos-rebuild switch`. + +::: {.note} +Channels are set per user. This means that running `nix-channel --add` +as a non root user (or without sudo) will not affect +configuration in `/etc/nixos/configuration.nix` +::: + +::: {.warning} +It is generally safe to switch back and forth between channels. The only +exception is that a newer NixOS may also have a newer Nix version, which +may involve an upgrade of Nix's database schema. This cannot be undone +easily, so in that case you will not be able to go back to your original +channel. +::: + +## Automatic Upgrades {#sec-upgrading-automatic} + +You can keep a NixOS system up-to-date automatically by adding the +following to `configuration.nix`: + +```nix +system.autoUpgrade.enable = true; +system.autoUpgrade.allowReboot = true; +``` + +This enables a periodically executed systemd service named +`nixos-upgrade.service`. If the `allowReboot` option is `false`, it runs +`nixos-rebuild switch --upgrade` to upgrade NixOS to the latest version +in the current channel. (To see when the service runs, see `systemctl list-timers`.) +If `allowReboot` is `true`, then the system will automatically reboot if +the new generation contains a different kernel, initrd or kernel +modules. You can also specify a channel explicitly, e.g. + +```nix +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; +``` diff --git a/nixpkgs/nixos/doc/manual/installation/upgrading.xml b/nixpkgs/nixos/doc/manual/installation/upgrading.xml deleted file mode 100644 index 960d4fa9a436..000000000000 --- a/nixpkgs/nixos/doc/manual/installation/upgrading.xml +++ /dev/null @@ -1,139 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - version="5.0" - xml:id="sec-upgrading"> - <title>Upgrading NixOS</title> - <para> - The best way to keep your NixOS installation up to date is to use one of the - NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for - distributing Nix expressions and associated binaries. The NixOS channels are - updated automatically from NixOS’s Git repository after certain tests have - passed and all packages have been built. These channels are: - <itemizedlist> - <listitem> - <para> - <emphasis>Stable channels</emphasis>, such as - <literal - xlink:href="https://nixos.org/channels/nixos-21.05">nixos-21.05</literal>. - These only get conservative bug fixes and package upgrades. For instance, - a channel update may cause the Linux kernel on your system to be upgraded - from 4.19.34 to 4.19.38 (a minor bug fix), but not from - 4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a - major change that has the potential to break things). Stable channels are - generally maintained until the next stable branch is created. - </para> - <para></para> - </listitem> - <listitem> - <para> - The <emphasis>unstable channel</emphasis>, - <literal - xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>. - This corresponds to NixOS’s main development branch, and may thus see - radical changes between channel updates. It’s not recommended for - production systems. - </para> - </listitem> - <listitem> - <para> - <emphasis>Small channels</emphasis>, such as - <literal - xlink:href="https://nixos.org/channels/nixos-21.05-small">nixos-21.05-small</literal> - or - <literal - xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. - These are identical to the stable and unstable channels described above, - except that they contain fewer binary packages. This means they get - updated faster than the regular channels (for instance, when a critical - security patch is committed to NixOS’s source tree), but may require - more packages to be built from source than usual. They’re mostly - intended for server environments and as such contain few GUI applications. - </para> - </listitem> - </itemizedlist> - To see what channels are available, go to - <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the - various channels redirect to a directory that contains the channel’s latest - version and includes ISO images and VirtualBox appliances.) Please note that - during the release process, channels that are not yet released will be - present here as well. See the Getting NixOS page - <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest - supported stable release. - </para> - <para> - When you first install NixOS, you’re automatically subscribed to the NixOS - channel that corresponds to your installation source. For instance, if you - installed from a 21.05 ISO, you will be subscribed to the - <literal>nixos-21.05</literal> channel. To see which NixOS channel you’re - subscribed to, run the following as root: -<screen> -<prompt># </prompt>nix-channel --list | grep nixos -nixos https://nixos.org/channels/nixos-unstable -</screen> - To switch to a different NixOS channel, do -<screen> -<prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos -</screen> - (Be sure to include the <literal>nixos</literal> parameter at the end.) For - instance, to use the NixOS 21.05 stable channel: -<screen> -<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-21.05 nixos -</screen> - If you have a server, you may want to use the “small” channel instead: -<screen> -<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos -</screen> - And if you want to live on the bleeding edge: -<screen> -<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-unstable nixos -</screen> - </para> - <para> - You can then upgrade NixOS to the latest version in your chosen channel by - running -<screen> -<prompt># </prompt>nixos-rebuild switch --upgrade -</screen> - which is equivalent to the more verbose <literal>nix-channel --update nixos; - nixos-rebuild switch</literal>. - </para> - <note> - <para> - Channels are set per user. This means that running <literal> nix-channel - --add</literal> as a non root user (or without sudo) will not affect - configuration in <literal>/etc/nixos/configuration.nix</literal> - </para> - </note> - <warning> - <para> - It is generally safe to switch back and forth between channels. The only - exception is that a newer NixOS may also have a newer Nix version, which may - involve an upgrade of Nix’s database schema. This cannot be undone easily, - so in that case you will not be able to go back to your original channel. - </para> - </warning> - <section xml:id="sec-upgrading-automatic"> - <title>Automatic Upgrades</title> - - <para> - You can keep a NixOS system up-to-date automatically by adding the following - to <filename>configuration.nix</filename>: -<programlisting> -<xref linkend="opt-system.autoUpgrade.enable"/> = true; -<xref linkend="opt-system.autoUpgrade.allowReboot"/> = true; -</programlisting> - This enables a periodically executed systemd service named - <literal>nixos-upgrade.service</literal>. If the <literal>allowReboot</literal> - option is <literal>false</literal>, it runs <command>nixos-rebuild switch - --upgrade</command> to upgrade NixOS to the latest version in the current - channel. (To see when the service runs, see <command>systemctl list-timers</command>.) - If <literal>allowReboot</literal> is <literal>true</literal>, then the - system will automatically reboot if the new generation contains a different - kernel, initrd or kernel modules. - You can also specify a channel explicitly, e.g. -<programlisting> -<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-21.05; -</programlisting> - </para> - </section> -</chapter> diff --git a/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml b/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml index 8c34ea7458e6..0e0ea5d74b0b 100644 --- a/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml @@ -553,6 +553,22 @@ <varlistentry> <term> + <option>--use-substitutes</option> + </term> + <listitem> + <para> + When set, nixos-rebuild will add <option>--use-substitutes</option> + to each invocation of nix-copy-closure. This will only affect the + behavior of nixos-rebuild if <option>--target-host</option> or + <option>--build-host</option> is also set. This is useful when + the target-host connection to cache.nixos.org is faster than the + connection between hosts. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term> <option>--use-remote-sudo</option> </term> <listitem> diff --git a/nixpkgs/nixos/doc/manual/md-to-db.sh b/nixpkgs/nixos/doc/manual/md-to-db.sh index 7949b42e8d81..6dd4b8c6e419 100755 --- a/nixpkgs/nixos/doc/manual/md-to-db.sh +++ b/nixpkgs/nixos/doc/manual/md-to-db.sh @@ -12,8 +12,14 @@ pushd $DIR # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute pandoc_flags=( - # media extraction and diagram-generator.lua not needed - "--lua-filter=$DIR/../../../doc/labelless-link-is-xref.lua" + # Not needed: + # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) + # - media extraction (was only required for diagram generator) + # - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST) + "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua" + "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/link-unix-man-references.lua" + "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua" + "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua" -f "commonmark${pandoc_commonmark_enabled_extensions}+smart" -t docbook ) @@ -24,15 +30,19 @@ mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') for mf in ${MD_FILES[*]}; do if [ "${mf: -11}" == ".section.md" ]; then mkdir -p $(dirname "$OUT/$mf") + OUTFILE="$OUT/${mf%".section.md"}.section.xml" pandoc "$mf" "${pandoc_flags[@]}" \ - -o "$OUT/${mf%".section.md"}.section.xml" + -o "$OUTFILE" + grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" fi if [ "${mf: -11}" == ".chapter.md" ]; then mkdir -p $(dirname "$OUT/$mf") + OUTFILE="$OUT/${mf%".chapter.md"}.chapter.xml" pandoc "$mf" "${pandoc_flags[@]}" \ --top-level-division=chapter \ - -o "$OUT/${mf%".chapter.md"}.chapter.xml" + -o "$OUTFILE" + grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" fi done diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md b/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md index 48059ab07f5e..79be2a56a54e 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md @@ -578,7 +578,9 @@ When upgrading from a previous release, please be aware of the following incompa - `services.journald.rateLimitBurst` was updated from `1000` to `10000` to follow the new upstream systemd default. -- The notmuch package move its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output. Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option. +- The notmuch package moves its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output. + +- Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option. - The default output of `buildGoPackage` is now `$out` instead of `$bin`. diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index 3df77d21d827..3dc15449c772 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -14,6 +14,10 @@ In addition to numerous new and upgraded packages, this release has the followin - PostgreSQL now defaults to major version 13. +- Activation scripts can now opt int to be run when running `nixos-rebuild dry-activate` and detect the dry activation by reading `$NIXOS_ACTION`. + This allows activation scripts to output what they would change if the activation was really run. + The users/modules activation script supports this and outputs some of is actions. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). @@ -67,6 +71,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - [nats](https://nats.io/), a high performance cloud and edge messaging system. Available as [services.nats](#opt-services.nats.enable). +- [git](https://git-scm.com), a distributed version control system. Available as [programs.git](options.html#opt-programs.git.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} @@ -320,3 +326,8 @@ To be able to access the web UI this port needs to be opened in the firewall. - GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually. - `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1). + +- ipfs now defaults to not listening on you local network. This setting was change as server providers won't accept port scanning on their private network. If you have several ipfs instances running on a network you own, feel free to change the setting `ipfs.localDiscovery = true;`. localDiscovery enables different instances to discover each other and share data. + +- `lua` and `luajit` interpreters have been patched to avoid looking into /usr/lib + directories, thus increasing the purity of the build. diff --git a/nixpkgs/nixos/modules/config/update-users-groups.pl b/nixpkgs/nixos/modules/config/update-users-groups.pl index 14914b13702e..5797b1ce511d 100644 --- a/nixpkgs/nixos/modules/config/update-users-groups.pl +++ b/nixpkgs/nixos/modules/config/update-users-groups.pl @@ -1,12 +1,11 @@ use strict; +use warnings; use File::Basename; use File::Path qw(make_path); use File::Slurp; +use Getopt::Long; use JSON; -make_path("/var/lib/nixos", { mode => 0755 }); - - # Keep track of deleted uids and gids. my $uidMapFile = "/var/lib/nixos/uid-map"; my $uidMap = -e $uidMapFile ? decode_json(read_file($uidMapFile)) : {}; @@ -14,12 +13,19 @@ my $uidMap = -e $uidMapFile ? decode_json(read_file($uidMapFile)) : {}; my $gidMapFile = "/var/lib/nixos/gid-map"; my $gidMap = -e $gidMapFile ? decode_json(read_file($gidMapFile)) : {}; +my $is_dry = ($ENV{'NIXOS_ACTION'} // "") eq "dry-activate"; +GetOptions("dry-activate" => \$is_dry); +make_path("/var/lib/nixos", { mode => 0755 }) unless $is_dry; sub updateFile { my ($path, $contents, $perms) = @_; + return if $is_dry; write_file($path, { atomic => 1, binmode => ':utf8', perms => $perms // 0644 }, $contents) or die; } +sub nscdInvalidate { + system("nscd", "--invalidate", $_[0]) unless $is_dry; +} sub hashPassword { my ($password) = @_; @@ -29,6 +35,14 @@ sub hashPassword { return crypt($password, '$6$' . $salt . '$'); } +sub dry_print { + if ($is_dry) { + print STDERR ("$_[1] $_[2]\n") + } else { + print STDERR ("$_[0] $_[2]\n") + } +} + # Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in # /etc/login.defs. @@ -52,7 +66,7 @@ sub allocGid { my ($name) = @_; my $prevGid = $gidMap->{$name}; if (defined $prevGid && !defined $gidsUsed{$prevGid}) { - print STDERR "reviving group '$name' with GID $prevGid\n"; + dry_print("reviving", "would revive", "group '$name' with GID $prevGid"); $gidsUsed{$prevGid} = 1; return $prevGid; } @@ -64,15 +78,14 @@ sub allocUid { my ($min, $max, $up) = $isSystemUser ? (400, 999, 0) : (1000, 29999, 1); my $prevUid = $uidMap->{$name}; if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) { - print STDERR "reviving user '$name' with UID $prevUid\n"; + dry_print("reviving", "would revive", "user '$name' with UID $prevUid"); $uidsUsed{$prevUid} = 1; return $prevUid; } return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); } - -# Read the declared users/groups. +# Read the declared users/groups my $spec = decode_json(read_file($ARGV[0])); # Don't allocate UIDs/GIDs that are manually assigned. @@ -135,7 +148,7 @@ foreach my $g (@{$spec->{groups}}) { if (defined $existing) { $g->{gid} = $existing->{gid} if !defined $g->{gid}; if ($g->{gid} != $existing->{gid}) { - warn "warning: not applying GID change of group ‘$name’ ($existing->{gid} -> $g->{gid})\n"; + dry_print("warning: not applying", "warning: would not apply", "GID change of group ‘$name’ ($existing->{gid} -> $g->{gid})"); $g->{gid} = $existing->{gid}; } $g->{password} = $existing->{password}; # do we want this? @@ -164,7 +177,7 @@ foreach my $name (keys %groupsCur) { my $g = $groupsCur{$name}; next if defined $groupsOut{$name}; if (!$spec->{mutableUsers} || defined $declGroups{$name}) { - print STDERR "removing group ‘$name’\n"; + dry_print("removing group", "would remove group", "‘$name’"); } else { $groupsOut{$name} = $g; } @@ -176,7 +189,7 @@ my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members} (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut)); updateFile($gidMapFile, to_json($gidMap)); updateFile("/etc/group", \@lines); -system("nscd --invalidate group"); +nscdInvalidate("group"); # Generate a new /etc/passwd containing the declared users. my %usersOut; @@ -197,7 +210,7 @@ foreach my $u (@{$spec->{users}}) { if (defined $existing) { $u->{uid} = $existing->{uid} if !defined $u->{uid}; if ($u->{uid} != $existing->{uid}) { - warn "warning: not applying UID change of user ‘$name’ ($existing->{uid} -> $u->{uid})\n"; + dry_print("warning: not applying", "warning: would not apply", "UID change of user ‘$name’ ($existing->{uid} -> $u->{uid})"); $u->{uid} = $existing->{uid}; } } else { @@ -212,8 +225,10 @@ foreach my $u (@{$spec->{users}}) { # Ensure home directory incl. ownership and permissions. if ($u->{createHome}) { - make_path(dirname($u->{home}), { mode => 0755 }); - mkdir $u->{home}, 0700 if ! -e $u->{home}; + if (!$is_dry) { + make_path(dirname($u->{home}), { mode => 0755 }); + mkdir $u->{home}, 0700 if ! -e $u->{home}; + } chown $u->{uid}, $u->{gid}, $u->{home}; chmod 0700, $u->{home}; } @@ -252,7 +267,7 @@ foreach my $name (keys %usersCur) { my $u = $usersCur{$name}; next if defined $usersOut{$name}; if (!$spec->{mutableUsers} || defined $declUsers{$name}) { - print STDERR "removing user ‘$name’\n"; + dry_print("removing user", "would remove user", "‘$name’"); } else { $usersOut{$name} = $u; } @@ -263,7 +278,7 @@ foreach my $name (keys %usersCur) { (sort { $a->{uid} <=> $b->{uid} } (values %usersOut)); updateFile($uidMapFile, to_json($uidMap)); updateFile("/etc/passwd", \@lines); -system("nscd --invalidate passwd"); +nscdInvalidate("passwd"); # Rewrite /etc/shadow to add new accounts or remove dead ones. @@ -295,7 +310,7 @@ updateFile("/etc/shadow", \@shadowNew, 0640); my $uid = getpwnam "root"; my $gid = getgrnam "shadow"; my $path = "/etc/shadow"; - chown($uid, $gid, $path) || die "Failed to change ownership of $path: $!"; + (chown($uid, $gid, $path) || die "Failed to change ownership of $path: $!") unless $is_dry; } # Rewrite /etc/subuid & /etc/subgid to include default container mappings diff --git a/nixpkgs/nixos/modules/config/users-groups.nix b/nixpkgs/nixos/modules/config/users-groups.nix index f86be3be2c65..d88162558e66 100644 --- a/nixpkgs/nixos/modules/config/users-groups.nix +++ b/nixpkgs/nixos/modules/config/users-groups.nix @@ -561,14 +561,16 @@ in { shadow.gid = ids.gids.shadow; }; - system.activationScripts.users = stringAfter [ "stdio" ] - '' + system.activationScripts.users = { + supportsDryActivation = true; + text = '' install -m 0700 -d /root install -m 0755 -d /home ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \ -w ${./update-users-groups.pl} ${spec} ''; + }; # for backwards compatibility system.activationScripts.groups = stringAfter [ "users" ] ""; diff --git a/nixpkgs/nixos/modules/misc/documentation.nix b/nixpkgs/nixos/modules/misc/documentation.nix index f00d58369a72..51b310745604 100644 --- a/nixpkgs/nixos/modules/misc/documentation.nix +++ b/nixpkgs/nixos/modules/misc/documentation.nix @@ -129,6 +129,24 @@ in ''; }; + man.manualPages = mkOption { + type = types.path; + default = pkgs.buildEnv { + name = "man-paths"; + paths = config.environment.systemPackages; + pathsToLink = [ "/share/man" ]; + extraOutputsToInstall = ["man"]; + ignoreCollisions = true; + }; + defaultText = "all man pages in config.environment.systemPackages"; + description = '' + The manual pages to generate caches for if <option>generateCaches</option> + is enabled. Must be a path to a directory with man pages under + <literal>/share/man</literal>; see the source for an example. + Advanced users can make this a content-addressed derivation to save a few rebuilds. + ''; + }; + info.enable = mkOption { type = types.bool; default = true; @@ -216,16 +234,8 @@ in environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; environment.etc."man_db.conf".text = let - manualPages = pkgs.buildEnv { - name = "man-paths"; - paths = config.environment.systemPackages; - pathsToLink = [ "/share/man" ]; - extraOutputsToInstall = ["man"]; - ignoreCollisions = true; - }; - manualCache = pkgs.runCommandLocal "man-cache" { } - '' - echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf + manualCache = pkgs.runCommandLocal "man-cache" { } '' + echo "MANDB_MAP ${cfg.man.manualPages}/share/man $out" > man.conf ${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1 ''; in diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index b8a7c35626e7..d145df05da32 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -145,6 +145,7 @@ ./programs/fuse.nix ./programs/gamemode.nix ./programs/geary.nix + ./programs/git.nix ./programs/gnome-disks.nix ./programs/gnome-documents.nix ./programs/gnome-terminal.nix @@ -382,6 +383,8 @@ ./services/display-managers/greetd.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix + ./services/games/crossfire-server.nix + ./services/games/deliantra-server.nix ./services/games/factorio.nix ./services/games/freeciv.nix ./services/games/minecraft-server.nix @@ -875,7 +878,6 @@ ./services/networking/wasabibackend.nix ./services/networking/websockify.nix ./services/networking/wg-quick.nix - ./services/networking/wicd.nix ./services/networking/wireguard.nix ./services/networking/wpa_supplicant.nix ./services/networking/xandikos.nix diff --git a/nixpkgs/nixos/modules/programs/bash/bash-completion.nix b/nixpkgs/nixos/modules/programs/bash/bash-completion.nix index f07b1b636ef9..b8e5b1bfa336 100644 --- a/nixpkgs/nixos/modules/programs/bash/bash-completion.nix +++ b/nixpkgs/nixos/modules/programs/bash/bash-completion.nix @@ -26,7 +26,7 @@ in shopt -s nullglob for p in $NIX_PROFILES; do for m in "$p/etc/bash_completion.d/"*; do - . $m + . "$m" done done eval "$nullglobStatus" diff --git a/nixpkgs/nixos/modules/programs/bash/bash.nix b/nixpkgs/nixos/modules/programs/bash/bash.nix index 908ab34b08d0..7281126979e5 100644 --- a/nixpkgs/nixos/modules/programs/bash/bash.nix +++ b/nixpkgs/nixos/modules/programs/bash/bash.nix @@ -78,10 +78,10 @@ in promptInit = mkOption { default = '' # Provide a nice prompt if the terminal supports it. - if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then + if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then PROMPT_COLOR="1;31m" - let $UID && PROMPT_COLOR="1;32m" - if [ -n "$INSIDE_EMACS" -o "$TERM" == "eterm" -o "$TERM" == "eterm-color" ]; then + ((UID)) && PROMPT_COLOR="1;32m" + if [ -n "$INSIDE_EMACS" ] || [ "$TERM" = "eterm" ] || [ "$TERM" = "eterm-color" ]; then # Emacs term mode doesn't support xterm title escape sequence (\e]0;) PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " else @@ -173,7 +173,7 @@ in # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically. # Only execute this file once per shell. - if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi + if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi __ETC_BASHRC_SOURCED=1 # If the profile was not loaded in a parent process, source diff --git a/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix b/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix index 79786584c666..4d2a89b51584 100644 --- a/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix @@ -49,10 +49,10 @@ in '' # This function is called whenever a command is not found. command_not_found_handle() { - local p=${commandNotFound}/bin/command-not-found - if [ -x $p -a -f ${cfg.dbPath} ]; then + local p='${commandNotFound}/bin/command-not-found' + if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then # Run the helper program. - $p "$@" + "$p" "$@" # Retry the command if we just installed it. if [ $? = 126 ]; then "$@" @@ -70,10 +70,10 @@ in '' # This function is called whenever a command is not found. command_not_found_handler() { - local p=${commandNotFound}/bin/command-not-found - if [ -x $p -a -f ${cfg.dbPath} ]; then + local p='${commandNotFound}/bin/command-not-found' + if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then # Run the helper program. - $p "$@" + "$p" "$@" # Retry the command if we just installed it. if [ $? = 126 ]; then diff --git a/nixpkgs/nixos/modules/programs/environment.nix b/nixpkgs/nixos/modules/programs/environment.nix index 8877356360a5..39010323f61e 100644 --- a/nixpkgs/nixos/modules/programs/environment.nix +++ b/nixpkgs/nixos/modules/programs/environment.nix @@ -18,7 +18,8 @@ in environment.variables = { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; - PAGER = mkDefault "less -R"; + PAGER = mkDefault "less"; + LESS = mkDefault "-R"; EDITOR = mkDefault "nano"; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc }; diff --git a/nixpkgs/nixos/modules/programs/git.nix b/nixpkgs/nixos/modules/programs/git.nix new file mode 100644 index 000000000000..4e06b576f896 --- /dev/null +++ b/nixpkgs/nixos/modules/programs/git.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.git; +in + +{ + options = { + programs.git = { + enable = mkEnableOption "git"; + + package = mkOption { + type = types.package; + default = pkgs.git; + defaultText = "pkgs.git"; + example = literalExample "pkgs.gitFull"; + description = "The git package to use"; + }; + + config = mkOption { + type = types.attrs; + default = { }; + example = { + init.defaultBranch = "main"; + url."https://github.com/".insteadOf = [ "gh:" "github:" ]; + }; + description = '' + Configuration to write to /etc/gitconfig. See the CONFIGURATION FILE + section of git-config(1) for more information. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + environment.etc.gitconfig = mkIf (cfg.config != {}) { + text = generators.toGitINI cfg.config; + }; + }; + + meta.maintainers = with maintainers; [ figsoda ]; +} diff --git a/nixpkgs/nixos/modules/rename.nix b/nixpkgs/nixos/modules/rename.nix index 233e3ee848be..4db6efb75d82 100644 --- a/nixpkgs/nixos/modules/rename.nix +++ b/nixpkgs/nixos/modules/rename.nix @@ -27,6 +27,7 @@ with lib; (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") + (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") diff --git a/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix b/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix index 8fdfda9a66d8..dabd80312d9d 100644 --- a/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix @@ -135,25 +135,14 @@ in description = "The list of directories containing external plugins"; }; - managementPlugin = mkOption { - description = "The options to run the management plugin"; - type = types.submodule { - options = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the management plugin - ''; - }; - port = mkOption { - default = 15672; - type = types.port; - description = '' - On which port to run the management plugin - ''; - }; - }; + managementPlugin = { + enable = mkEnableOption "the management plugin"; + port = mkOption { + default = 15672; + type = types.port; + description = '' + On which port to run the management plugin + ''; }; }; }; diff --git a/nixpkgs/nixos/modules/services/audio/spotifyd.nix b/nixpkgs/nixos/modules/services/audio/spotifyd.nix index 9279a03aed4e..22848ed98000 100644 --- a/nixpkgs/nixos/modules/services/audio/spotifyd.nix +++ b/nixpkgs/nixos/modules/services/audio/spotifyd.nix @@ -4,7 +4,15 @@ with lib; let cfg = config.services.spotifyd; - spotifydConf = pkgs.writeText "spotifyd.conf" cfg.config; + toml = pkgs.formats.toml {}; + warnConfig = + if cfg.config != "" + then lib.trace "Using the stringly typed .config attribute is discouraged. Use the TOML typed .settings attribute instead." + else id; + spotifydConf = + if cfg.settings != {} + then toml.generate "spotify.conf" cfg.settings + else warnConfig (pkgs.writeText "spotifyd.conf" cfg.config); in { options = { @@ -15,6 +23,16 @@ in default = ""; type = types.lines; description = '' + (Deprecated) Configuration for Spotifyd. For syntax and directives, see + <link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>. + ''; + }; + + settings = mkOption { + default = {}; + type = toml.type; + example = { global.bitrate = 320; }; + description = '' Configuration for Spotifyd. For syntax and directives, see <link xlink:href="https://github.com/Spotifyd/spotifyd#Configuration"/>. ''; @@ -23,6 +41,13 @@ in }; config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.config == "" || cfg.settings == {}; + message = "At most one of the .config attribute and the .settings attribute may be set"; + } + ]; + systemd.services.spotifyd = { wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" "sound.target" ]; diff --git a/nixpkgs/nixos/modules/services/backup/sanoid.nix b/nixpkgs/nixos/modules/services/backup/sanoid.nix index 41d0e2e1df68..e70063415ec0 100644 --- a/nixpkgs/nixos/modules/services/backup/sanoid.nix +++ b/nixpkgs/nixos/modules/services/backup/sanoid.nix @@ -57,8 +57,13 @@ let useTemplate = use_template; recursive = mkOption { - description = "Whether to recursively snapshot dataset children."; - type = types.bool; + description = '' + Whether to recursively snapshot dataset children. + You can also set this to <literal>"zfs"</literal> to handle datasets + recursively in an atomic way without the possibility to + override settings for child datasets. + ''; + type = with types; oneOf [ bool (enum [ "zfs" ]) ]; default = false; }; diff --git a/nixpkgs/nixos/modules/services/backup/znapzend.nix b/nixpkgs/nixos/modules/services/backup/znapzend.nix index debb2a397050..1fccc7cd6076 100644 --- a/nixpkgs/nixos/modules/services/backup/znapzend.nix +++ b/nixpkgs/nixos/modules/services/backup/znapzend.nix @@ -324,7 +324,7 @@ in autoCreation = mkOption { type = bool; default = false; - description = "Automatically create the destination dataset if it does not exists."; + description = "Automatically create the destination dataset if it does not exist."; }; zetup = mkOption { diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index 08f5cdfdf334..51b2b5f6eb0d 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -343,7 +343,7 @@ in }; # Allways include cni plugins - services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; + services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins pkgs.cni-plugin-flannel]; boot.kernelModules = ["br_netfilter" "overlay"]; diff --git a/nixpkgs/nixos/modules/services/games/crossfire-server.nix b/nixpkgs/nixos/modules/services/games/crossfire-server.nix new file mode 100644 index 000000000000..974aea0cd671 --- /dev/null +++ b/nixpkgs/nixos/modules/services/games/crossfire-server.nix @@ -0,0 +1,177 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.crossfire-server; + serverPort = 13327; +in { + options.services.crossfire-server = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, the Crossfire game server will be started at boot. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.crossfire-server; + defaultText = "pkgs.crossfire-server"; + description = '' + The package to use for the Crossfire server (and map/arch data, if you + don't change dataDir). + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "${cfg.package}/share/crossfire"; + defaultText = "\${config.services.crossfire.package}/share/crossfire"; + description = '' + Where to load readonly data from -- maps, archetypes, treasure tables, + and the like. If you plan to edit the data on the live server (rather + than overlaying the crossfire-maps and crossfire-arch packages and + nixos-rebuilding), point this somewhere read-write and copy the data + there before starting the server. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/crossfire"; + description = '' + Where to store runtime data (save files, persistent items, etc). + + If left at the default, this will be automatically created on server + startup if it does not already exist. If changed, it is the admin's + responsibility to make sure that the directory exists and is writeable + by the `crossfire` user. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall for the server. + ''; + }; + + configFiles = mkOption { + type = types.attrsOf types.str; + description = '' + Text to append to the corresponding configuration files. Note that the + files given in the example are *not* the complete set of files available + to customize; look in /etc/crossfire after enabling the server to see + the available files, and read the comments in each file for detailed + documentation on the format and what settings are available. + + Note that the motd, rules, and news files, if configured here, will + overwrite the example files that come with the server, rather than being + appended to them as the other configuration files are. + ''; + example = literalExample '' + dm_file = ''' + admin:secret_password:localhost + jane:xyzzy:* + '''; + ban_file = ''' + # Bob is a jerk + bob@* + # So is everyone on 192.168.86.255/24 + *@192.168.86. + '''; + metaserver2 = ''' + metaserver2_notification on + localhostname crossfire.example.net + '''; + motd = "Welcome to CrossFire!"; + news = "No news yet."; + rules = "Don't be a jerk."; + settings = ''' + # be nicer to newbies and harsher to experienced players + balanced_stat_loss true + # don't let players pick up and use admin-created items + real_wiz false + '''; + ''; + default = {}; + }; + }; + + config = mkIf cfg.enable { + users.users.crossfire = { + description = "Crossfire server daemon user"; + home = cfg.stateDir; + createHome = false; + isSystemUser = true; + group = "crossfire"; + }; + users.groups.crossfire = {}; + + # Merge the cfg.configFiles setting with the default files shipped with + # Crossfire. + # For most files this consists of reading ${crossfire}/etc/crossfire/${name} + # and appending the user setting to it; the motd, news, and rules are handled + # specially, with user-provided values completely replacing the original. + environment.etc = lib.attrsets.mapAttrs' + (name: value: lib.attrsets.nameValuePair "crossfire/${name}" { + mode = "0644"; + text = + (optionalString (!elem name ["motd" "news" "rules"]) + (fileContents "${cfg.package}/etc/crossfire/${name}")) + + "\n${value}"; + }) ({ + ban_file = ""; + dm_file = ""; + exp_table = ""; + forbid = ""; + metaserver2 = ""; + motd = (fileContents "${cfg.package}/etc/crossfire/motd"); + news = (fileContents "${cfg.package}/etc/crossfire/news"); + rules = (fileContents "${cfg.package}/etc/crossfire/rules"); + settings = ""; + stat_bonus = ""; + } // cfg.configFiles); + + systemd.services.crossfire-server = { + description = "Crossfire Server Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = mkMerge [ + { + ExecStart = "${cfg.package}/bin/crossfire-server -conf /etc/crossfire -local '${cfg.stateDir}' -data '${cfg.dataDir}'"; + Restart = "always"; + User = "crossfire"; + Group = "crossfire"; + WorkingDirectory = cfg.stateDir; + } + (mkIf (cfg.stateDir == "/var/lib/crossfire") { + StateDirectory = "crossfire"; + }) + ]; + + # The crossfire server needs access to a bunch of files at runtime that + # are not created automatically at server startup; they're meant to be + # installed in $PREFIX/var/crossfire by `make install`. And those files + # need to be writeable, so we can't just point at the ones in the nix + # store. Instead we take the approach of copying them out of the store + # on first run. If `bookarch` already exists, we assume the rest of the + # files do as well, and copy nothing -- otherwise we risk ovewriting + # server state information every time the server is upgraded. + preStart = '' + if [ ! -e "${cfg.stateDir}"/bookarch ]; then + ${pkgs.rsync}/bin/rsync -a --chmod=u=rwX,go=rX \ + "${cfg.package}/var/crossfire/" "${cfg.stateDir}/" + fi + ''; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ serverPort ]; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/games/deliantra-server.nix b/nixpkgs/nixos/modules/services/games/deliantra-server.nix new file mode 100644 index 000000000000..36bf60417626 --- /dev/null +++ b/nixpkgs/nixos/modules/services/games/deliantra-server.nix @@ -0,0 +1,170 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.deliantra-server; + serverPort = 13327; +in { + options.services.deliantra-server = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, the Deliantra game server will be started at boot. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.deliantra-server; + defaultText = "pkgs.deliantra-server"; + description = '' + The package to use for the Deliantra server (and map/arch data, if you + don't change dataDir). + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "${pkgs.deliantra-data}"; + defaultText = "\${pkgs.deliantra-data}"; + description = '' + Where to store readonly data (maps, archetypes, sprites, etc). + Note that if you plan to use the live map editor (rather than editing + the maps offline and then nixos-rebuilding), THIS MUST BE WRITEABLE -- + copy the deliantra-data someplace writeable (say, + /var/lib/deliantra/data) and update this option accordingly. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/deliantra"; + description = '' + Where to store runtime data (save files, persistent items, etc). + + If left at the default, this will be automatically created on server + startup if it does not already exist. If changed, it is the admin's + responsibility to make sure that the directory exists and is writeable + by the `crossfire` user. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall for the server. + ''; + }; + + configFiles = mkOption { + type = types.attrsOf types.str; + description = '' + Contents of the server configuration files. These will be appended to + the example configurations the server comes with and overwrite any + default settings defined therein. + + The example here is not comprehensive. See the files in + /etc/deliantra-server after enabling this module for full documentation. + ''; + example = literalExample '' + dm_file = ''' + admin:secret_password:localhost + jane:xyzzy:* + '''; + motd = "Welcome to Deliantra!"; + settings = ''' + # Settings for game mechanics. + stat_loss_on_death true + armor_max_enchant 7 + '''; + config = ''' + # Settings for the server daemon. + hiscore_url https://deliantra.example.net/scores/ + max_map_reset 86400 + '''; + ''; + default = { + motd = ""; + }; + }; + }; + + config = mkIf cfg.enable { + users.users.deliantra = { + description = "Deliantra server daemon user"; + home = cfg.stateDir; + createHome = false; + isSystemUser = true; + group = "deliantra"; + }; + users.groups.deliantra = {}; + + # Merge the cfg.configFiles setting with the default files shipped with + # Deliantra. + # For most files this consists of reading + # ${deliantra}/etc/deliantra-server/${name} and appending the user setting + # to it. + environment.etc = lib.attrsets.mapAttrs' + (name: value: lib.attrsets.nameValuePair "deliantra-server/${name}" { + mode = "0644"; + text = + # Deliantra doesn't come with a motd file, but respects it if present + # in /etc. + (optionalString (name != "motd") + (fileContents "${cfg.package}/etc/deliantra-server/${name}")) + + "\n${value}"; + }) ({ + motd = ""; + settings = ""; + config = ""; + dm_file = ""; + } // cfg.configFiles); + + systemd.services.deliantra-server = { + description = "Deliantra Server Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + environment = { + DELIANTRA_DATADIR="${cfg.dataDir}"; + DELIANTRA_LOCALDIR="${cfg.stateDir}"; + DELIANTRA_CONFDIR="/etc/deliantra-server"; + }; + + serviceConfig = mkMerge [ + { + ExecStart = "${cfg.package}/bin/deliantra-server"; + Restart = "always"; + User = "deliantra"; + Group = "deliantra"; + WorkingDirectory = cfg.stateDir; + } + (mkIf (cfg.stateDir == "/var/lib/deliantra") { + StateDirectory = "deliantra"; + }) + ]; + + # The deliantra server needs access to a bunch of files at runtime that + # are not created automatically at server startup; they're meant to be + # installed in $PREFIX/var/deliantra-server by `make install`. And those + # files need to be writeable, so we can't just point at the ones in the + # nix store. Instead we take the approach of copying them out of the store + # on first run. If `bookarch` already exists, we assume the rest of the + # files do as well, and copy nothing -- otherwise we risk ovewriting + # server state information every time the server is upgraded. + preStart = '' + if [ ! -e "${cfg.stateDir}"/bookarch ]; then + ${pkgs.rsync}/bin/rsync -a --chmod=u=rwX,go=rX \ + "${cfg.package}/var/deliantra-server/" "${cfg.stateDir}/" + fi + ''; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ serverPort ]; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/logging/promtail.nix b/nixpkgs/nixos/modules/services/logging/promtail.nix index 34211687dc1d..95c83796ece6 100644 --- a/nixpkgs/nixos/modules/services/logging/promtail.nix +++ b/nixpkgs/nixos/modules/services/logging/promtail.nix @@ -7,6 +7,9 @@ let ''; allowSystemdJournal = cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs; + + allowPositionsFile = !lib.hasPrefix "/var/cache/promtail" positionsFile; + positionsFile = cfg.configuration.positions.filename; in { options.services.promtail = with types; { enable = mkEnableOption "the Promtail ingresser"; @@ -53,6 +56,7 @@ in { RestrictSUIDSGID = true; PrivateMounts = true; CacheDirectory = "promtail"; + ReadWritePaths = lib.optional allowPositionsFile (builtins.dirOf positionsFile); User = "promtail"; Group = "promtail"; diff --git a/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix b/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix index 7ce3841be2f5..1764c6d79649 100644 --- a/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.nix.sshServe; command = if cfg.protocol == "ssh" - then "nix-store --serve" + then "nix-store --serve ${lib.optionalString cfg.write "--write"}" else "nix-daemon --stdio"; in { options = { @@ -17,6 +17,12 @@ in { description = "Whether to enable serving the Nix store as a remote store via SSH."; }; + write = mkOption { + type = types.bool; + default = false; + description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the nix.trustedUsers option in most use cases, such as allowing remote building of derivations."; + }; + keys = mkOption { type = types.listOf types.str; default = []; diff --git a/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/nixpkgs/nixos/modules/services/monitoring/grafana.nix index fb67bbfb8420..d46e38e82af1 100644 --- a/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -675,6 +675,33 @@ in { User = "grafana"; RuntimeDirectory = "grafana"; RuntimeDirectoryMode = "0755"; + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0027"; }; preStart = '' ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir} diff --git a/nixpkgs/nixos/modules/services/monitoring/nagios.nix b/nixpkgs/nixos/modules/services/monitoring/nagios.nix index 0afaefe04e18..280a9a001b5b 100644 --- a/nixpkgs/nixos/modules/services/monitoring/nagios.nix +++ b/nixpkgs/nixos/modules/services/monitoring/nagios.nix @@ -41,7 +41,7 @@ let validated = pkgs.runCommand "nagios-checked.cfg" {preferLocalBuild=true;} '' cp ${file} nagios.cfg # nagios checks the existence of /var/lib/nagios, but - # it does not exists in the build sandbox, so we fake it + # it does not exist in the build sandbox, so we fake it mkdir lib lib=$(readlink -f lib) sed -i s@=${nagiosState}@=$lib@ nagios.cfg diff --git a/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix index 57f5f6b006c8..faa515835b67 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix @@ -12,6 +12,11 @@ let (optionalString (cfg.defaultMode == "norouting") "--routing=none") ] ++ cfg.extraFlags); + profile = + if cfg.localDiscovery + then "local-discovery" + else "server"; + splitMulitaddr = addrRaw: lib.tail (lib.splitString "/" addrRaw); multiaddrToListenStream = addrRaw: @@ -173,7 +178,7 @@ in description = ''Whether to enable local discovery for the ipfs daemon. This will allow ipfs to scan ports on your local network. Some hosting services will ban you if you do this. ''; - default = true; + default = false; }; serviceFdlimit = mkOption { @@ -236,14 +241,13 @@ in environment.IPFS_PATH = cfg.dataDir; preStart = '' - if [[ ! -f ${cfg.dataDir}/config ]]; then - ipfs init ${optionalString cfg.emptyRepo "-e"} \ - ${optionalString (! cfg.localDiscovery) "--profile=server"} + if [[ ! -f "$IPFS_PATH/config" ]]; then + ipfs init ${optionalString cfg.emptyRepo "-e"} --profile=${profile} else - ${if cfg.localDiscovery - then "ipfs --offline config profile apply local-discovery" - else "ipfs --offline config profile apply server" - } + # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. + rm -vf "$IPFS_PATH/api" + + ipfs --offline config profile apply ${profile} fi '' + optionalString cfg.autoMount '' ipfs --offline config Mounts.FuseAllowOther --json true diff --git a/nixpkgs/nixos/modules/services/networking/firefox/sync-server.nix b/nixpkgs/nixos/modules/services/networking/firefox/sync-server.nix index 24f768649530..1ad573abfca3 100644 --- a/nixpkgs/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixpkgs/nixos/modules/services/networking/firefox/sync-server.nix @@ -119,7 +119,7 @@ in password, and the <option>syncserver.secret</option> setting is used by the server to generate cryptographically-signed authentication tokens. - If this file does not exists, then it is created with a generated + If this file does not exist, then it is created with a generated <option>syncserver.secret</option> settings. ''; }; diff --git a/nixpkgs/nixos/modules/services/networking/gnunet.nix b/nixpkgs/nixos/modules/services/networking/gnunet.nix index 69d4ed047756..cf3d1841a979 100644 --- a/nixpkgs/nixos/modules/services/networking/gnunet.nix +++ b/nixpkgs/nixos/modules/services/networking/gnunet.nix @@ -6,12 +6,15 @@ let cfg = config.services.gnunet; - homeDir = "/var/lib/gnunet"; + stateDir = "/var/lib/gnunet"; - configFile = with cfg; pkgs.writeText "gnunetd.conf" + configFile = with cfg; '' [PATHS] - SERVICEHOME = ${homeDir} + GNUNET_HOME = ${stateDir} + GNUNET_RUNTIME_DIR = /run/gnunet + GNUNET_USER_RUNTIME_DIR = /run/gnunet + GNUNET_DATA_HOME = ${stateDir}/data [ats] WAN_QUOTA_IN = ${toString load.maxNetDownBandwidth} b @@ -137,8 +140,6 @@ in users.users.gnunet = { group = "gnunet"; description = "GNUnet User"; - home = homeDir; - createHome = true; uid = config.ids.uids.gnunet; }; @@ -148,17 +149,20 @@ in # so install them globally. environment.systemPackages = [ cfg.package ]; + environment.etc."gnunet.conf".text = configFile; + systemd.services.gnunet = { description = "GNUnet"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; path = [ cfg.package pkgs.miniupnpc ]; - environment.TMPDIR = "/tmp"; - serviceConfig.PrivateTmp = true; - serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; - serviceConfig.WorkingDirectory = homeDir; + serviceConfig.WorkingDirectory = stateDir; + serviceConfig.RuntimeDirectory = "gnunet"; + serviceConfig.StateDirectory = "gnunet"; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/wicd.nix b/nixpkgs/nixos/modules/services/networking/wicd.nix deleted file mode 100644 index aa10a50f876a..000000000000 --- a/nixpkgs/nixos/modules/services/networking/wicd.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - - ###### interface - - options = { - - networking.wicd.enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to start <command>wicd</command>. Wired and - wireless network configurations can then be managed by - wicd-client. - ''; - }; - }; - - - ###### implementation - - config = mkIf config.networking.wicd.enable { - - environment.systemPackages = [pkgs.wicd]; - - systemd.services.wicd = { - after = [ "network-pre.target" ]; - before = [ "network.target" ]; - wants = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - script = "${pkgs.wicd}/sbin/wicd -f"; - }; - - services.dbus.enable = true; - services.dbus.packages = [pkgs.wicd]; - }; -} diff --git a/nixpkgs/nixos/modules/services/search/elasticsearch.nix b/nixpkgs/nixos/modules/services/search/elasticsearch.nix index 440f34b3dc5c..1d7a28d5d245 100644 --- a/nixpkgs/nixos/modules/services/search/elasticsearch.nix +++ b/nixpkgs/nixos/modules/services/search/elasticsearch.nix @@ -8,9 +8,13 @@ let esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} + ${lib.optionalString cfg.single_node '' + discovery.type: single-node + gateway.auto_import_dangling_indices: true + ''} http.port: ${toString cfg.port} - transport.tcp.port: ${toString cfg.tcp_port} + transport.port: ${toString cfg.tcp_port} ${cfg.extraConf} ''; @@ -77,6 +81,12 @@ in type = types.str; }; + single_node = mkOption { + description = "Start a single-node cluster"; + default = true; + type = types.bool; + }; + extraConf = mkOption { description = "Extra configuration for elasticsearch."; default = ""; diff --git a/nixpkgs/nixos/modules/services/security/privacyidea.nix b/nixpkgs/nixos/modules/services/security/privacyidea.nix index 63271848e943..5f894d0fa691 100644 --- a/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ b/nixpkgs/nixos/modules/services/security/privacyidea.nix @@ -228,7 +228,7 @@ in path = with pkgs; [ openssl ]; environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; preStart = let - pi-manage = "${pkgs.sudo}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage"; + pi-manage = "${config.security.sudo.package}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage"; pgsu = config.services.postgresql.superUser; psql = config.services.postgresql.package; in '' @@ -239,8 +239,8 @@ in -i "${piCfgFile}" chown ${cfg.user}:${cfg.group} ${cfg.stateDir}/privacyidea.cfg if ! test -e "${cfg.stateDir}/db-created"; then - ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} - ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea + ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} + ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea ${pi-manage} create_enckey ${pi-manage} create_audit_keys ${pi-manage} createdb diff --git a/nixpkgs/nixos/modules/services/video/mirakurun.nix b/nixpkgs/nixos/modules/services/video/mirakurun.nix index 6ea73fa5c679..1a99d1c97692 100644 --- a/nixpkgs/nixos/modules/services/video/mirakurun.nix +++ b/nixpkgs/nixos/modules/services/video/mirakurun.nix @@ -173,7 +173,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${mirakurun}/bin/mirakurun"; + ExecStart = "${mirakurun}/bin/mirakurun-start"; User = username; Group = groupname; RuntimeDirectory="mirakurun"; diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/sx.nix b/nixpkgs/nixos/modules/services/x11/display-managers/sx.nix index 132531c0ddc0..73d27390a580 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/sx.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/sx.nix @@ -34,4 +34,6 @@ in { }; systemd.services.display-manager.enable = false; }; + + meta.maintainers = with maintainers; [ figsoda ]; } diff --git a/nixpkgs/nixos/modules/services/x11/extra-layouts.nix b/nixpkgs/nixos/modules/services/x11/extra-layouts.nix index f48216ff446f..0e2edc6a5309 100644 --- a/nixpkgs/nixos/modules/services/x11/extra-layouts.nix +++ b/nixpkgs/nixos/modules/services/x11/extra-layouts.nix @@ -166,7 +166,8 @@ in services.xserver = { xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb"; - exportConfiguration = config.services.xserver.displayManager.startx.enable; + exportConfiguration = config.services.xserver.displayManager.startx.enable + || config.services.xserver.displayManager.sx.enable; }; }; diff --git a/nixpkgs/nixos/modules/system/activation/activation-script.nix b/nixpkgs/nixos/modules/system/activation/activation-script.nix index 3a6930314b1a..548b4de852b7 100644 --- a/nixpkgs/nixos/modules/system/activation/activation-script.nix +++ b/nixpkgs/nixos/modules/system/activation/activation-script.nix @@ -17,6 +17,41 @@ let ''; }); + systemActivationScript = set: onlyDry: let + set' = filterAttrs (_: v: onlyDry -> v.supportsDryActivation) (mapAttrs (_: v: if isString v then (noDepEntry v) // { supportsDryActivation = false; } else v) set); + withHeadlines = addAttributeName set'; + in + '' + #!${pkgs.runtimeShell} + + systemConfig='@out@' + + export PATH=/empty + for i in ${toString path}; do + PATH=$PATH:$i/bin:$i/sbin + done + + _status=0 + trap "_status=1 _localstatus=\$?" ERR + + # Ensure a consistent umask. + umask 0022 + + ${textClosureMap id (withHeadlines) (attrNames withHeadlines)} + + '' + optionalString (!onlyDry) '' + # Make this configuration the current configuration. + # The readlink is there to ensure that when $systemConfig = /system + # (which is a symlink to the store), /run/current-system is still + # used as a garbage collection root. + ln -sfn "$(readlink -f "$systemConfig")" /run/current-system + + # Prevent the current configuration from being garbage-collected. + ln -sfn /run/current-system /nix/var/nix/gcroots/current-system + + exit $_status + ''; + path = with pkgs; map getBin [ coreutils gnugrep @@ -28,7 +63,7 @@ let util-linux # needed for mount and mountpoint ]; - scriptType = with types; + scriptType = withDry: with types; let scriptOptions = { deps = mkOption { type = types.listOf types.str; @@ -39,6 +74,19 @@ let { type = types.lines; description = "The content of the script."; }; + } // optionalAttrs withDry { + supportsDryActivation = mkOption + { type = types.bool; + default = false; + description = '' + Whether this activation script supports being dry-activated. + These activation scripts will also be executed on dry-activate + activations with the environment variable + <literal>NIXOS_ACTION</literal> being set to <literal>dry-activate + </literal>. it's important that these activation scripts don't + modify anything about the system when the variable is set. + ''; + }; }; in either str (submodule { options = scriptOptions; }); @@ -74,47 +122,19 @@ in idempotent and fast. ''; - type = types.attrsOf scriptType; - - apply = set: { - script = - '' - #! ${pkgs.runtimeShell} - - systemConfig=@out@ - - export PATH=/empty - for i in ${toString path}; do - PATH=$PATH:$i/bin:$i/sbin - done - - _status=0 - trap "_status=1 _localstatus=\$?" ERR - - # Ensure a consistent umask. - umask 0022 - - ${ - let - set' = mapAttrs (n: v: if isString v then noDepEntry v else v) set; - withHeadlines = addAttributeName set'; - in textClosureMap id (withHeadlines) (attrNames withHeadlines) - } - - # Make this configuration the current configuration. - # The readlink is there to ensure that when $systemConfig = /system - # (which is a symlink to the store), /run/current-system is still - # used as a garbage collection root. - ln -sfn "$(readlink -f "$systemConfig")" /run/current-system - - # Prevent the current configuration from being garbage-collected. - ln -sfn /run/current-system /nix/var/nix/gcroots/current-system - - exit $_status - ''; + type = types.attrsOf (scriptType true); + apply = set: set // { + script = systemActivationScript set false; }; }; + system.dryActivationScript = mkOption { + description = "The shell script that is to be run when dry-activating a system."; + readOnly = true; + internal = true; + default = systemActivationScript (removeAttrs config.system.activationScripts [ "script" ]) true; + }; + system.userActivationScripts = mkOption { default = {}; @@ -137,7 +157,7 @@ in idempotent and fast. ''; - type = with types; attrsOf scriptType; + type = with types; attrsOf (scriptType false); apply = set: { script = '' diff --git a/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index dd391c8b5d78..b7a062755296 100644 --- a/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -36,6 +36,8 @@ EOF exit 1; } +$ENV{NIXOS_ACTION} = $action; + # This is a NixOS installation if it has /etc/NIXOS or a proper # /etc/os-release. die "This is not a NixOS installation!\n" unless @@ -360,6 +362,10 @@ if ($action eq "dry-activate") { if scalar @unitsToStopFiltered > 0; print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" if scalar(keys %unitsToSkip) > 0; + + print STDERR "would activate the configuration...\n"; + system("$out/dry-activate", "$out"); + print STDERR "would restart systemd\n" if $restartSystemd; print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" if scalar(keys %unitsToRestart) > 0; diff --git a/nixpkgs/nixos/modules/system/activation/top-level.nix b/nixpkgs/nixos/modules/system/activation/top-level.nix index d3e4923a993f..616e1422aa8c 100644 --- a/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -56,9 +56,13 @@ let ''} echo "$activationScript" > $out/activate + echo "$dryActivationScript" > $out/dry-activate substituteInPlace $out/activate --subst-var out - chmod u+x $out/activate - unset activationScript + substituteInPlace $out/dry-activate --subst-var out + chmod u+x $out/activate $out/dry-activate + unset activationScript dryActivationScript + ${pkgs.runtimeShell} -n $out/activate + ${pkgs.runtimeShell} -n $out/dry-activate cp ${config.system.build.bootStage2} $out/init substituteInPlace $out/init --subst-var-by systemConfig $out @@ -108,6 +112,7 @@ let config.system.build.installBootLoader or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; activationScript = config.system.activationScripts.script; + dryActivationScript = config.system.dryActivationScript; nixosLabel = config.system.nixos.label; configurationName = config.boot.loader.grub.configurationName; diff --git a/nixpkgs/nixos/modules/tasks/lvm.nix b/nixpkgs/nixos/modules/tasks/lvm.nix index 98a0e2ddef90..aaa76b49fa30 100644 --- a/nixpkgs/nixos/modules/tasks/lvm.nix +++ b/nixpkgs/nixos/modules/tasks/lvm.nix @@ -46,22 +46,32 @@ in { kernelModules = [ "dm-snapshot" "dm-thin-pool" ]; extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.thin-provisioning-tools}/bin/pdata_tools - copy_bin_and_libs ${pkgs.thin-provisioning-tools}/bin/thin_check + for BIN in ${pkgs.thin-provisioning-tools}/bin/*; do + copy_bin_and_libs $BIN + done + ''; + + extraUtilsCommandsTest = '' + ls ${pkgs.thin-provisioning-tools}/bin/ | grep -v pdata_tools | while read BIN; do + $out/bin/$(basename $BIN) --help > /dev/null + done ''; }; - environment.etc."lvm/lvm.conf".text = '' - global/thin_check_executable = "${pkgs.thin-provisioning-tools}/bin/thin_check" - ''; + environment.etc."lvm/lvm.conf".text = concatMapStringsSep "\n" + (bin: "global/${bin}_executable = ${pkgs.thin-provisioning-tools}/bin/${bin}") + [ "thin_check" "thin_dump" "thin_repair" "cache_check" "cache_dump" "cache_repair" ]; }) (mkIf (cfg.dmeventd.enable || cfg.boot.thin.enable) { boot.initrd.preLVMCommands = '' mkdir -p /etc/lvm cat << EOF >> /etc/lvm/lvm.conf - ${optionalString cfg.boot.thin.enable '' - global/thin_check_executable = "$(command -v thin_check)" - ''} + ${optionalString cfg.boot.thin.enable ( + concatMapStringsSep "\n" + (bin: "global/${bin}_executable = $(command -v ${bin})") + [ "thin_check" "thin_dump" "thin_repair" "cache_check" "cache_dump" "cache_repair" ] + ) + } ${optionalString cfg.dmeventd.enable '' dmeventd/executable = "$(command -v false)" activation/monitoring = 0 diff --git a/nixpkgs/nixos/tests/handbrake.nix b/nixpkgs/nixos/tests/handbrake.nix index 226dc8b2aa8a..c92fb5db7d6c 100644 --- a/nixpkgs/nixos/tests/handbrake.nix +++ b/nixpkgs/nixos/tests/handbrake.nix @@ -9,7 +9,7 @@ in { name = "handbrake"; meta = { - maintainers = with pkgs.lib.maintainers; [ danieldk ]; + maintainers = with pkgs.lib.maintainers; [ ]; }; machine = { pkgs, ... }: { diff --git a/nixpkgs/nixos/tests/kernel-generic.nix b/nixpkgs/nixos/tests/kernel-generic.nix index 391a93e36981..e88b60d33534 100644 --- a/nixpkgs/nixos/tests/kernel-generic.nix +++ b/nixpkgs/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ let linuxPackages_5_4 linuxPackages_5_10 linuxPackages_5_13 + linuxPackages_5_14 linuxPackages_4_14_hardened linuxPackages_4_19_hardened diff --git a/nixpkgs/nixos/tests/miniflux.nix b/nixpkgs/nixos/tests/miniflux.nix index 9a25a9e77cc9..1015550fa8c7 100644 --- a/nixpkgs/nixos/tests/miniflux.nix +++ b/nixpkgs/nixos/tests/miniflux.nix @@ -11,7 +11,7 @@ in with lib; { name = "miniflux"; - meta.maintainers = with pkgs.lib.maintainers; [ bricewge ]; + meta.maintainers = with pkgs.lib.maintainers; [ ]; nodes = { default = diff --git a/nixpkgs/nixos/tests/mutable-users.nix b/nixpkgs/nixos/tests/mutable-users.nix index e3f002d9b198..ebe32e6487ef 100644 --- a/nixpkgs/nixos/tests/mutable-users.nix +++ b/nixpkgs/nixos/tests/mutable-users.nix @@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; mutable = { ... }: { users.mutableUsers = true; + users.users.dry-test.isNormalUser = true; }; }; @@ -41,5 +42,32 @@ import ./make-test-python.nix ({ pkgs, ...} : { "${mutableSystem}/bin/switch-to-configuration test" ) assert "/run/wrappers/" in machine.succeed("which passwd") + + with subtest("dry-activation does not change files"): + machine.succeed('test -e /home/dry-test') # home was created + machine.succeed('rm -rf /home/dry-test') + + files_to_check = ['/etc/group', + '/etc/passwd', + '/etc/shadow', + '/etc/subuid', + '/etc/subgid', + '/var/lib/nixos/uid-map', + '/var/lib/nixos/gid-map', + '/var/lib/nixos/declarative-groups', + '/var/lib/nixos/declarative-users' + ] + expected_hashes = {} + expected_stats = {} + for file in files_to_check: + expected_hashes[file] = machine.succeed(f"sha256sum {file}") + expected_stats[file] = machine.succeed(f"stat {file}") + + machine.succeed("/run/current-system/bin/switch-to-configuration dry-activate") + + machine.fail('test -e /home/dry-test') # home was not recreated + for file in files_to_check: + assert machine.succeed(f"sha256sum {file}") == expected_hashes[file] + assert machine.succeed(f"stat {file}") == expected_stats[file] ''; }) diff --git a/nixpkgs/pkgs/applications/audio/ardour/default.nix b/nixpkgs/pkgs/applications/audio/ardour/default.nix index 8ebf4bf0fc4b..2bd6cf03cc08 100644 --- a/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -56,13 +56,13 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.7"; + version = "6.9"; # don't fetch releases from the GitHub mirror, they are broken src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "19jc29fjwgvqbg3gnmy50mrz8mh5x4nwddglasvwx83nc87qwllx"; + sha256 = "0vlcbd70y0an881zv87kc3akmaiz4w7whsy3yaiiqqjww35jg1mm"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/audio/audacious/default.nix b/nixpkgs/pkgs/applications/audio/audacious/default.nix index db6e03f47417..a6c8221c9f72 100644 --- a/nixpkgs/pkgs/applications/audio/audacious/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacious/default.nix @@ -6,7 +6,7 @@ libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, - wavpack, openmpt123 + wavpack, libopenmpt }: mkDerivation rec { @@ -33,7 +33,7 @@ mkDerivation rec { libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack - openmpt123 + libopenmpt ]; # Here we build both audacious and audacious-plugins in one diff --git a/nixpkgs/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix index 73a0cebd36b9..566024881b4a 100644 --- a/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/audacity/audacity/pull/831/commits/007852e51fcbb5f1f359d112f28b8984a604dac6.patch"; + url = "https://github.com/audacity/audacity/commit/7f8135e112a0e1e8e906abab9339680d1e491441.patch"; sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw"; name = "audacity_xdg_paths.patch"; }) diff --git a/nixpkgs/pkgs/applications/audio/boops/default.nix b/nixpkgs/pkgs/applications/audio/boops/default.nix index de766f14dbc5..2f4156675392 100644 --- a/nixpkgs/pkgs/applications/audio/boops/default.nix +++ b/nixpkgs/pkgs/applications/audio/boops/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "boops"; - version = "1.6.4"; + version = "1.8.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BOops"; rev = version; - sha256 = "sha256-rljUb0fj231MQh+7jTpjAsZm1QkNzfdSpcI1cS5fs/c="; + sha256 = "0nvpawk58g189z96xnjs4pyri5az3ckdi9mhi0i9s0a7k4gdkarr"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/exaile/default.nix b/nixpkgs/pkgs/applications/audio/exaile/default.nix new file mode 100644 index 000000000000..220a7c4eb3ea --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/exaile/default.nix @@ -0,0 +1,107 @@ +{ stdenv, lib, fetchFromGitHub +, gobject-introspection, makeWrapper, wrapGAppsHook +, gtk3, gst_all_1, python3 +, gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk +, iconTheme ? gnome.adwaita-icon-theme +, deviceDetectionSupport ? true +, documentationSupport ? true +, notificationSupport ? true +, scalableIconSupport ? true +, translationSupport ? true +, bpmCounterSupport ? false +, ipythonSupport ? false +, lastfmSupport ? false +, lyricsManiaSupport ? false +, lyricsWikiSupport ? false +, multimediaKeySupport ? false +, musicBrainzSupport ? false +, podcastSupport ? false +, streamripperSupport ? false +, wikipediaSupport ? false +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "exaile"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "exaile"; + repo = pname; + rev = version; + sha256 = "0s29lm0i4slgaw5l5s9a2zx0b83xac43rnil5cvyi210dxm5s048"; + }; + patches = [ + (fetchpatch { + url = "https://github.com/exaile/exaile/pull/751.patch"; + sha256 = "sha256-jCJh85Z3HQcyS4ntQP5HwYJgM7WNHcWzjf0BdNJitsM="; + }) + ]; + + nativeBuildInputs = [ + gobject-introspection + makeWrapper + wrapGAppsHook + ] ++ lib.optionals documentationSupport [ + help2man + python3.pkgs.sphinx + python3.pkgs.sphinx_rtd_theme + ] ++ lib.optional translationSupport gettext; + + buildInputs = [ + iconTheme + gtk3 + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]) ++ (with python3.pkgs; [ + bsddb3 + dbus-python + mutagen + pygobject3 + pycairo + gst-python + ]) ++ lib.optional deviceDetectionSupport udisks + ++ lib.optional notificationSupport libnotify + ++ lib.optional scalableIconSupport librsvg + ++ lib.optional bpmCounterSupport gst_all_1.gst-plugins-bad + ++ lib.optional ipythonSupport python3.pkgs.ipython + ++ lib.optional lastfmSupport python3.pkgs.pylast + ++ lib.optional (lyricsManiaSupport || lyricsWikiSupport) python3.pkgs.lxml + ++ lib.optional lyricsWikiSupport python3.pkgs.beautifulsoup4 + ++ lib.optional multimediaKeySupport keybinder3 + ++ lib.optional musicBrainzSupport python3.pkgs.musicbrainzngs + ++ lib.optional podcastSupport python3.pkgs.feedparser + ++ lib.optional wikipediaSupport webkitgtk; + + checkInputs = with python3.pkgs; [ + mox3 + pytest + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + doCheck = true; + preCheck = '' + substituteInPlace Makefile --replace "PYTHONPATH=$(shell pwd)" "PYTHONPATH=$PYTHONPATH:$(shell pwd)" + export PYTEST="py.test" + export XDG_CACHE_HOME=$(mktemp -d) + ''; + + postInstall = '' + wrapProgram $out/bin/exaile \ + --set PYTHONPATH $PYTHONPATH \ + ${lib.optionalString streamripperSupport "--prefix PATH : ${lib.makeBinPath [ streamripper ]}"} + ''; + + meta = with lib; { + homepage = "https://www.exaile.org/"; + description = "A music player with a simple interface and powerful music management capabilities"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ryneeverett ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix index 319ee7a5f984..842d2ad93fa4 100644 --- a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix +++ b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "hydrogen"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hydrogen-music"; repo = pname; rev = version; - sha256 = "sha256-t3f+T1QTNbuJnWmD+q0yPgQxXPXvl91lZN17pKUVFlo="; + sha256 = "sha256-G+7vTUxYiPNKJ0Qxf/E/t0d6vC/lDs9vNfSbvUXTQgI="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/nixpkgs/pkgs/applications/audio/libopenmpt/default.nix index 3bfb1a5a4da8..2edb75d2b803 100644 --- a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/nixpkgs/pkgs/applications/audio/libopenmpt/default.nix @@ -2,12 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { - pname = "openmpt123"; - version = "0.5.10"; + pname = "libopenmpt"; + version = "0.5.11"; + + outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "sha256-Waj6KNi432nLf6WXK9+TEIHatOHhFWxpoaU7ZcK+n/o="; + sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 860a621847da..564277562885 100644 --- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.17"; + version = "1.4.23"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-GrznUXIYUTYOKQ1znsCqmBdm5YImCABMK2NGRtx5fSk="; + sha256 = "sha256-wwdH3gMpYt40VGqrL1XfB1dOfg45zLKtTEI23AwjCis="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 9921c1b7e88b..7e1865462e63 100644 --- a/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.5.0"; + version = "3.7.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "NjhrtGQsIbNDmGPEDmEbaHSfvUTFb1e7yPorF/BzWTfwVoFZEJiNzP/1k+zTJ4Yfd4mG0W0GYx0jh8m/micWIg=="; + sha512 = "YixaO54+V9RTYS+Of7AVvBtxUEuCdbzlJmyIBj5k8jlD0bvRP1XwIIeADnofKBLAa2ZsmiQunznPLsjQWgr4JA=="; }; appimageContents = appimageTools.extractType2 { @@ -34,7 +34,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/30"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/31"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index c84aa039c52e..f7a3e2e36744 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -102,7 +102,12 @@ mkDerivation rec { dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/sonic-pi" \ - --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2}/bin \ + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \ + --set AUBIO_LIB "${aubio}/lib/libaubio.so" + makeWrapper \ + $out/app/server/ruby/bin/sonic-pi-server.rb \ + $out/bin/sonic-pi-server \ + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \ --set AUBIO_LIB "${aubio}/lib/libaubio.so" ''; diff --git a/nixpkgs/pkgs/applications/audio/spotify/default.nix b/nixpkgs/pkgs/applications/audio/spotify/default.nix index d81ab4b3ac72..fa8174e3a95b 100644 --- a/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -10,20 +10,20 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.55.498.gf9a83c60"; + version = "1.1.67.586.gbb5ef64e"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "46"; + rev = "50"; deps = [ alsa-lib - atk at-spi2-atk at-spi2-core + atk cairo cups curl @@ -46,7 +46,10 @@ let pango stdenv.cc.cc systemd + xorg.libICE + xorg.libSM xorg.libX11 + xorg.libxcb xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -56,10 +59,8 @@ let xorg.libXrandr xorg.libXrender xorg.libXScrnSaver + xorg.libxshmfence xorg.libXtst - xorg.libxcb - xorg.libSM - xorg.libICE zlib ]; @@ -79,7 +80,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149"; + sha512 = "f29aa4a3f3d6a72f108f350905789f12ab3ae50cf4f4828f021d3be7759b192506c9a397e45309a5ee659578b6e85de80d7d78f994af9ab631c9fb2dc527c242"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/nixpkgs/pkgs/applications/audio/tauon/default.nix b/nixpkgs/pkgs/applications/audio/tauon/default.nix new file mode 100644 index 000000000000..530c41ab9220 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -0,0 +1,109 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, python3Packages +, ffmpeg +, flac +, gobject-introspection +, gtk3 +, libnotify +, libsamplerate +, libvorbis +, mpg123 +, libopenmpt +, opusfile +, pango +, pulseaudio +}: + +stdenv.mkDerivation rec { + pname = "tauon"; + version = "6.7.1"; + + src = fetchFromGitHub { + owner = "Taiko2k"; + repo = "TauonMusicBox"; + rev = "v${version}"; + sha256 = "1hm82yfq7q2akrrvff3vmwrd3bz34d2dk8jzhnizhnhar6xc6fzp"; + }; + + postPatch = '' + substituteInPlace tauon.py \ + --replace 'install_mode = False' 'install_mode = True' \ + --replace 'install_directory = os.path.dirname(__file__)' 'install_directory = "${placeholder "out"}/share/tauon"' + + substituteInPlace t_modules/t_main.py \ + --replace 'install_mode = False' 'install_mode = True' \ + --replace 'install_directory = sys.path[0]' 'install_directory = "${placeholder "out"}/share/tauon"' \ + --replace 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' \ + --replace 'lib/libphazor.so' '../../lib/libphazor.so' + + substituteInPlace t_modules/t_phazor.py \ + --replace 'lib/libphazor.so' '../../lib/libphazor.so' + + patchShebangs compile-phazor.sh + ''; + + postBuild = '' + ./compile-phazor.sh + ''; + + nativeBuildInputs = [ + pkg-config + python3Packages.wrapPython + ]; + + buildInputs = [ + flac + gobject-introspection + gtk3 + libnotify + libopenmpt + libsamplerate + libvorbis + mpg123 + opusfile + pango + pulseaudio + ]; + + pythonPath = with python3Packages; [ + dbus-python + isounidecode + musicbrainzngs + mutagen + pillow + pulsectl + pycairo + pylast + pygobject3 + pylyrics + pysdl2 + requests + send2trash + ]; + + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ffmpeg]}" + "--prefix PYTHONPATH : $out/share/tauon" + "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" + ]; + + installPhase = '' + install -Dm755 tauon.py $out/bin/tauon + mkdir -p $out/share/tauon + cp -r lib $out + cp -r assets input.txt t_modules theme $out/share/tauon + + wrapPythonPrograms + ''; + + meta = with lib; { + description = "The Linux desktop music player from the future"; + homepage = "https://tauonmusicbox.rocks/"; + license = licenses.gpl3; + maintainers = with maintainers; [ SuperSandro2000 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 8d549c96c345..9c810036199e 100644 --- a/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-pRc0oud8k6ulC6tVXv6Mr7IEC2a/+FhkMDyxz1zFKTE="; + sha256 = "sha256-6ktlnbYb+pOXwl52QmnqDsPlXaiF1ghjQg1yfznulqo="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 38ce61302297..f92b2f7a8565 100644 --- a/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -21,48 +21,48 @@ }) (fetchNuGet { name = "BIP78.Sender"; - version = "0.2.0"; - sha256 = "0gyynn15rc1x9p2703ffi4jnbpbd0k3wvg839xrk2skmaw8nxamf"; + version = "0.2.2"; + sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { name = "BTCPayServer.Hwi"; - version = "2.0.1"; - sha256 = "18pp3f0z10c0q1bbllxi2j6ix8f0x58d0dndi5faf9p3hb58ly9k"; + version = "2.0.2"; + sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.10"; - sha256 = "0c3bi5r7sckzml44bqy0j1cd6l3xc29cdyf6rib52b5gmgrvcam2"; + version = "1.2.12"; + sha256 = "0sciwh9m7h6ns59bsrzpd6zyxxdkiy33bdsq0phd3r2yxakvw68n"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; - version = "1.2.5"; - sha256 = "02mf7yhr9lfy5368c5mn1wgxxka52f0s5vx31w97sdkpc5pivng5"; + version = "1.2.7"; + sha256 = "02x3p0am5zqp8f4fycdlrp26alicxc5vrlvgxg6d8wsa35q473xc"; }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.6"; - sha256 = "1p4bzbrd2d0izjd9q06mnagl31q50hpz5jla9gfja1bhn3xqvwsy"; + version = "1.2.8"; + sha256 = "06c6dnp72iwvnjm3pil24fnk4vp2v1f9gg84a381yn1xah9jghky"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; - version = "1.2.4"; - sha256 = "1bdj1cdf6sirwm19hq1k2fmh2jiqkcyzrqms6q9d0wqba9xggwyn"; + version = "1.2.6"; + sha256 = "09p2ks1qgy6jnpcfwgdnxvldyyadwnh3mwmq9z89vvzmmgs19xkk"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Eclair"; - version = "1.2.4"; - sha256 = "1l68sc9g4ffsi1bbgrbbx8zmqw811hjq17761q1han9gsykl5rr1"; + version = "1.2.6"; + sha256 = "0lf55w8v997kqh808545ry5mlwxpzxzlkbz38fl4nfm85yydw0fc"; }) (fetchNuGet { name = "BTCPayServer.Lightning.LND"; - version = "1.2.6"; - sha256 = "16wipkzzfrcjhi3whqxdfjq7qxnwjzf4gckpf1qjgdxbzggh6l3d"; + version = "1.2.8"; + sha256 = "1g1siy3xwf3rmyl4qrcg42wpww4b2qmfs88x0rxccwxjy5inzkz6"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.4"; - sha256 = "1j80m4pb3nn4dnqmxda13lp87pgviwxai456pki097rmc0vmqj83"; + version = "1.2.6"; + sha256 = "10g785jh92z5x7aqh41ma3d1nw0718bk7ibb58ychhdk1v2wwmh4"; }) (fetchNuGet { name = "BuildBundlerMinifier"; @@ -756,23 +756,18 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "3.0.3"; - sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd"; + version = "3.0.4"; + sha256 = "03aia31sznw81jjr9k6dkwgvm9dc38fgp1z8y5i45vlkf5fp89pb"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.40"; - sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.67"; - sha256 = "049marx1jwr7srlpqspimrqqgahh53gi2iyp7bpzn5npsbzh9v3h"; + version = "5.0.33"; + sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.81"; - sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; + version = "5.0.40"; + sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) (fetchNuGet { name = "NBitcoin"; @@ -781,8 +776,8 @@ }) (fetchNuGet { name = "NBitcoin"; - version = "6.0.7"; - sha256 = "0mk8n8isrrww0240x63rx3zx12nz5v08i3w62qp1n18mmdw3rdy6"; + version = "6.0.8"; + sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { name = "NBitpayClient"; @@ -791,8 +786,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "4.0.3"; - sha256 = "0x9iggc5cyv06gnwnwrk3riv2j3g0833imdf3jx8ghmrxvim88b3"; + version = "4.1.0"; + sha256 = "1al9j14k51ql7m6yd2w89xlnklj64jqjikq8wpl2vwi1zy2gxqrl"; }) (fetchNuGet { name = "Nethereum.ABI"; diff --git a/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/nixpkgs/pkgs/applications/blockchains/chia/default.nix index 7e44fc80dc3b..4c596be9f4c8 100644 --- a/nixpkgs/pkgs/applications/blockchains/chia/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/chia/default.nix @@ -5,16 +5,16 @@ , python3Packages }: -python3Packages.buildPythonApplication rec { +let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.3"; + version = "1.2.6"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-nK/Zk2zgIdrRtw3+VkUXQWfI9j29XFDOR95Dvbn07eA="; + sha256 = "sha256-Y+cRfx5WE+hb31E975xquuSmNgqr2AvaQnCE70sW91w="; }; patches = [ @@ -45,15 +45,18 @@ python3Packages.buildPythonApplication rec { clvm clvm-rs clvm-tools + colorama colorlog concurrent-log-handler cryptography dnspython + fasteners keyrings-cryptfile pyyaml setproctitle setuptools # needs pkg_resources at runtime sortedcontainers + watchdog websockets ]; @@ -61,9 +64,15 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; + # Testsuite is expensive and non-deterministic, so it is available in + # passthru.tests instead. + doCheck = false; + disabledTests = [ "test_spend_through_n" "test_spend_zero_coin" + "test_default_cached_master_passphrase" + "test_using_legacy_keyring" ]; postPatch = '' @@ -72,9 +81,7 @@ python3Packages.buildPythonApplication rec { --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ --replace "sortedcontainers==2.3.0" "sortedcontainers>=2.3.0" \ --replace "click==7.1.2" "click>=7.1.2" \ - --replace "clvm_rs==0.1.8" "clvm_rs>=0.1.8" \ --replace "clvm==0.9.7" "clvm>=0.9.7" \ - --replace "bitstring==3.1.7" "bitstring>=3.1.9" \ ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem ''; @@ -83,6 +90,10 @@ python3Packages.buildPythonApplication rec { export HOME=`mktemp -d` ''; + passthru.tests = { + chiaWithTests = chia.overrideAttrs (_: { doCheck = true; }); + }; + meta = with lib; { homepage = "https://www.chia.net/"; description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure."; @@ -90,4 +101,5 @@ python3Packages.buildPythonApplication rec { maintainers = teams.chia.members; platforms = platforms.all; }; -} +}; +in chia diff --git a/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix index d7a27dd4bccc..54e9400e3d58 100644 --- a/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.2.2"; + version = "0.17.2.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1k3grbd3wydy5gv6d8x35skv1v97lhh6awd9i87im9lz4kn8ywkd"; + sha256 = "1d8y5yqyw0db2jdv9mwkczwm2qcwhzyslvq994yq5rvs4vkd8xjg"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/nixpkgs/pkgs/applications/blockchains/monero/default.nix index 7dd2e569021a..ad07c3eba0b9 100644 --- a/nixpkgs/pkgs/applications/blockchains/monero/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.2.0"; + version = "0.17.2.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6"; + sha256 = "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 65d845988f93..a0f1cfe87ee7 100644 --- a/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.58"; + version = "2.2.5"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-rhD0owLEx7WxZnGPNaq4QpZopMsFQDOTnA0fs539Wxg="; + sha256 = "sha256-EWT/1fQpqEyKBEDHvmguHV/8s30DxweYswy0QvMDzcQ="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index f5ab743e138a..fe34d99f1d89 100644 --- a/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,8 +181,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "3.0.3"; - sha256 = "0129mgnyyb55haz68d8z694g1q2rlc0qylx08d5qnfpq1r03cdqd"; + version = "3.0.4"; + sha256 = "03aia31sznw81jjr9k6dkwgvm9dc38fgp1z8y5i45vlkf5fp89pb"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; diff --git a/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index a9912b8b368c..ed5076222405 100755 --- a/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nix set -euo pipefail # This script uses the following env vars: diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index f31265c2e4c1..0c9bd808b53c 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -9,16 +9,16 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.23"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "06xjdibb5lxiga3jg9akmvbazjwk11akyhy3g4pc562hcifsa5sk"; + version = "2020.3.1.24"; # "Android Studio Arctic Fox (2020.3.1)" + sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; }; betaVersion = { version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; }; latestVersion = { # canary & dev - version = "2021.1.1.5"; # "Android Studio Bumblebee (2021.1.1) Canary 5" - sha256Hash = "0fx6nnazg4548rhb11wzaccm5c2si57mj8qwyl5j17x4k5r3m7nh"; + version = "2021.1.1.11"; # "Android Studio Bumblebee (2021.1.1) Canary 11" + sha256Hash = "0npvb7kr259799bs2bs2drvimmmwb0rdzswbkz8zgi5c2fwjcvvl"; }; in { # Attributes are named by their corresponding release channels diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index 658a18c05867..a5f06efa33cc 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, emacs, lib }: +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "apheleia"; - version = "2021-05-23"; + version = "0.0.0+unstable=2021-08-08"; src = fetchFromGitHub { owner = "raxod502"; - repo = "apheleia"; - rev = "f865c165dac606187a66b2b25a57d5099b452120"; - sha256 = "sha256-n37jJsNOGhSjUtQysG3NVIjjayhbOa52iTXBc8SyKXE="; + repo = pname; + rev = "8e022c67fea4248f831c678b31c19646cbcbbf6f"; + hash = "sha256-Put/BBQ7V423C18UIVfaM17T+TDWtAxRZi7WI8doPJw="; }; - buildInputs = [ emacs ]; + buildInputs = [ + emacs + ]; buildPhase = '' runHook preBuild @@ -26,11 +32,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = { - description = "Reformat buffer stably"; + meta = with lib; { homepage = "https://github.com/raxod502/apheleia"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ leungbk ]; + description = "Asynchronous buffer reformat"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres leungbk ]; platforms = emacs.meta.platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 31ef6a3e4f03..753428f9cc82 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.13"; + version = "13.0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.13.tar"; - sha256 = "06cb9jphqd0nysc60b4x24zmdryljb168cw66adl7b2x7sdzpkmn"; + url = "https://elpa.gnu.org/packages/auctex-13.0.14.tar"; + sha256 = "1gmqdcg9s6xf8kvzh1j27nbimakd5cy8pwsn0il19l026kxjimr8"; }; packageRequires = [ emacs ]; meta = { @@ -707,6 +707,21 @@ license = lib.licenses.free; }; }) {}; + crdt = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "crdt"; + ename = "crdt"; + version = "0.1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/crdt-0.1.4.tar"; + sha256 = "1qqfjvkajwhdhz0jhqixdn68l1rl02pn2fmxizzsv0as20v0ay0r"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/crdt.html"; + license = lib.licenses.free; + }; + }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -726,10 +741,10 @@ elpaBuild { pname = "csharp-mode"; ename = "csharp-mode"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csharp-mode-1.0.0.tar"; - sha256 = "0vhm443fkcjsj95r4rs9r0mz9vzfk92883nxhyi35d3jaf112gm1"; + url = "https://elpa.gnu.org/packages/csharp-mode-1.0.2.tar"; + sha256 = "1xddnd6g6qz3xnzl6dmd38qvzvm32acdyhmm27hfdpqcbg6isfad"; }; packageRequires = [ emacs ]; meta = { @@ -786,10 +801,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.19.0"; + version = "2.19.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dash-2.19.0.tar"; - sha256 = "0qszjs60xxqjiqf5f2bgmnbx5jiqii4ghcydwg500za0n2j0f5sx"; + url = "https://elpa.gnu.org/packages/dash-2.19.1.tar"; + sha256 = "0c11lm7wpgmqk8zbdcpmyas12ylml5yhp99mj9h1wqqw0p33xaiw"; }; packageRequires = [ emacs ]; meta = { @@ -1026,10 +1041,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.2"; + version = "0.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.2.tar"; - sha256 = "1idwih5v287q9vdhsnr1bsibdv4h61vmy3b82svf2x9aik1a7vir"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.4.tar"; + sha256 = "0n811af83fqpzq9513gf240gnz7qkwrjw07qs4sra4069q0pwnjr"; }; packageRequires = [ emacs seq ]; meta = { @@ -1220,6 +1235,21 @@ license = lib.licenses.free; }; }) {}; + engrave-faces = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "engrave-faces"; + ename = "engrave-faces"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/engrave-faces-0.2.0.tar"; + sha256 = "1d0hsfg3wvwbs82gjyvfjvy1sszcm7qa50bch1b6jy05kbc543ip"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/engrave-faces.html"; + license = lib.licenses.free; + }; + }) {}; enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "enwc"; @@ -3752,6 +3782,21 @@ license = lib.licenses.free; }; }) {}; + taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "taxy"; + ename = "taxy"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/taxy-0.4.tar"; + sha256 = "1iy1761v2q0i020x8ch4z3vljx2v62pcy5bifxq8gw5qx0115576"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/taxy.html"; + license = lib.licenses.free; + }; + }) {}; temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "temp-buffer-browse"; @@ -3820,10 +3865,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.1.1"; + version = "2.5.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.1.1.tar"; - sha256 = "0v3rvvhjcnyvg6l4vyxz6513mxzvv9n0skkmr62ry8yi5x9wnqp1"; + url = "https://elpa.gnu.org/packages/tramp-2.5.1.2.tar"; + sha256 = "0p8m8prxrvrr455ahb626c1dry04m80y017h16ngr4i5ais0r85g"; }; packageRequires = [ emacs ]; meta = { @@ -3990,6 +4035,21 @@ license = lib.licenses.free; }; }) {}; + vc-backup = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vc-backup"; + ename = "vc-backup"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-backup-1.0.0.tar"; + sha256 = "0vcrbb4s1rzar9q882kfcslycxvycp61923sg82i29b7yd0yrgdr"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-backup.html"; + license = lib.licenses.free; + }; + }) {}; vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vc-hgcmd"; @@ -4379,10 +4439,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.1.0"; + version = "1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.1.0.tar"; - sha256 = "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax"; + url = "https://elpa.gnu.org/packages/xref-1.2.2.tar"; + sha256 = "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm"; }; packageRequires = [ emacs ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 495a3cbfd0f5..b7f861a4cd7a 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -6,7 +6,7 @@ To update the list of packages from MELPA, 1. Run `./update-elpa`. 2. Check for evaluation errors: - `nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages`. + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages 3. Run `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` ## Update from overlay diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix index 1b4da6340dc2..b23d36209e61 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix @@ -1,8 +1,12 @@ -{ stdenv, fetchFromGitHub, emacs, lib }: +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: stdenv.mkDerivation { pname = "git-undo"; - version = "2019-10-13"; + version = "0.0.0+unstable=2019-12-21"; src = fetchFromGitHub { owner = "jwiegley"; @@ -11,7 +15,9 @@ stdenv.mkDerivation { sha256 = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE="; }; - buildInputs = [ emacs ]; + buildInputs = [ + emacs + ]; buildPhase = '' runHook preBuild @@ -26,11 +32,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = { - description = "Revert region to most recent Git-historical version"; + meta = with lib; { homepage = "https://github.com/jwiegley/git-undo-el"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ leungbk ]; + description = "Revert region to most recent Git-historical version"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ leungbk ]; platforms = emacs.meta.platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix index 64cfbde98b77..1c11a2abff57 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, emacs, lib }: +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: stdenv.mkDerivation { pname = "isearch-plus"; - version = "2021-01-01"; + version = "3434+unstable=2021-08-23"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "isearch-plus"; - rev = "376a8f9f8a9666d7e61d125abcdb645847cb8619"; - sha256 = "sha256-Kd5vpu+mI1tJPcsu7EpnnBcPVdVAijkAeTz+bLB3WlQ="; + rev = "93088ea0ac4d51bdb76c4c32ea53172f6c435852"; + hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E="; }; - buildInputs = [ emacs ]; + buildInputs = [ + emacs + ]; buildPhase = '' runHook preBuild @@ -26,11 +32,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = { + meta = with lib; { + homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Extensions to isearch"; - homepage = "https://www.emacswiki.org/emacs/download/isearch%2b.el"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ leungbk ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ leungbk AndersonTorres ]; platforms = emacs.meta.platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix index 0db28255f70c..67a4c87b95d4 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, emacs, lib }: +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: stdenv.mkDerivation { pname = "isearch-prop"; - version = "2019-05-01"; + version = "0.0.0+unstable=2019-05-01"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "isearch-prop"; rev = "4a2765f835dd115d472142da05215c4c748809f4"; - sha256 = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk="; + hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk="; }; - buildInputs = [ emacs ]; + buildInputs = [ + emacs + ]; buildPhase = '' runHook preBuild @@ -26,11 +32,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = { + meta = with lib; { + homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Search text- or overlay-property contexts"; - homepage = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ leungbk ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ leungbk ]; platforms = emacs.meta.platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 015a8e27f8e1..d792793d3643 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -78,6 +78,31 @@ }; }; + # may be part of MELPA in the future, see + # https://github.com/mlochbaum/BQN/issues/10#issuecomment-912982874 + bqn-mode = self.trivialBuild { + pname = "bqn-mode"; + version = "unstable-2021-09-04"; + + src = pkgs.fetchFromGitHub { + owner = "mlochbaum"; + repo = "BQN"; + rev = "e623a2fcafdf5fd6c8d31570175284805c4f34d9"; + sha256 = "1a2lpxy3bak4724r0ns4la5d0j6484ngi73kcwp82vgbbpk7lcrp"; + }; + + postUnpack = '' + sourceRoot="$sourceRoot/editors/emacs" + ''; + + meta = { + description = "Emacs mode for BQN"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.sternenseemann ]; + homepage = "https://mlochbaum.github.io/BQN/editors/index.html"; + }; + }; + ghc-mod = melpaBuild { pname = "ghc"; version = pkgs.haskellPackages.ghc-mod.version; @@ -100,8 +125,6 @@ }; }; - git-undo = callPackage ./git-undo { }; - haskell-unicode-input-method = let rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; in melpaBuild { @@ -235,6 +258,8 @@ # Packages made the classical callPackage way + apheleia = callPackage ./apheleia { }; + ebuild-mode = callPackage ./ebuild-mode { }; emacspeak = callPackage ./emacspeak { }; @@ -243,8 +268,14 @@ font-lock-plus = callPackage ./font-lock-plus { }; + git-undo = callPackage ./git-undo { }; + helm-words = callPackage ./helm-words { }; + isearch-plus = callPackage ./isearch-plus { }; + + isearch-prop = callPackage ./isearch-prop { }; + jam-mode = callPackage ./jam-mode { }; nano-theme = callPackage ./nano-theme { }; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 0ab44fccc8e5..1804188cdbb7 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -1,17 +1,595 @@ { callPackage }: { - caml = callPackage ({ elpaBuild, fetchurl, lib }: + apache-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "apache-mode"; + ename = "apache-mode"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar"; + sha256 = "022s7rw7ary1cx3riszzvb7wi0y078vixkcyggjdg5j2ckjpc8gb"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/apache-mode.html"; + license = lib.licenses.free; + }; + }) {}; + arduino-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, spinner }: + elpaBuild { + pname = "arduino-mode"; + ename = "arduino-mode"; + version = "1.3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar"; + sha256 = "1270mbjgj0kmmjqqblwaipmd2667yp31mgspib3c5d7d6acs1bfx"; + }; + packageRequires = [ emacs spinner ]; + meta = { + homepage = "https://elpa.gnu.org/packages/arduino-mode.html"; + license = lib.licenses.free; + }; + }) {}; + bison-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "bison-mode"; + ename = "bison-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar"; + sha256 = "19n9kz1ycjpxngd3clzr8lzrnnw19l8sfvlx1yqn35hk7017z7ab"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/bison-mode.html"; + license = lib.licenses.free; + }; + }) {}; + caml = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "caml"; ename = "caml"; + version = "4.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/caml-4.8.tar"; + sha256 = "02wzjdd1ig8ajy65rf87zaysfddjbhyswifwlcs52ly7p84q72wk"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/caml.html"; + license = lib.licenses.free; + }; + }) {}; + clojure-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "clojure-mode"; + ename = "clojure-mode"; + version = "5.13.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.13.0.tar"; + sha256 = "16xll0sp7mqzwldfsihp7j3dlm6ps1l1awi122ff8w7xph7b0wfh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/clojure-mode.html"; + license = lib.licenses.free; + }; + }) {}; + crux = callPackage ({ elpaBuild, fetchurl, lib, seq }: + elpaBuild { + pname = "crux"; + ename = "crux"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/crux-0.4.0.tar"; + sha256 = "01yg54s2l3zr4h7h3nw408bqzrr4yds9rfgc575b76006v5d3ciy"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/crux.html"; + license = lib.licenses.free; + }; + }) {}; + d-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "d-mode"; + ename = "d-mode"; + version = "202003130913"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar"; + sha256 = "1pad0ib8l1zkjmh97n1pkwph1xdbcqidnicm3nwmcbmbi61lddsx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/d-mode.html"; + license = lib.licenses.free; + }; + }) {}; + dart-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dart-mode"; + ename = "dart-mode"; + version = "1.0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar"; + sha256 = "13n0fmnxgnq8vjw0n5vwgdgfm5lznvrm3xkak4snkdw7w3rd3a20"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dart-mode.html"; + license = lib.licenses.free; + }; + }) {}; + editorconfig = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , nadvice }: + elpaBuild { + pname = "editorconfig"; + ename = "editorconfig"; + version = "0.8.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/editorconfig-0.8.2.tar"; + sha256 = "1ff8hwyzb249lf78j023sbibgfmimmk6mxkjmcnqqnk1jafprk02"; + }; + packageRequires = [ cl-lib emacs nadvice ]; + meta = { + homepage = "https://elpa.gnu.org/packages/editorconfig.html"; + license = lib.licenses.free; + }; + }) {}; + evil = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "evil"; + ename = "evil"; + version = "1.14.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-1.14.0.tar"; + sha256 = "11hzx3ya1119kr8dwlg264biixiqgvi7zwxxksql0a9hqp57rdpx"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/evil.html"; + license = lib.licenses.free; + }; + }) {}; + geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "geiser"; + ename = "geiser"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-0.16.tar"; + sha256 = "1mhngb1ik3qsc3w466cs61rbz3nn08ag29m5vfbd6adk60xmhnfk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-chez = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-chez"; + ename = "geiser-chez"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.16.tar"; + sha256 = "016b7n5rv7fyrw4lqcprhhf2rai5vvmmc8a13l4w3a30rwcgm7cd"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-chez.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-chibi = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-chibi"; + ename = "geiser-chibi"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.16.tar"; + sha256 = "0j9dgg2q01ya6yawpfc15ywrfykd5gzbh118k1x4mghfkfnqn1zi"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-chibi.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-chicken = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-chicken"; + ename = "geiser-chicken"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.16.tar"; + sha256 = "1zmb8c86akrd5f1v59s4xkbpgsqbdcbc6d5f9h6kxa55ylc4dn6a"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-chicken.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-gambit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-gambit"; + ename = "geiser-gambit"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.16.tar"; + sha256 = "0bc38qlqj7a3cnrcnqrb6m3jvjh2ia5iby9i50vcn0jbs52rfsnz"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-gambit.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-gauche = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-gauche"; + ename = "geiser-gauche"; + version = "0.0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar"; + sha256 = "0wd0yddasryy36ms5ghf0gs8wf80sgdxci2hd8k0fvnyi7c3wnj5"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-gauche.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-guile = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-guile"; + ename = "geiser-guile"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.17.tar"; + sha256 = "0g4982rfxjp08qi6nxz73lsbdwf388fx511394yw4s7ml6v1m4kd"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-guile.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-kawa = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-kawa"; + ename = "geiser-kawa"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar"; + sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-kawa.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-mit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-mit"; + ename = "geiser-mit"; + version = "0.13"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.13.tar"; + sha256 = "1y2cgrcvdp358x7lpcz8x8nw5g1y4h03d9gbkbd6k85643cwrkbi"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-mit.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-racket = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-racket"; + ename = "geiser-racket"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar"; + sha256 = "0lf2lbgpl8pvx7yhiydb7j5hk3kdx34zvhva4zqnzya6zf30w257"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-racket.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-stklos = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-stklos"; + ename = "geiser-stklos"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.3.tar"; + sha256 = "1wkhnkdhdrhrh0vipgnlmyimi859za6jhf2ldpwfmk8r2aj8ywan"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-stklos.html"; + license = lib.licenses.free; + }; + }) {}; + git-commit = callPackage ({ dash + , elpaBuild + , emacs + , fetchurl + , lib + , transient + , with-editor }: + elpaBuild { + pname = "git-commit"; + ename = "git-commit"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/git-commit-3.2.1.tar"; + sha256 = "1jndc8ppj4r2s62idabygj4q0qbpk4gwifn8jrd6pa61d7dlvp28"; + }; + packageRequires = [ dash emacs transient with-editor ]; + meta = { + homepage = "https://elpa.gnu.org/packages/git-commit.html"; + license = lib.licenses.free; + }; + }) {}; + gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gnuplot"; + ename = "gnuplot"; + version = "0.8.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.0.tar"; + sha256 = "1f27y18ivcdwlkgr3ql4qcbgzdp6vk1bkw2wlryrclpydbb1nya3"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnuplot.html"; + license = lib.licenses.free; + }; + }) {}; + go-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "go-mode"; + ename = "go-mode"; + version = "1.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/go-mode-1.5.0.tar"; + sha256 = "0v4lw5dkijajpxyigin4cd5q4ldrabljaz65zr5f7mgqn5sizj3q"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/go-mode.html"; + license = lib.licenses.free; + }; + }) {}; + goto-chg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "goto-chg"; + ename = "goto-chg"; + version = "1.7.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.4.tar"; + sha256 = "1sg2gp48b83gq0j821lk241lwyxkhqr6w5d1apbnkm3qf08qjwba"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/goto-chg.html"; + license = lib.licenses.free; + }; + }) {}; + guru-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "guru-mode"; + ename = "guru-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar"; + sha256 = "18vz80yc7nv6dgyyxmlxslwim7qpb1dx2y5382c2wbdqp0icg41g"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/guru-mode.html"; + license = lib.licenses.free; + }; + }) {}; + haskell-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "haskell-mode"; + ename = "haskell-mode"; version = "4.7.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar"; - sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3"; + url = "https://elpa.nongnu.org/nongnu/haskell-mode-4.7.1.tar"; + sha256 = "07x7440xi8dkv1zpzwi7p96jy3zd6pdv1mhs066l8bp325516wyb"; }; packageRequires = []; meta = { - homepage = "https://elpa.gnu.org/packages/caml.html"; + homepage = "https://elpa.gnu.org/packages/haskell-mode.html"; + license = lib.licenses.free; + }; + }) {}; + highlight-parentheses = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "highlight-parentheses"; + ename = "highlight-parentheses"; + version = "2.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.1.0.tar"; + sha256 = "1rsixbvglar0k0x24xkxw80sx9i85q48jdzx6wbyjz2clz974ja5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html"; + license = lib.licenses.free; + }; + }) {}; + htmlize = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "htmlize"; + ename = "htmlize"; + version = "1.57"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/htmlize-1.57.tar"; + sha256 = "1k4maqkcicvpl4yxkx6ha98x36ppcfdp2clcdg4fjx945yamx80s"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/htmlize.html"; + license = lib.licenses.free; + }; + }) {}; + idris-mode = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , prop-menu }: + elpaBuild { + pname = "idris-mode"; + ename = "idris-mode"; + version = "0.9.18"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/idris-mode-0.9.18.tar"; + sha256 = "1z4wsqzxsmn1vdqp44b32m4wzs4bbnsyzv09v9ggr4l4h2j4c3x5"; + }; + packageRequires = [ cl-lib emacs prop-menu ]; + meta = { + homepage = "https://elpa.gnu.org/packages/idris-mode.html"; + license = lib.licenses.free; + }; + }) {}; + inf-clojure = callPackage ({ clojure-mode + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "inf-clojure"; + ename = "inf-clojure"; + version = "3.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.1.0.tar"; + sha256 = "0jw6rzplicbv2l7si46naspzp5lqwj20b1nmfs9zal58z1gx6zjk"; + }; + packageRequires = [ clojure-mode emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/inf-clojure.html"; + license = lib.licenses.free; + }; + }) {}; + j-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "j-mode"; + ename = "j-mode"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar"; + sha256 = "0l0l71z5i725dnw4l9w2cfjhrijwx9z8mgyf2dfcbly1cl2nvnx2"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/j-mode.html"; + license = lib.licenses.free; + }; + }) {}; + julia-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "julia-mode"; + ename = "julia-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar"; + sha256 = "1qi6z6007q2jgcb96iy34m87jsg9ss3jhzlnl2cl8dn26yqmdky4"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/julia-mode.html"; + license = lib.licenses.free; + }; + }) {}; + lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "lua-mode"; + ename = "lua-mode"; + version = "20210802"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/lua-mode-20210802.tar"; + sha256 = "1yarwai9a0w4yywd0ajdkif4g26z98zw91lg1z78qw0k61qjmnh6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lua-mode.html"; + license = lib.licenses.free; + }; + }) {}; + macrostep = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "macrostep"; + ename = "macrostep"; + version = "0.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.tar"; + sha256 = "10crvq9xww4nvrswqq888y9ah3fl4prj0ha865aqbyrhhbpg18gd"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/macrostep.html"; + license = lib.licenses.free; + }; + }) {}; + magit = callPackage ({ dash + , elpaBuild + , emacs + , fetchurl + , git-commit + , lib + , magit-section + , transient + , with-editor }: + elpaBuild { + pname = "magit"; + ename = "magit"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/magit-3.2.1.tar"; + sha256 = "0yyf16605bp5q8jl2vbljxx04ja0ljvs775dnnawlc3mvn13zd9n"; + }; + packageRequires = [ + dash + emacs + git-commit + magit-section + transient + with-editor + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/magit.html"; + license = lib.licenses.free; + }; + }) {}; + magit-section = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "magit-section"; + ename = "magit-section"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/magit-section-3.2.1.tar"; + sha256 = "1ppinys8rfa38ac8grcx16hlaw33p03pif4ya6bbw280kq8c73rv"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/magit-section.html"; license = lib.licenses.free; }; }) {}; @@ -30,6 +608,51 @@ license = lib.licenses.free; }; }) {}; + multiple-cursors = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "multiple-cursors"; + ename = "multiple-cursors"; + version = "1.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar"; + sha256 = "0f7rk8vw42bgdf5yb4qpnrc3bxvbaafmdqd7kiiqnj5m029yr14f"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/multiple-cursors.html"; + license = lib.licenses.free; + }; + }) {}; + nasm-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "nasm-mode"; + ename = "nasm-mode"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar"; + sha256 = "1smndl3mbiaaphy173zc405zg4wv0mv041vzy11fr74r5w4p232j"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nasm-mode.html"; + license = lib.licenses.free; + }; + }) {}; + nginx-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "nginx-mode"; + ename = "nginx-mode"; + version = "1.1.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.9.tar"; + sha256 = "04jy0zx058hj37ab2n6wwbbwyycsbsb2fj8s4a5f1is2in35nqy0"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/nginx-mode.html"; + license = lib.licenses.free; + }; + }) {}; org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-contrib"; @@ -45,6 +668,51 @@ license = lib.licenses.free; }; }) {}; + php-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "php-mode"; + ename = "php-mode"; + version = "1.24.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.0.tar"; + sha256 = "158850zdmz5irjy6cjai1i8j7qs1vwp95a2dli9f341lbpv2jvzp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/php-mode.html"; + license = lib.licenses.free; + }; + }) {}; + projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "projectile"; + ename = "projectile"; + version = "2.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/projectile-2.5.0.tar"; + sha256 = "09gsm6xbqj3357vlshs1w7ygfm004gpgs0pqrvwl6xmccxpqzmi0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/projectile.html"; + license = lib.licenses.free; + }; + }) {}; + prop-menu = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "prop-menu"; + ename = "prop-menu"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar"; + sha256 = "1csx5aycl478v4hia6lyrdb32hs1haf9n39ngfrbx9ysp7gkj0va"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/prop-menu.html"; + license = lib.licenses.free; + }; + }) {}; request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "request"; @@ -60,6 +728,85 @@ license = lib.licenses.free; }; }) {}; + rubocop = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "rubocop"; + ename = "rubocop"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar"; + sha256 = "1gw30ya6xyi359k9fihjx75h7ahs067i9bvkyla0rbhmc5xdz6ww"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rubocop.html"; + license = lib.licenses.free; + }; + }) {}; + rust-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "rust-mode"; + ename = "rust-mode"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rust-mode-0.5.0.tar"; + sha256 = "03z1nsq1s3awaczirlxixq4gwhz9bf1x5zwd5xfb88ay4kzcmjwc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rust-mode.html"; + license = lib.licenses.free; + }; + }) {}; + sass-mode = callPackage ({ cl-lib ? null + , elpaBuild + , fetchurl + , haml-mode + , lib }: + elpaBuild { + pname = "sass-mode"; + ename = "sass-mode"; + version = "3.0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar"; + sha256 = "1nkp7cvsc2dbxkfv346hwsly34nhv1hhc8lgcs470xzdxi908p61"; + }; + packageRequires = [ cl-lib haml-mode ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sass-mode.html"; + license = lib.licenses.free; + }; + }) {}; + scala-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "scala-mode"; + ename = "scala-mode"; + version = "0.23"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar"; + sha256 = "0dmyh5x519f5b9h034a1yjgmr1ai8pd22a032x31zgdkwl2xyrfd"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/scala-mode.html"; + license = lib.licenses.free; + }; + }) {}; + slime = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, macrostep }: + elpaBuild { + pname = "slime"; + ename = "slime"; + version = "2.26.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/slime-2.26.1.tar"; + sha256 = "0f7absmq0nnhhq0i8nfgn2862ydvwlqyzhcq4s6m91mn72d7dw5i"; + }; + packageRequires = [ cl-lib macrostep ]; + meta = { + homepage = "https://elpa.gnu.org/packages/slime.html"; + license = lib.licenses.free; + }; + }) {}; sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sly"; @@ -75,6 +822,51 @@ license = lib.licenses.free; }; }) {}; + smartparens = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "smartparens"; + ename = "smartparens"; + version = "4.7.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/smartparens-4.7.1.tar"; + sha256 = "0si9wb7j760c4vdv7p049bgppppw5crrh50038bsh8sghq2gdld8"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/smartparens.html"; + license = lib.licenses.free; + }; + }) {}; + swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: + elpaBuild { + pname = "swift-mode"; + ename = "swift-mode"; + version = "8.3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.3.0.tar"; + sha256 = "1bsyv0dl7c2m3f690g7fij7g4937skxjin456vfrgbzb219pdkcs"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swift-mode.html"; + license = lib.licenses.free; + }; + }) {}; + systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "systemd"; + ename = "systemd"; + version = "1.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/systemd-1.6.tar"; + sha256 = "1khfnx2qmg1i4m6axyya0xbzr3c9j136b8pzmqdnd6jamxh43wcg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/systemd.html"; + license = lib.licenses.free; + }; + }) {}; tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tuareg"; @@ -90,4 +882,94 @@ license = lib.licenses.free; }; }) {}; + web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "web-mode"; + ename = "web-mode"; + version = "17.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar"; + sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/web-mode.html"; + license = lib.licenses.free; + }; + }) {}; + wgrep = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "wgrep"; + ename = "wgrep"; + version = "2.3.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/wgrep-2.3.3.tar"; + sha256 = "12w9vsawqnd0rvsahx8vdiabds8rl1zkpmspmcqn28jprbql734r"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/wgrep.html"; + license = lib.licenses.free; + }; + }) {}; + with-editor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "with-editor"; + ename = "with-editor"; + version = "3.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.4.tar"; + sha256 = "032i954rzn8sg1qp6vjhz6j8j1fl6mpvhfnmd3va8k9q9m27k4an"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/with-editor.html"; + license = lib.licenses.free; + }; + }) {}; + yaml-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "yaml-mode"; + ename = "yaml-mode"; + version = "0.0.15"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.15.tar"; + sha256 = "19r2kc894dd59f0r3q4gx52iw5cwj5gi1jjkmi8r9y0dya50rzfx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/yaml-mode.html"; + license = lib.licenses.free; + }; + }) {}; + yasnippet-snippets = callPackage ({ elpaBuild, fetchurl, lib, yasnippet }: + elpaBuild { + pname = "yasnippet-snippets"; + ename = "yasnippet-snippets"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-0.2.tar"; + sha256 = "1xhlx2n2sdpcc82cba9r7nbd0gwi7m821p7vk0vnw84dhwy863ic"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html"; + license = lib.licenses.free; + }; + }) {}; + zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "zig-mode"; + ename = "zig-mode"; + version = "0.0.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar"; + sha256 = "1v9qpc86n9zg765cy93365hj942z0gndkz6grjl2pk31087n3axy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/zig-mode.html"; + license = lib.licenses.free; + }; + }) {}; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index 66ca61499d96..dcd7e92c642d 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -5,8 +5,9 @@ To update the list of packages from nongnu (ELPA), 1. Run `./update-nongnu`. -2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`. -3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix` +2. Check for evaluation errors: + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages +3. Run `git commit -m "nongnu-packages $(date -Idate)" -- nongnu-generated.nix` */ diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 10c63bc0b887..3eae4bc52ce9 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210823"; + version = "20210906"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210823.tar"; - sha256 = "0yd2ydkkfy9lmlnb0lpsm8ywbk88sq9n4i7dasfzslv7czgccyh7"; + url = "https://orgmode.org/elpa/org-20210906.tar"; + sha256 = "04aqniwix4w0iap38dsdskndknhw9k6apkmkrc79yfs3c4jcsszq"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210823"; + version = "20210906"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210823.tar"; - sha256 = "17lyhsi22wg3l3j4k67glvq9p12r3nlc7fs6ka5jr2xrvfypb5aj"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210906.tar"; + sha256 = "1v0yy92x8shwp36qfyzmvk8ayz9amkdis967gqacq5jxcyq7mhbn"; }; packageRequires = []; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix index dcddbe71af8b..12680336e0e8 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix @@ -5,7 +5,8 @@ To update the list of packages from Org (ELPA), 1. Run `./update-org`. -2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages`. +2. Check for evaluation errors: + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages 3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` */ diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 2d2044ded8d4..2b89f5466d56 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -213,11 +213,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210605, - 1143 + 20210903, + 1912 ], - "commit": "118ed7fc948b6d91eea727df35a1639521bf5fdb", - "sha256": "0qnsyvvb0knarvd4lvnzazf8y756iwx435zswym5lwsw5v847l8d" + "commit": "1699bec4d244a1f62af29fe4eb8b79b6d2fccf7d", + "sha256": "1mr0qpw7cfy1hwd2fxki01570cw8n0ix1ix27s3yzc2r8cqv6cri" }, "stable": { "version": [ @@ -1051,15 +1051,15 @@ "version": [ 2, 4, - 1 + 2 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" } }, { @@ -1088,7 +1088,7 @@ "version": [ 2, 4, - 1 + 2 ], "deps": [ "dash", @@ -1098,8 +1098,8 @@ "s", "xcscope" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" } }, { @@ -1296,11 +1296,11 @@ "repo": "tam17aki/ace-isearch", "unstable": { "version": [ - 20200912, - 754 + 20210830, + 746 ], - "commit": "422aaa50b6452c2399682782cbf23168ed4357c6", - "sha256": "1gx106znzb6wq72yixq3z8arj1hhh215yy3324shvjwgqkyc3xi8" + "commit": "8439136206a42e41ef95af923e0dc3bbd4fa306c", + "sha256": "00mqd02l3fx5jicjwm27xwmr98l3f8v08q4jfxdzh1cjqpi8c5pp" }, "stable": { "version": [ @@ -1489,15 +1489,15 @@ "repo": "cute-jumper/ace-pinyin", "unstable": { "version": [ - 20210806, - 316 + 20210827, + 355 ], "deps": [ "avy", "pinyinlib" ], - "commit": "4dc565807a9b74ba637122f746d1614c60f92af8", - "sha256": "1q1s2xwa4wb0h3r255j9wy37yzim6fa1kl42gnxlg5zwgcb2la9w" + "commit": "47662c0b05775ba353464b44c0f1a037c85e746e", + "sha256": "0qidfljvjqwyi5xvgr6hli45k1d4w8g5zn2mssyv9xzrslcigdzv" }, "stable": { "version": [ @@ -1955,15 +1955,15 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210809, - 721 + 20210903, + 1114 ], "deps": [ "annotation", "eri" ], - "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", - "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" + "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", + "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" }, "stable": { "version": [ @@ -2344,8 +2344,8 @@ "deps": [ "flycheck" ], - "commit": "95a31c4232e71047a64956976622969df9226381", - "sha256": "09rhs337cnb24blf9qcxc3hgg8s9h4rsyiwpnkqd2by4kkhdyign" + "commit": "59aac2167ca623358ddbb800abe5912194137f74", + "sha256": "17vn4hxkvd1nkn7gjjg867rjd5r0qsb7qlf2fh75pikk806x5sa8" }, "stable": { "version": [ @@ -2452,11 +2452,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210817, - 2252 + 20210831, + 1317 ], - "commit": "b43d2b32f6de83c0dc7792a957f64e8444e59beb", - "sha256": "066kldj7wz6s1qdvkxifv2zx0wimxncgh11r0pchfrji4b0h6pyh" + "commit": "c0d288a41faea2ecb7e8dd947486764a2ee17ec9", + "sha256": "1r1905irz9rh05qzmzk1cbdnk4667ax8wm71r1prv8dnx8nq05kp" }, "stable": { "version": [ @@ -3246,8 +3246,8 @@ 20200914, 644 ], - "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", - "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" + "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", + "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" }, "stable": { "version": [ @@ -3567,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20210819, - 2136 + 20210828, + 1913 ], - "commit": "9e80feb61a173d776495f8a36545b966acac21f2", - "sha256": "00wihhzn779rqmhb41n1f2wd69cfcqq5z86l5hmcyx7lhn0nykyj" + "commit": "f1d4bef95c3be736c15f0d9b41037ba02933acf1", + "sha256": "1a6s7zcz176845fp38n1ilpqkgzzpq3miwg7cpymrcdnp3kxvc0n" }, "stable": { "version": [ @@ -4133,8 +4133,8 @@ 20210823, 528 ], - "commit": "d834cd90fe6f1d87dab86b637d23958241cadac3", - "sha256": "00n9w9qh84fp60swcpccimch4lq0rcwqm7aqjym5hqmkc1ncz2bp" + "commit": "5d365ffc6a2c2041657eaa5d762c395ea748c8d7", + "sha256": "0fn2dyj43ag7abh7x2m4qcn7ij1kp65d3vqlkcri780fv4wp7mc4" }, "stable": { "version": [ @@ -5561,8 +5561,8 @@ "avy", "embark" ], - "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", - "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" + "commit": "d21277a638827623ab84e9e6341312a2da5062ab", + "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" }, "stable": { "version": [ @@ -6712,38 +6712,6 @@ } }, { - "ename": "bento", - "commit": "aad104fd26adb419c5da1e3472807244794e8949", - "sha256": "0a7yaikvaxxk8wmr7f9darpwb4r17rkzxcxaagfypn8n5kswddj4", - "fetcher": "github", - "repo": "returntocorp/bento-emacs", - "unstable": { - "version": [ - 20191024, - 2123 - ], - "deps": [ - "f", - "flycheck" - ], - "commit": "31546a03475fc2b3ffd3159fe1beda55f7762224", - "sha256": "0ny0bably9h4ak2fr01z4a80mp9kjalzhw232a92n8dvmz4b7mq7" - }, - "stable": { - "version": [ - 0, - 1, - 0 - ], - "deps": [ - "f", - "flycheck" - ], - "commit": "116839c7d50342e62a2832715ba850d8bf04362e", - "sha256": "0gxqy2l1a4pddh4pdci2nyflmv76rhl8wx3zmh5j0aqk5ahh1ln5" - } - }, - { "ename": "berrys-theme", "commit": "d7043d5fcdf995a6278c8a92aa451ce4b58694b3", "sha256": "1fn2n7li6fs9zibjzp07y6wdn3a64nsib8d23l7sl7jyzib6vbqa", @@ -7067,15 +7035,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210825, - 1743 + 20210903, + 1125 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "f4d9af720d3854ce0e746312061372ae30e2cc97", - "sha256": "0lynllvkyy9svi9c5gsqs5vyp0fgyq43a83drf67x0x14lfhdr1a" + "commit": "3af0fd5f4255e8c6ffd104cdfa6ab56f522fecc6", + "sha256": "0x7q3rp92w2698pllnjbn1x7bai8jmnrk72f02i4wjkdm1jwb2jk" }, "stable": { "version": [ @@ -7961,30 +7929,29 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210518, - 1244 + 20210831, + 1634 ], "deps": [ "dash", "expand-region", - "multiple-cursors", - "pcre2el" + "multiple-cursors" ], - "commit": "db1cbdcdfb3ea246d0d0090534d998f7c9c19f4f", - "sha256": "1saij86j2br814lp7yl4qpy2kaywdxlv08wxph464npx1rykykk3" + "commit": "05ccaad63d01688b86b7e44955815f97fc011ec1", + "sha256": "03fy4kwy6vka4w2hmfb6h68hxcm4gslknpdlxq4s8szww7a19cc8" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "270ae67b3136ac355d2aed5b4690ae28edaf7c29", - "sha256": "1ss9bjs34q41pa0g0nbdzd8fwpjcbd2239rdlx5aykfv9v0b8j77" + "commit": "d31550b3336d706b57df0e43bedf3e95a615ce0d", + "sha256": "18il2licf8pgfcrpx2bk55gpf8f537kb9cxqz83jldkhiyry74il" } }, { @@ -8002,8 +7969,8 @@ "epkg", "magit" ], - "commit": "018d5334b4c9af297799f0644e09946a13d55edd", - "sha256": "03h5cgsk3wxpw6g946ia0dbzazlbpip93zhirjh7vxcqp4wwyvcf" + "commit": "0ff7d7e469d75c26caed8d50ca80299cc4a77b88", + "sha256": "0jsk7dqminrx5l4npxv6ssyll07287ffzbpsim8d76phv279hdc9" }, "stable": { "version": [ @@ -8602,16 +8569,16 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210707, - 1745 + 20210904, + 211 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "25c44a39742b21122e1e2adf1f6c5828148cd3ee", - "sha256": "130304bmlz46z6g56bsr745zfb8mxw5kzkslb8vdz7hvcp75wfc4" + "commit": "7bc51345993ee83dc721a1e00cd0b998782b16da", + "sha256": "1ybdpz8cqfklia0m23c4l0dk6ng8jadxdji7z4ms8nkb35y2ykbn" }, "stable": { "version": [ @@ -9790,8 +9757,8 @@ 20210707, 2310 ], - "commit": "86ae7e69e2d07d5dfe9eac66c2b359d098c682a3", - "sha256": "0kvadcjrrj60p3ijbz6f51f2ziapig06zzmkycaahailhf9v1s0b" + "commit": "7cce94fc97d042134e5c7f96a3b9a509340fae1f", + "sha256": "0rq26qic7w8gninvg7jdkxpn8jv0ih215bijai2vsd66ca1ic6w1" }, "stable": { "version": [ @@ -9950,8 +9917,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210801, - 1509 + 20210903, + 1216 ], "deps": [ "ansi", @@ -9962,8 +9929,8 @@ "s", "shut-up" ], - "commit": "09c3851c118d2e850314e7f3b9efa786932a145b", - "sha256": "1fdnphlg9ip9cwvl1cxjhvlvgd9hxd5c466r79hrzq81vzn076cg" + "commit": "7b637efa35148dca5e6de10d0beba72168762f1c", + "sha256": "0sv08984k5lpcb56hs09pjwi54nzq232a6gwzikqxs2mylqdaic5" }, "stable": { "version": [ @@ -10351,8 +10318,8 @@ "cl-lib", "powerline" ], - "commit": "9c7c936e4e1de6f4f4095d70e43c9ae738d05086", - "sha256": "0h0v3yiz9qis99l83x588b94va13jzanfwacmgvq29ygp0a87n65" + "commit": "8b4249c40581368faf7bb8e06f86b9eee199c3c6", + "sha256": "185q3iplgycmq6zyyjn3aqq1gylvbb7r8zd1q9km2xl1fzg94jxi" }, "stable": { "version": [ @@ -10479,8 +10446,8 @@ 20171115, 2108 ], - "commit": "90bf324af47e6c607a4d7312a1c69701c2b180fb", - "sha256": "0s3sdvv3r93bz62sk7bk6bdrj5gx6qb9mqd7fd1gkcrryhwb05np" + "commit": "8c6b2b326ce7b454b31450d093776b9d0bfbcb19", + "sha256": "1pc5szlb06y27ivwgk76im72x0gq8gcn1p14gw0r3qx9krnj1vla" }, "stable": { "version": [ @@ -11126,16 +11093,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210707, - 2147 + 20210905, + 1942 ], "deps": [ "dash", "seq", "ts" ], - "commit": "524ba9592fc7095209e380392915b376f75bec00", - "sha256": "07fclq7dllz4nsrx51j4vrds1ciylxhkp9g945vc7xk6bi8syl4d" + "commit": "d673f00e5a43f8ac276b89c85622dcdf4cbd8148", + "sha256": "0cppwh15wb4kkhmqpi5cndvvyqlb6jjfj634cxlhkkvwbr0rmnjv" }, "stable": { "version": [ @@ -11192,14 +11159,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210617, - 1707 + 20210904, + 1359 ], "deps": [ "chronometrist" ], - "commit": "524ba9592fc7095209e380392915b376f75bec00", - "sha256": "07fclq7dllz4nsrx51j4vrds1ciylxhkp9g945vc7xk6bi8syl4d" + "commit": "d673f00e5a43f8ac276b89c85622dcdf4cbd8148", + "sha256": "0cppwh15wb4kkhmqpi5cndvvyqlb6jjfj634cxlhkkvwbr0rmnjv" }, "stable": { "version": [ @@ -11270,8 +11237,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210825, - 1937 + 20210902, + 1412 ], "deps": [ "clojure-mode", @@ -11282,8 +11249,8 @@ "sesman", "spinner" ], - "commit": "fd5232d03f62c2304daebbdbdf99f6ad860fa702", - "sha256": "1aj289145kza226xlg2zqi8m9wfrpr05xx6b6dvv1g9508jhxvw6" + "commit": "76dea32c7757949a708d27d1f8707782edad5650", + "sha256": "080kcbqiiikna4r6c9a1q0hnrlkpmzz4xixgrp54ld7nzp59ls48" }, "stable": { "version": [ @@ -11552,8 +11519,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20210822, - 1949 + 20210904, + 1235 ], "deps": [ "dash", @@ -11564,8 +11531,8 @@ "s", "string-inflection" ], - "commit": "299e52b2dda37960d609efa78c40e255001d163a", - "sha256": "0dqnyff2vfncw3ais2ml7k7lsdsrwjvw3kpynw9mb5si88sxh24b" + "commit": "7908e48a82dc615cc643d03e63107dcbf499caf8", + "sha256": "05900z5j1px6rnm1xby5krhz1j6rb4fqfhdzra31zs3zj063bq8j" }, "stable": { "version": [ @@ -11631,11 +11598,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210823, - 1603 + 20210902, + 751 ], - "commit": "9a0dcc5dad0b0796c8febba1470db49b3e845f2b", - "sha256": "13zl0bxnxqm6cq71lj02d906mpmmd1xpwji3d23fvy80nkxzrm86" + "commit": "09b618f73c47abebcd26c8fc8484a5816c36ab6f", + "sha256": "1ib748is5983fzgjpbdnki9x3s232gdw58af93jhw34kmakrlgac" }, "stable": { "version": [ @@ -11649,25 +11616,25 @@ }, { "ename": "cl-format", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy", - "fetcher": "github", - "repo": "alvinfrancis/cl-format", + "commit": "f62ceac846a4fb4ff380a799fb3aa7e52a097025", + "sha256": "14xpzp8jiaqdqybkijcm78gq298n32qf4lglq0i23sqfj68yw87j", + "fetcher": "gitlab", + "repo": "akater/elisp-cl-format", "unstable": { "version": [ - 20210824, - 2016 + 20210831, + 530 ], - "commit": "a391d7696bea972ad9a968426e712feddc284ef4", - "sha256": "191jkjka1pv2ssggk138gni38ckbndjlk344px3r1p0mnv3gmfaq" + "commit": "ad1a4fb6bc91e65ea90bcf6792cc5a1be5380f9d", + "sha256": "10z53j111wvgy0fbnxm3mpc9an75dblvy5zkq9733vjliycbbgv4" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "4380cb8009c47cc6d9098b383082b93b1aefa460", - "sha256": "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h" + "commit": "ad1a4fb6bc91e65ea90bcf6792cc5a1be5380f9d", + "sha256": "10z53j111wvgy0fbnxm3mpc9an75dblvy5zkq9733vjliycbbgv4" } }, { @@ -12580,8 +12547,8 @@ 20210104, 1831 ], - "commit": "e0a34750f8b7a014d021fbde0e860de5a5073473", - "sha256": "16nmp6arjdgd9s1jj2cnj5dak0sf5ass2w894d6xdqhk9mz8g1gi" + "commit": "86ee38d75678d68bb1a79b9fa443b42723b09f23", + "sha256": "1lqkaar17d4jvabhfwir6s47a618a3bhh18m3xvv08ryjw0nc3d2" }, "stable": { "version": [ @@ -12742,11 +12709,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210612, - 755 + 20210902, + 740 ], - "commit": "1bd650391a6fe84eb267f2534a0750ea1b5549f4", - "sha256": "0r0gp0i0mkfw035qrhpbjw3vdlyiffc5b9zmsmq93wcqvn459154" + "commit": "4e973e01220ad7a3e2d0d50a9c5192a9385e0ede", + "sha256": "0vqradjcflvajd5i069vlkynd6kyyfvmip39xr5bhrb4my07z1wb" } }, { @@ -12922,24 +12889,6 @@ } }, { - "ename": "colemak-evil", - "commit": "0f0750a3f9537782ee61d6e56c51ce7b86def12e", - "sha256": "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z", - "fetcher": "github", - "repo": "patbl/colemak-evil", - "unstable": { - "version": [ - 20200326, - 2359 - ], - "deps": [ - "evil" - ], - "commit": "981bdcb1a48c6d9139493abe7e25fabe126e43c3", - "sha256": "0dqyqaqr71z4mipb4g5jxdw96lzb108fd5w4wi27023hfll3j1hc" - } - }, - { "ename": "colonoscopy-theme", "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c", "sha256": "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q", @@ -13501,14 +13450,14 @@ "repo": "ddoherty03/commify", "unstable": { "version": [ - 20200921, - 2002 + 20210904, + 1106 ], "deps": [ "s" ], - "commit": "b1c1a06e488208ef653e0d86c97b746fd6d2bbc2", - "sha256": "1q843ay7zkci2xdavia6wkj06acn83a198ykpxl0xbl5wihdd6w2" + "commit": "d6656bd3a909917a51ba033a11d4ab5f5fe55f83", + "sha256": "1zbk2nc1qnryapsj68hlqmkn0ab7llzpmnls6y3s2656lxcn2b0k" } }, { @@ -13549,11 +13498,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210825, - 1508 + 20210826, + 2148 ], - "commit": "c7234a9df0b1a624ae0633d3a7d08f92109ff85a", - "sha256": "0i5xvi21gmqk2abpll761cz6g0g2i7s2gy63hvi2y3ac611fww2z" + "commit": "faf897296faed0b3342e1c325fc05727029ce7fe", + "sha256": "11qxc7gq97z9k1j63zrf4fh485qnapcz4qzjzyffwk8svl48gh0g" }, "stable": { "version": [ @@ -14659,15 +14608,15 @@ "version": [ 2, 4, - 1 + 2 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" } }, { @@ -15779,11 +15728,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210818, - 1128 + 20210905, + 1657 ], - "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", - "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + "commit": "c89fd0a1299f8bd6a123427c6ce48239702dfe84", + "sha256": "0425syvnw592kwmci87lwqvgxf9bvl8v6cmzdf4g3kkhva2y0sym" }, "stable": { "version": [ @@ -15821,15 +15770,15 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20210822, - 1829 + 20210905, + 1830 ], "deps": [ "consult", "eglot" ], - "commit": "a6aeb6fa078cc7ea6537793868f606b55ac63088", - "sha256": "11cwz2259i6fj4xckcvx8q8h3sgwxddjkddgiv7406d88m6ma72m" + "commit": "28a09cc839a9010df1a00a55528697ab34e1b259", + "sha256": "0vfr9cj2xzkpias7p25bl1yjbykg1lpphmn4a3p3sdmyh32zjy2s" }, "stable": { "version": [ @@ -16329,8 +16278,8 @@ "ivy", "swiper" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -17499,20 +17448,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210821, - 1939 + 20210826, + 421 ], - "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", - "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" + "commit": "fe8a68e9849fc7617e0c870cacd6599b8a797638", + "sha256": "1pry7p51qc0q4jpcsi60nxb9q7pkkc2gh1340mvbk62jj5f4qbbj" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", - "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" + "commit": "723a4ab2581b11f84d23f421faa06103864d2bc8", + "sha256": "1gdr1y8q93xr5vlx6jj95js6rmmsspq2bn870igbaijwwsn0sf7g" } }, { @@ -18195,8 +18144,8 @@ 20190111, 2150 ], - "commit": "8af0271186cc642436306274564986888d5e64c8", - "sha256": "0mffl15acpqv3n2hi73nav8jidr74lbps5mhl8vg5c6h3qm2y54l" + "commit": "2b52df4d75d185f7ac8b4230529e7fc2428a3605", + "sha256": "0ykzj10pcn3yfwxl8ydl2vj6mvk5gbwzs2zzagsn3zv29y7wqj0a" }, "stable": { "version": [ @@ -18403,8 +18352,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210812, - 619 + 20210904, + 2033 ], "deps": [ "bui", @@ -18416,26 +18365,26 @@ "posframe", "s" ], - "commit": "8ec7e98986ea46e3c36b7ecbdf9a6562c90c7632", - "sha256": "01lh0yy3zi87cjma2m1wch0ks45b0v6d05anxqsrpn4bladp8plg" + "commit": "3c4bb901bbcd4f8f58178075dc2422550a7f2834", + "sha256": "1zczmcv8562lachkvcwy6njn7zkgny08iznpmrx821wr8mh52wnn" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "bui", "dash", - "dash-functional", "f", + "ht", "lsp-mode", "lsp-treemacs", "posframe", "s" ], - "commit": "35db94e81c592246675f300aaca4a70966b8a5fc", - "sha256": "1d4hdydfk86d4slibigyhwng8wx3vzyap8hp5iv0h7wr6868m4iv" + "commit": "3c4bb901bbcd4f8f58178075dc2422550a7f2834", + "sha256": "1zczmcv8562lachkvcwy6njn7zkgny08iznpmrx821wr8mh52wnn" } }, { @@ -18604,26 +18553,20 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20210301, + 20210830, 0 ], - "commit": "43975c92080e307c4bc14a4773a61195d2062fd9", - "sha256": "0zpjrq3cra6q6pd52skm11wj0j75v8cnamv504hlq4rgd87vkz2p" + "commit": "3bac14200f9f8f8fcebc383087572da5c3823c34", + "sha256": "1vql8m4nj0brmv58b6lkbhykik8n6j4i7d3nylcls78y7ihc2cz8" }, "stable": { "version": [ 1, 0, - 5 - ], - "deps": [ - "cl-lib", - "dash", - "flycheck", - "s" + 7 ], - "commit": "d414a5faf22f7fafbb0a8208b88cecd6324704bf", - "sha256": "1qmdlwjmmqyyb65sqvfpygifai5m0llc815vp0jqwp8ldd8ls172" + "commit": "3bac14200f9f8f8fcebc383087572da5c3823c34", + "sha256": "1vql8m4nj0brmv58b6lkbhykik8n6j4i7d3nylcls78y7ihc2cz8" } }, { @@ -18670,20 +18613,20 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210708, - 2009 + 20210826, + 1149 ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" }, "stable": { "version": [ 2, 19, - 0 + 1 ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" } }, { @@ -18724,15 +18667,15 @@ "repo": "dash-docs-el/dash-docs", "unstable": { "version": [ - 20200516, - 1943 + 20210830, + 926 ], "deps": [ "async", "cl-lib" ], - "commit": "dafc8fc9f1ddb2e4e39e0b8d066c42d5d7ce8d06", - "sha256": "0n6d3mm43gj16v8kjjradcfik93wb89dsqnfcbskb28bvcamafid" + "commit": "29848b6b347ac520f7646c200ed2ec36cea3feda", + "sha256": "06yp1p0ir67vb2rpva6wvk3vyfxzl0bmrixikawwk6l2bph2z1x3" } }, { @@ -18749,20 +18692,20 @@ "deps": [ "dash" ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" }, "stable": { "version": [ 2, 19, - 0 + 1 ], "deps": [ "dash" ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" } }, { @@ -18773,11 +18716,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210815, - 445 + 20210827, + 239 ], - "commit": "3926b1b756fb0be5f84776f578a05d31a244d5d4", - "sha256": "146bddpj6w70i1579bh3qdx0lphyfq2zhlhal5mmbcalrd6c785h" + "commit": "f7287f026103a44cf290fe737b6b9d841eddcaca", + "sha256": "184pa120is5jk71174bna61yii2pmdkj1m6r7v16pzvqg5zqbsgj" }, "stable": { "version": [ @@ -19159,16 +19102,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210510, - 416 + 20210830, + 656 ], "deps": [ "dash", "s", "spinner" ], - "commit": "341331918cc83b6cabf7ae91e8dba5b0de57b285", - "sha256": "15x0v6s67wz7bql5z57xy2wbklc8b6nb166yswdzfdvrv5301ri1" + "commit": "4ec21e644ef482a913c64f068ec8d602eedac1c6", + "sha256": "1ipjdwnf6c9qdwg4klkf6g06jj4lgap75ms5yq6a0gg2075d84jk" }, "stable": { "version": [ @@ -19777,11 +19720,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20210818, - 1622 + 20210904, + 1759 ], - "commit": "19f897f03296fba882a7697d438f0e13529718ad", - "sha256": "0vygmqb7xwlmsl9in0qxnfrl0gjkjaxxg9xnxg55y55k1sf4wlbc" + "commit": "df9cec79ed6e7147a71fcad84835b928375047a7", + "sha256": "08zl01vchv6vdixqk021iwjvfbk125vh2ww59mr36cs8ibd887va" } }, { @@ -20009,14 +19952,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210811, - 28 + 20210831, + 118 ], "deps": [ "cl-lib" ], - "commit": "dbd46bf23c2efc466a640a7e398ca39a51c1145e", - "sha256": "003ks20f0n1w5h8vzsqknzbddrfih036is6q1n43zgqdnh3mlzld" + "commit": "a682de60187763128d2d0a85f1d168d89877691f", + "sha256": "1bcswy1mkpp0ly36l65amq4f8gyarm2gmzv8v8h6s96vg433nwkb" }, "stable": { "version": [ @@ -22018,8 +21961,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210804, - 1308 + 20210829, + 911 ], "deps": [ "dash", @@ -22029,8 +21972,8 @@ "tablist", "transient" ], - "commit": "a13ff981746fc69b0b0607e55346ef85207d6ea7", - "sha256": "12b1ha8rk8fs3234qvpbc0sp7qa6lbfpf78fvrv7yb1213kxs133" + "commit": "f050d64c81575429c3c5562a1c8efddfb1ac22b4", + "sha256": "1izy99and0jm7dmmgv9zjy4586xzi15dpa789fl2yw6xc7609khy" }, "stable": { "version": [ @@ -22163,19 +22106,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20210404, - 2224 + 20210828, + 1805 ], - "commit": "ad06a41259ff2961d603bf23a3a8fbd22dde2161", - "sha256": "0p6byqjfzlq3g5ql77zghljj9vmnm9q2ffkjls1rv6q5rdj7p8c1" + "commit": "628315e2e4ab2f269548126444234caa057b2c75", + "sha256": "09pd8mfa45fy95mdg52fsafj3d1d5l52rskmw6q5np59dyzwch1b" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "ed1d04c89cd8b53963f2dcae7cb3a46967e0abbf", - "sha256": "1ypkihd9si769r6k0lfrv8jq8mjv4gyhiwyi820sayfppvma5rj0" + "commit": "628315e2e4ab2f269548126444234caa057b2c75", + "sha256": "09pd8mfa45fy95mdg52fsafj3d1d5l52rskmw6q5np59dyzwch1b" } }, { @@ -22269,14 +22212,14 @@ "repo": "alphapapa/dogears.el", "unstable": { "version": [ - 20210819, - 59 + 20210903, + 514 ], "deps": [ "map" ], - "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", - "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" + "commit": "00dd88cc53d3a7d6ddeb3c6eea2c2a37d9b610d6", + "sha256": "196gh32l18laawqypc9l08pmqrs48lj5g4wj2m1vl4c13mff5giz" } }, { @@ -22425,15 +22368,15 @@ "repo": "elken/doom-modeline-now-playing", "unstable": { "version": [ - 20210202, - 1948 + 20210831, + 1442 ], "deps": [ "async", "doom-modeline" ], - "commit": "bed9e4da626ede148c7d362188b2e7729e2a8a4f", - "sha256": "1rz50wyinj9nmz37wam4rsdi5igmvdfp6pwn3rmzqsrdp3j81smv" + "commit": "ef9158dfdf32e8eb789b69e7394d0bddaa68f42c", + "sha256": "1namv6qfmf5xxwbhsl5887cp41y8krr7g9vf3dzvi5n924ixlm2l" } }, { @@ -22937,8 +22880,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20210227, - 2121 + 20210906, + 46 ], "deps": [ "cl-lib", @@ -22946,8 +22889,8 @@ "s", "seq" ], - "commit": "2a2a635e2b1d8243a41df0450e45fc8c75c6674b", - "sha256": "0kd8lkvaxqaz4ns8mwyczbbjyi68r3gicngnrichwlbl27am1zvm" + "commit": "1e871c7675e7617ccd1bc7186a15ebe577dac46e", + "sha256": "0chaffjwbqlrbhf0if817d5ril7xhyzwf72ik3yldyrymwknnbfh" } }, { @@ -23108,8 +23051,8 @@ 20210715, 548 ], - "commit": "d6e490c24dfb4607080b6a41930bb9d378bc2a43", - "sha256": "1kq8griallh81wkn91j6kr0gi9y417gakhhfrzzby5gi998lijyb" + "commit": "fd81ea25790c7134032f1d43df0fc84cbaea979d", + "sha256": "0qv1pybkx22m5vdf499sl7wrwx6c97wwdl1cxv4ld6cnsjbrx1r6" }, "stable": { "version": [ @@ -23644,6 +23587,21 @@ } }, { + "ename": "earthfile-mode", + "commit": "3df5031b52e919ace5b07c588eec343ed35cb416", + "sha256": "1gcdbfzd0v5rs6wfssh8dgby9rmgyar2zqphh2whjvzqp95axh5g", + "fetcher": "github", + "repo": "earthly/earthly-emacs", + "unstable": { + "version": [ + 20210903, + 230 + ], + "commit": "16f262dbeec1e0b9f7f3a6a7cbafbed76e39d8d8", + "sha256": "0j359dvmgkwrwcx24ncg34sfyxmkharpsniszmd7gjl2cq8sjja2" + } + }, + { "ename": "easy-after-load", "commit": "384ffc463cc6edb4806f8da68bd251e662718e65", "sha256": "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys", @@ -23859,14 +23817,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210809, - 1349 + 20210902, + 2151 ], "deps": [ "parsebib" ], - "commit": "831ffcca35601e169c0778035688c5d17d138b58", - "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" + "commit": "85da632406297f7289b9bdd3803684575cfae886", + "sha256": "0hbpchpmby54jp5xflj8ckdcpjj9chyhl6fkk7ng6l0rgzxi1z30" }, "stable": { "version": [ @@ -24348,15 +24306,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210813, - 1301 + 20210830, + 1025 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "375418d1d63f6ec780876593181b6d39054919da", - "sha256": "1lqxgc24gr67yhi64i9v4w2dcjhpx99jg1kr25gr2byqkkdldkz0" + "commit": "2ab86dc9a8ed7a669ca348252d4af46522b5c411", + "sha256": "1ii93vw55vqik765sm79gvlhlnp9xgqzml2ibwwkrfgz7gip9i0m" }, "stable": { "version": [ @@ -24723,8 +24681,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210817, - 912 + 20210905, + 1905 ], "deps": [ "eldoc", @@ -24733,8 +24691,8 @@ "project", "xref" ], - "commit": "a697084d8dfe29783985f298d38863ea5d59c632", - "sha256": "10x0jnhdn7565nkp134jmadcdgq36436rvd5zbc8187hc9j90396" + "commit": "c17bdf6c98d6bf0f1a85f1175556e1038654402f", + "sha256": "10liic4skqd5qr1zw18k0kx50i2m5pa90vc4yypli5c6bpadsyq4" }, "stable": { "version": [ @@ -25045,8 +25003,8 @@ 20210613, 1418 ], - "commit": "ec47ecf257bf010cf1f3061e2061c26f78e61540", - "sha256": "0l7z9dn5gpscvpizj0pvqcn36jhjcr7s1xr4x6fg72alw2bg71dk" + "commit": "b5a5a405d04f61ec9c5fcb19357a50a4b9e36a25", + "sha256": "1w6ps78saxdvx64a2y1vvzn11mvb6bw9657zfin0yibh2s91hqrk" }, "stable": { "version": [ @@ -25560,14 +25518,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20210320, - 1511 + 20210906, + 1235 ], "deps": [ "dash" ], - "commit": "ecc59d313dd9ddfc4d6a2a3c7a9374aaf214e653", - "sha256": "0qy8s0vqaxkksplasang3n9bqnq7q43lfyd0jl39nynlrg8avhpc" + "commit": "14def81d88bf4344a335e68007324e3f3ef5c435", + "sha256": "1p4kpxq8fvdcs5za79c4pzw1g8108kyfl9rcybs0g75fjxk1f2jb" }, "stable": { "version": [ @@ -25850,26 +25808,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210805, - 1535 + 20210831, + 1423 ], "deps": [ "elfeed" ], - "commit": "53d4154c7d993ea5424535b3f0c4e9e75388e36e", - "sha256": "0ffv2adqnnyvwc6axxi1j32l36q35iddmcazpczh2js2hzp2gw51" + "commit": "2c8093e83491b9191115276e649dd87438726348", + "sha256": "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9" }, "stable": { "version": [ 0, 8, - 4 + 6 ], "deps": [ "elfeed" ], - "commit": "1842f26d7ab520acbc6f491bc8e064af67be7a6b", - "sha256": "1whf7nxfpb003wk9v15ib4xy1a7dfygdkg7jf3ly5z5l81607ap8" + "commit": "2c8093e83491b9191115276e649dd87438726348", + "sha256": "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9" } }, { @@ -25927,14 +25885,14 @@ "repo": "TobiasZawada/elgrep", "unstable": { "version": [ - 20210205, - 733 + 20210829, + 1619 ], "deps": [ "async" ], - "commit": "b627cc0f307161e580e9450ad5334687b9406a16", - "sha256": "17nbjr5dll5n0m52p3isw8gkkza5iqxlhamhv7x61vjd8w72gl3d" + "commit": "ed1ddf377447a82d643b46f3a72cbf5ecb21fb4b", + "sha256": "0na0s42ifv260mbv1djn7yqalcsyahsgyqrqf8lvxc1qbiisrzxv" }, "stable": { "version": [ @@ -26406,20 +26364,20 @@ "repo": "sp1ff/elmpd", "unstable": { "version": [ - 20201107, - 428 + 20210904, + 7 ], - "commit": "0d0456f2b9bfffbe452b6d94b9cd8798c52fc80e", - "sha256": "00qkkjd397y0mlank1hwqvfhp4m53rs5jpd8gfcyjl53ka9dg587" + "commit": "c9e413fcb6c526c86e1a64d45c7ea94aceca4e6e", + "sha256": "1vxdavimnd34ivkx40xnnr472b94yz5l12g9xi4i21p1x0kqqhwp" }, "stable": { "version": [ 0, - 1, - 8 + 2, + 3 ], - "commit": "1356343300140a77f462e690045584c85bd05c94", - "sha256": "0iwmn54v78fgch6cx9qp3cpdfqifqs6g36203xwqmkb4kgvwsg7m" + "commit": "4b42a90610fdb05ac1a2811da5acd55493715795", + "sha256": "1nj310mnckf5mpqici67jzdydbby50la6g6vq7qdaji0c98c335b" } }, { @@ -27275,11 +27233,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210823, - 1719 + 20210905, + 1435 ], - "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", - "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" + "commit": "d21277a638827623ab84e9e6341312a2da5062ab", + "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" }, "stable": { "version": [ @@ -27298,15 +27256,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210816, - 1819 + 20210829, + 1334 ], "deps": [ "consult", "embark" ], - "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", - "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" + "commit": "d21277a638827623ab84e9e6341312a2da5062ab", + "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" }, "stable": { "version": [ @@ -28388,8 +28346,8 @@ "deps": [ "dash" ], - "commit": "831fcaced262a9dd650bc80241c8214d57de4cdc", - "sha256": "1rgkczdz4ppi0h87vbx10h574xfqn1ba09j3cswhvkxm6w1hram4" + "commit": "f9d741baf42232125663c1d27e01ec04ab0ca85f", + "sha256": "0cxax1dgznzvfzwy00spqi609q93gxkabcy6jm6009029gmsdhdr" } }, { @@ -28879,8 +28837,8 @@ 20200914, 644 ], - "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", - "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" + "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", + "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" }, "stable": { "version": [ @@ -28903,17 +28861,17 @@ 20210315, 1640 ], - "commit": "988e8112a6db6f5e16380df30f1aa52b1b233662", - "sha256": "0j3b9cd2hzf2i8lzi2xy39bj2q2fqgcsrsim4viknqsv6awqw04y" + "commit": "2ef0ca21ddf75c28b6a1ca07d20c33cbdc24e853", + "sha256": "1dzj8frv80lx34chv94ksm83749l7f8195iy337vcpbvgpzf4arf" }, "stable": { "version": [ 24, 0, - 5 + 6 ], - "commit": "a29aeb16660f2a91aaa24c474d57c6ee7754ee0a", - "sha256": "153kg6351yrkilr4gwg1jh7ifxpz9ar664mz7vdax9sy31q9i771" + "commit": "163593593441984f8446f513bdc7684ac5fe067e", + "sha256": "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z" } }, { @@ -29219,14 +29177,14 @@ "repo": "dieggsy/esh-autosuggest", "unstable": { "version": [ - 20210224, - 2242 + 20210906, + 1446 ], "deps": [ "company" ], - "commit": "30203fc7b8b63a489f34f74ca8b041bf61f4358f", - "sha256": "0w34m9va83grw5j566i5sdgkz475fhf3hibx9p1m0a92p1mg9v8s" + "commit": "bf676b137d35553debe32ff134dbec25f3978ae7", + "sha256": "1m255pgi2zlkjrjr3l8gk76qc5543qnaxqrwgcpb2z9gq51ivfw2" }, "stable": { "version": [ @@ -30360,15 +30318,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210810, - 844 + 20210902, + 2016 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", - "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" + "commit": "82e5becae21b7768ffbb4728bce83dab8751d610", + "sha256": "1jkijmfr5bvvp7yl3rdyg9yqp2za855hiymbrpy0cvqljddjs0zv" }, "stable": { "version": [ @@ -30562,15 +30520,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210823, - 2212 + 20210904, + 830 ], "deps": [ "annalist", "evil" ], - "commit": "0a836facbc1f917c863699eea3eaecc78ac81686", - "sha256": "0zrg4yj62vfpkffz0219ibwqi1yyadj9aaa6qlyz8z6bjg0d7vjz" + "commit": "869d056dcab5eb9781824bcd591bf946969b8b41", + "sha256": "0vm5xncxvnys957pxq6ih6bz65v65aglpjavbf5lypycwjq55iqn" }, "stable": { "version": [ @@ -31888,8 +31846,8 @@ "deps": [ "evil" ], - "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", - "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" + "commit": "82e5becae21b7768ffbb4728bce83dab8751d610", + "sha256": "1jkijmfr5bvvp7yl3rdyg9yqp2za855hiymbrpy0cvqljddjs0zv" }, "stable": { "version": [ @@ -32073,22 +32031,22 @@ } }, { - "ename": "evil-textobj-treesitter", - "commit": "949eb5d82e26e37685c3155b22b329e387f0fd59", - "sha256": "1mxx6fcj7k1k9gnjgcs316x92jdicsrx6l584vkzx09h7fz2p4da", + "ename": "evil-textobj-tree-sitter", + "commit": "fcddf8865ace77c50846d55ac77c615bd8f3af63", + "sha256": "1zns7rr449m186h8br4xv77n26qjdq4whc2nyil8lmkhixr3q4ny", "fetcher": "github", - "repo": "meain/evil-textobj-treesitter", + "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20210816, - 355 + 20210904, + 1350 ], "deps": [ "evil", "tree-sitter" ], - "commit": "461195b882b2179a0e6f8efcd37835ab2a0ed5e2", - "sha256": "1yndxnxx842mhfjqs39i5wz1khm1sha2dr1nhzhi60mz4ywyqyl3" + "commit": "a315a8832fc170c163be01c31b625b19641ce20a", + "sha256": "0msg9kpj4sajcszjamb8gqbi9hdhybsg1gdajprzg0p5z09sv863" } }, { @@ -33215,21 +33173,6 @@ } }, { - "ename": "fakespace", - "commit": "778dbe1fd1d2ecebb499ad66bc950e586f231c52", - "sha256": "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27", - "fetcher": "github", - "repo": "skeeto/elisp-fakespace", - "unstable": { - "version": [ - 20120818, - 6 - ], - "commit": "d1bd1f4b14b2690d7a67f9a52622ec51ed84813a", - "sha256": "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs" - } - }, - { "ename": "fakir", "commit": "d0a8abd5fd77a14b957f53b5bc8474403cc1e18f", "sha256": "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25", @@ -33280,14 +33223,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210823, - 1838 + 20210901, + 637 ], "deps": [ "popup" ], - "commit": "f3b05ad56688f2ca13db053e090a1273cf2deed0", - "sha256": "1hj15wi9jxwjamz345jssx9gd4m9cbdisvmq7mg5vhk89k4h0mvd" + "commit": "a2e8449e4ceda45adc5ab7b7d2225c2cc3765371", + "sha256": "165mv9v18fyyha4b27yhardb1k8i30qjchz1lgrfnzv15qv0d7yg" } }, { @@ -33345,14 +33288,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20210820, - 423 + 20210905, + 1203 ], "deps": [ "s" ], - "commit": "5f4fd0dbee514bada012ab3ecc9c767b8910828e", - "sha256": "1lzmhn0bn6qjyq441bp39gq4wd1xvrcygzrfm6v6srywb6s34dm1" + "commit": "352fc9ae3230e87470fcbb638d623169c2e582f9", + "sha256": "06w54klzl9781bxmxhx0vhj1yj6ym8i68fb1bry9yhy8r3qamyip" } }, { @@ -34148,6 +34091,48 @@ } }, { + "ename": "finito", + "commit": "4b6af066aedc1cc3116d6efe2aeb9ffa375edaae", + "sha256": "0451nqkz7riqaz5apzxn2ff0mr3484srx9y54hj9vpdmmvp1bfd0", + "fetcher": "github", + "repo": "LaurenceWarne/finito.el", + "unstable": { + "version": [ + 20210904, + 1352 + ], + "deps": [ + "async", + "dash", + "f", + "graphql", + "request", + "s", + "transient" + ], + "commit": "0895002dfacdaab9010a35c190139384935cb4d0", + "sha256": "0cg6axjv41da3ryxq2vszhn8f7jslc8ipf8izh1h7ldg2li5kz9c" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "async", + "dash", + "f", + "graphql", + "request", + "s", + "transient" + ], + "commit": "bf720fec1fcd46664dce66a667ef77a1c80ef89a", + "sha256": "0q55ny88rpc2xrnkbpmifb9nnshjlx69mwf6kvxqryljvcjbk69y" + } + }, + { "ename": "fiplr", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", "sha256": "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca", @@ -34209,39 +34194,6 @@ } }, { - "ename": "firefox-controller", - "commit": "70a69c20f8dcf73c878f2172dcc9f1796fdc0408", - "sha256": "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6", - "fetcher": "github", - "repo": "cute-jumper/emacs-firefox-controller", - "unstable": { - "version": [ - 20160320, - 1847 - ], - "deps": [ - "cl-lib", - "moz", - "popwin" - ], - "commit": "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f", - "sha256": "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp" - }, - "stable": { - "version": [ - 2, - 1 - ], - "deps": [ - "cl-lib", - "moz", - "popwin" - ], - "commit": "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f", - "sha256": "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp" - } - }, - { "ename": "fireplace", "commit": "4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609", "sha256": "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw", @@ -36090,8 +36042,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20200927, - 1603 + 20210829, + 1143 ], "deps": [ "dash", @@ -36100,8 +36052,8 @@ "let-alist", "seq" ], - "commit": "f04842252babd37c0ac60e069272a3477b538332", - "sha256": "1icvbc3f8mfpm1p4s7qcvkl5q5p021jjinmbc5js46xgsl3bjkr6" + "commit": "16b748c033e30216259fa8c9c23616db36750a58", + "sha256": "08agklr9mw4rxr5mq9c5ynhqsjp5knc7571rnr19iziq33r8srl9" }, "stable": { "version": [ @@ -39334,8 +39286,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210822, - 840 + 20210906, + 1234 ], "deps": [ "closql", @@ -39348,8 +39300,8 @@ "transient", "yaml" ], - "commit": "a3e6f8aab16a8213cd389fe79d8c02300d26cab7", - "sha256": "0n6p63kfibpz4161wb2f6516ncv3h9algxlgdgrd5lsnn0ympr26" + "commit": "86e18914eac706928e66705418c765f34d077703", + "sha256": "01i8vb120vn8wmiscyjhk3zl7qk0zrnydkq4d282w9b5sqzrgjpp" }, "stable": { "version": [ @@ -39488,11 +39440,11 @@ "repo": "larsbrinkhoff/forth-mode", "unstable": { "version": [ - 20210123, - 900 + 20210829, + 1824 ], - "commit": "f44fa6481ffe2b4321d462c3fab78a858f2a8ae9", - "sha256": "08p9ddxs3ya7an2p485wrw5ywimbgnqrihriyc4aaq963zpssk2c" + "commit": "38d5152011ee67e0cff9d4a5ddfb1f908e5be013", + "sha256": "09irbi8z1p2006abl4fnkyfj3c16nzzf55wqighlc2ri2v8bbisb" } }, { @@ -39554,8 +39506,8 @@ "deps": [ "seq" ], - "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", - "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" + "commit": "60f4dc4f02a8ea222abcd51556163e7861f0fbe8", + "sha256": "09i4ilwgrnw8ymlzd4rzwnbhwz0c7axrlr2pn0nmzp3v60lhxnl2" }, "stable": { "version": [ @@ -40391,11 +40343,11 @@ "repo": "10sr/fuzzy-finder-el", "unstable": { "version": [ - 20200909, - 907 + 20210906, + 217 ], - "commit": "c19235a35db076eebb5ad31fb42daf6520620f6d", - "sha256": "0nwbvgj2z15g88d9mgbc408xhsf3wx8r1ky70cgn7kqfv4wvd25n" + "commit": "915a281fc8e50df84dcc205f9357e8314d60fa54", + "sha256": "15b6nbkv8xpvin8i1443s1mnpag5p33asgwpxijrmwp3xm2xkyl6" }, "stable": { "version": [ @@ -40507,11 +40459,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20210619, - 1421 + 20210826, + 140 ], - "commit": "c975001725e4b7f58dd9379a64c170f07734af59", - "sha256": "01d303vbn7vvhl1g1wpmpy90h5vaj3yimzgmhnmswc2qc2s3cnhq" + "commit": "e045e7ede6a3d5f792cd11efe5e83cf60d8081bb", + "sha256": "0y4abgwcb28dpnzqcl2dylymnkg1v91nrnpsrly0dp8bf0aiafrq" }, "stable": { "version": [ @@ -40695,14 +40647,14 @@ "repo": "ahungry/geben", "unstable": { "version": [ - 20170801, - 1251 + 20210830, + 422 ], "deps": [ "cl-lib" ], - "commit": "ec3f5e9376cf1ea5615990bd8c212543d57f033b", - "sha256": "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d" + "commit": "d3706387ed25b3037338572f3968b4cc2d8825a0", + "sha256": "05kvg13mknn4xgzik637kgg5qa7qhz3626v2ny2p86lga1pzm3yq" }, "stable": { "version": [ @@ -40775,8 +40727,8 @@ 20210808, 16 ], - "commit": "77d4c3a91c0acdb16cefa8a3e0efac3435aebdc0", - "sha256": "07g1zlf9kmfish2wa6m376xba0nv6n4spw8wbmr90a56xj0qpswc" + "commit": "327ff01e5b9c6e019fdd0cb710a4c19082249345", + "sha256": "0vis470dhk7adpxr335wq33jv1035sd3vj1cxdq3jsx8biqas4c1" }, "stable": { "version": [ @@ -41082,11 +41034,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210611, - 1833 + 20210901, + 1406 ], - "commit": "97e096ab2400bbe3c0f6d19fb49bd952f2f14e03", - "sha256": "1l092mhpv8dg00ln4yv040kmha7556klm5bqfdvc9ysjnfiwprkd" + "commit": "0a02e97cc2ce2ddd97c7624187c7e7b6ab2e9fe7", + "sha256": "18vd78ya03d3x7aib2x7d3snripi7r5xrkyi7vm2xxzx91fan4rf" }, "stable": { "version": [ @@ -41224,6 +41176,21 @@ } }, { + "ename": "germanium", + "commit": "6cc59833eeabaa1bb4347f158e8794683dc3a15e", + "sha256": "0g5lqdgnv720l0s41ql5jx3gvzckw0fhgdmn3f46hckwpvvhrmah", + "fetcher": "github", + "repo": "matsuyoshi30/germanium-el", + "unstable": { + "version": [ + 20210821, + 1813 + ], + "commit": "88a14826695b60ac218c2b3beadba0dbd89bcd60", + "sha256": "1h85zpli5ysbfx6j0ajmkyngmj1nq6qwkx94kl0risamz8lxvk7r" + } + }, + { "ename": "gerrit", "commit": "3b966a2476cf10234686e49d808bcbabe0686891", "sha256": "1ikkd2xjr1n8p43pwycfrsfy9fkib83mf8l0p4bjrjszfcb9ln4v", @@ -41873,8 +41840,8 @@ "transient", "with-editor" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -42085,30 +42052,30 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20210730, - 1037 + 20210905, + 1208 ], "deps": [ "dash", "f", "hydra" ], - "commit": "07f0846fcc92b6c2fdd61db8aa959effd0e23d9d", - "sha256": "1bk1cvll02348d7dwq6dzdm0ykbxf63p16jq8j07q148qm07yf0h" + "commit": "e2620767694d8cd2860b632c47fbe92e20a9ef14", + "sha256": "1wyfszd9jzg6c7lbl2rw7xpbr6fr4rj70h0jyqnwz081j9w92bb1" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "dash", "f", "hydra" ], - "commit": "d5b8dcfc9f93aecfcd9c6fb212742c165d48173f", - "sha256": "1dblc0vlnkm1b16pgi40yr21wh45larb7818l9q8p9nbpxcjinh2" + "commit": "e2620767694d8cd2860b632c47fbe92e20a9ef14", + "sha256": "1wyfszd9jzg6c7lbl2rw7xpbr6fr4rj70h0jyqnwz081j9w92bb1" } }, { @@ -43282,11 +43249,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20200108, - 1633 + 20210904, + 509 ], - "commit": "7f84eb307e9765fadcd1e0a9201ae562724ef1c9", - "sha256": "0aqlgsl19p2vlagdvahxxhqdcvmr8g7wlziwjvm2pina3lqfw4wc" + "commit": "c1203e8ff655ba776ecdc49b3420aaed4bd37952", + "sha256": "1hicrnwn4z0q0v39qdhfwgailgy6fw433gvk70pm779npp2zv90s" } }, { @@ -44776,8 +44743,8 @@ "magit-popup", "s" ], - "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", - "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" + "commit": "e49ad93a11f6e0528d1dc2b6d6d4ec2a131636e0", + "sha256": "0hs2vk9fp860y2fldr6d85hlpizccj0v5a7bjmkirvfnk2w086mv" }, "stable": { "version": [ @@ -44951,16 +44918,16 @@ 20160504, 911 ], - "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", - "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" + "commit": "84f89b68ec8f79bce0b3f5b29af155a85124e3a6", + "sha256": "1pfaan0chvxpvf1zp3inpx47smm7rb22q4cklhw27n70cqh6qix5" }, "stable": { "version": [ 2, - 0 + 1 ], - "commit": "d7b362e6186d263ec3eefc141dbb5b27a8773f24", - "sha256": "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2" + "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", + "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" } }, { @@ -45504,26 +45471,27 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20210510, - 317 + 20210831, + 1601 ], "deps": [ "dash", "s" ], - "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", - "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" + "commit": "84f89b68ec8f79bce0b3f5b29af155a85124e3a6", + "sha256": "1pfaan0chvxpvf1zp3inpx47smm7rb22q4cklhw27n70cqh6qix5" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ + "dash", "s" ], - "commit": "d7b362e6186d263ec3eefc141dbb5b27a8773f24", - "sha256": "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2" + "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", + "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" } }, { @@ -46061,25 +46029,25 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20210519, - 108 + 20210901, + 2129 ], "deps": [ "s" ], - "commit": "f9315be69954b95b6a3ceaa37f31a88f8369a59f", - "sha256": "060cp88snnp9059b382nkfbj8b5p5wm360vjrcrpny08d0dfj7pj" + "commit": "4c1c2b093970b92f8589b061759288c0deb228c9", + "sha256": "1lyp42d6j623v78sw9k5awj6188wgbsmpbj1izknisp0cnih90av" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "s" ], - "commit": "4e50d9f46b044c0d885af3a486bf6275c121f29e", - "sha256": "1s06m8bam7wlhqw0gbc443lfrz51mj05pzvbmjzqadqn4240v4jw" + "commit": "28b6d43bbd8bb81f101ea4e95be2e40260c02ae8", + "sha256": "0vcv66413i93mi1w7jszkxb47dfjw1ngdwysjlpw5wzl8xkwrcm1" } }, { @@ -46843,16 +46811,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210822, - 1700 + 20210906, + 651 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", - "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" + "commit": "3fe4076076eea8d244793b80a0274de0d685bd9d", + "sha256": "0kwa2aabbvkr5wyp339ajrkwn4rk6gwq52ly86fskyq0n7263n7b" }, "stable": { "version": [ @@ -47751,14 +47719,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210822, - 952 + 20210906, + 557 ], "deps": [ "async" ], - "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", - "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" + "commit": "3fe4076076eea8d244793b80a0274de0d685bd9d", + "sha256": "0kwa2aabbvkr5wyp339ajrkwn4rk6gwq52ly86fskyq0n7263n7b" }, "stable": { "version": [ @@ -48059,8 +48027,8 @@ "dogears", "helm" ], - "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", - "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" + "commit": "00dd88cc53d3a7d6ddeb3c6eea2c2a37d9b610d6", + "sha256": "196gh32l18laawqypc9l08pmqrs48lj5g4wj2m1vl4c13mff5giz" } }, { @@ -49381,14 +49349,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20210729, - 911 + 20210906, + 738 ], "deps": [ "helm" ], - "commit": "d861fb407d72470db41ac458447b92c6d9b00206", - "sha256": "13hxglh5w70w5y7x4r7rqpa7npj4lfrajjjic8vizn71752cndkg" + "commit": "178192296acd59c53d933dfa55e8a27b8ce802cb", + "sha256": "1wrnjzj53n78bll3jlqr7gwlx4x2awxh2zr34y9q02izlgvwwq4z" }, "stable": { "version": [ @@ -51518,14 +51486,14 @@ "repo": "duncanburke/help-find", "unstable": { "version": [ - 20210822, - 1704 + 20210826, + 928 ], "deps": [ "dash" ], - "commit": "b1d15676c5bc348821256ffa5aaea308f6f28ad4", - "sha256": "0pz6wxw0p4d5zfz2mb9f7mg6k25iqhik428yia3n77ra80jx8ncr" + "commit": "576d6505b9e42f50f121b1a6a675f17f03a04406", + "sha256": "064asvq6hfmrh3fnkm8dnarwmdgfm8f97mjng1bkf13wmnzglhck" } }, { @@ -52587,11 +52555,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210615, - 1505 + 20210828, + 1225 ], - "commit": "5ac0076cfeaea57f7c7a59d9d41a34c1bdc4b22e", - "sha256": "1h3h62rglgwir3jfy6wq9hkwlx6z28cs9dz8jv8xgpk1jsj89whw" + "commit": "d13a0892645536b970ce130a01ebe5f62e04689f", + "sha256": "0fw0qwxrc05paq17vdhvvwlzwrl351js8wf4mc5crkhahry9608a" }, "stable": { "version": [ @@ -52981,8 +52949,8 @@ "deps": [ "dash" ], - "commit": "c9c0593b2bffd6a494f570d707fe8d4e97718da4", - "sha256": "16baysl5qpcl48gd64g7sq0bpdhjw21az7r7w21gfj12s2njqydf" + "commit": "d0f03552c30e31193d3dcce7e927ce24b207cbf6", + "sha256": "0ynf26gaj7n6cg0vgykq80hg21lxlwffwcssk9ppin0rqmc74m06" }, "stable": { "version": [ @@ -53020,16 +52988,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210816, - 507 + 20210903, + 201 ], "deps": [ "org", "promise", "request" ], - "commit": "4f3d70009c1368174355ca7a5eb1259f18ec5f34", - "sha256": "0j8i6c21jzdc88bvdsbshxgv62wvl95kham5w6kfkrlj0ld8i8yg" + "commit": "61489045a1b1982d9bcd307fcc5bbd9195133c06", + "sha256": "0crzd0qyq751rlljs31vxblyvjcyjzfnj2x78rmqp7vj6hyr7xfg" } }, { @@ -53346,11 +53314,11 @@ "repo": "pnor/huecycle", "unstable": { "version": [ - 20210706, - 205 + 20210830, + 340 ], - "commit": "c343b2085dea11b820d4da6c6183e1102ec08698", - "sha256": "1bdhm9j2dammw5dzr8gh4wg5pkl7c706jqdwd43my7zsn2ipar24" + "commit": "a05e32351dcff3e61b5f15800556adfe1939c112", + "sha256": "1qnid40hmz3yw5jr1i9xr91d57hjh90s98js48nk6m0sjbkkbb4r" }, "stable": { "version": [ @@ -56233,14 +56201,14 @@ "repo": "dotemacs/ipcalc.el", "unstable": { "version": [ - 20200809, - 1444 + 20210903, + 958 ], "deps": [ "cl-lib" ], - "commit": "58b2b6c90af93ae46c5445b33ee4d1ef4bac1efb", - "sha256": "0v6ahhixp57p94m0sagidvq95m45bf4lfwszjzsn7a2wcrvap7r9" + "commit": "8d5af5b8e075f204c1e265174c96587886831996", + "sha256": "0a7rw26ibhmlnf9jjs6kf610k566mqzjvbd9rlmpwpi8awlfflky" } }, { @@ -56690,11 +56658,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210730, - 1743 + 20210903, + 1814 ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -56721,8 +56689,8 @@ "avy", "ivy" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -57089,8 +57057,8 @@ "hydra", "ivy" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -58257,8 +58225,8 @@ 20210615, 41 ], - "commit": "d7660096e7d49f9b2ebc8924c0f5b39c5ffa8c86", - "sha256": "1sw1cgykq9i6wdjjlqlw6jrdxnic615k96lbqyir84fizn55qcja" + "commit": "73aebe62e8adf8e737c9a94361cce45063d05ae4", + "sha256": "1zagxpz598ssn88mch1mzc2aqa7sx29q7y1ifw4mrglsicgrxlv7" } }, { @@ -58559,8 +58527,8 @@ 20200604, 833 ], - "commit": "42ad0a99f0114233e2cb317585cb9af494d18a2f", - "sha256": "1n4w45yv1k7979j42dahhp9356p9bmk6ldybqa0z65k9gz4abkxl" + "commit": "1af31ba701cf844f938f840ed78867c9a28174b6", + "sha256": "0zxqvy1vya0f0yrfp622hhf400cm5ygwl7mjdj5scwfk2y852xw1" }, "stable": { "version": [ @@ -58808,14 +58776,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210712, - 202 + 20210830, + 12 ], "deps": [ "cl-lib" ], - "commit": "6f313c9566d9c8453a91c5ccaa25760978cb9f6d", - "sha256": "09fxg0ljv2g9rv7n67km7q64w49fcl0gngm68m252nyvk2x28b08" + "commit": "b913961e410dbfdc52a80d62eb4cfe7a305b4e3e", + "sha256": "0xxb25a6vixzfxsndyy2mgwbpr4h5pm76fq9ibw7434yc8zjwmrj" }, "stable": { "version": [ @@ -59258,11 +59226,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20210824, - 747 + 20210904, + 908 ], - "commit": "a1ba9a03a4b18a0d9536753efee623ab7afca596", - "sha256": "0czmvm7nm91n9kg5cv6rc5wcw6vwyqfq2fr8lrm4dfzrwvf99204" + "commit": "06f6fdb94cdd88db7bb40b8f511a386605711408", + "sha256": "0153zh3vl6qmaw40v0b2kf81x6wfyxwgmc9iwvz4rximra9xxmyg" }, "stable": { "version": [ @@ -59840,8 +59808,8 @@ 20170418, 810 ], - "commit": "dd11d722b20ae720f29b8aa93a3b1cad87650b33", - "sha256": "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb" + "commit": "fcf0173ce0144e59de97ba8a7808192620e5f8f4", + "sha256": "1a2s19h4xgss8849lv5yl6g28hazz8k9vgzxyns2wzwc85pnbrhr" } }, { @@ -60710,8 +60678,8 @@ 20210318, 2106 ], - "commit": "49ef9ff24bf8f545243a30b1e49192d73c1b41f7", - "sha256": "0hs4d5fw1ic8vvzqiq7skb8ag2rdshmz71m2swl38s1bkhnbjbac" + "commit": "92ff508dc17831a57a4bb900d7bc218b577e066e", + "sha256": "1gmkf00mka99griysazipph27xfx42s5jfrrcy3mxwmlzs6zgfd3" }, "stable": { "version": [ @@ -60897,11 +60865,11 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20200925, - 1541 + 20210831, + 1802 ], - "commit": "0e4bafb31d1fc2a0a420a521c2723d5526646c0b", - "sha256": "09inpgwmnnqaakyn4r4xs8kax8b89dw94kvl521x6d43h9zl5i70" + "commit": "876cc27dc105979a0b59782141785f8e172891e8", + "sha256": "1vyls3ilypxskhng96z1m8byripmbsghgfalsg4qnmn8lakaq68d" } }, { @@ -61061,8 +61029,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210825, - 1458 + 20210830, + 2219 ], "deps": [ "dash", @@ -61071,22 +61039,24 @@ "transient", "with-editor" ], - "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", - "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" + "commit": "6cd0e63d302197bed03f1ac74afcd92b6115c9f5", + "sha256": "02aqkfklm6zxclaw9gdip38qri10iwvnhy9xcby7f6x61m3x26j2" }, "stable": { "version": [ 0, - 15, + 17, 0 ], "deps": [ "dash", - "magit", - "magit-popup" + "magit-popup", + "magit-section", + "transient", + "with-editor" ], - "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", - "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" + "commit": "da188a441079b91a66a3fce9bf200e880bc82abd", + "sha256": "0xxxiqqn8n2a2fa49fijpbg2j7cc92s7vj70dz6hiw0782ql2078" } }, { @@ -61097,28 +61067,28 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210825, - 258 + 20210830, + 2219 ], "deps": [ "evil", "kubernetes" ], - "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", - "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" + "commit": "6cd0e63d302197bed03f1ac74afcd92b6115c9f5", + "sha256": "02aqkfklm6zxclaw9gdip38qri10iwvnhy9xcby7f6x61m3x26j2" }, "stable": { "version": [ 0, - 15, + 17, 0 ], "deps": [ "evil", "kubernetes" ], - "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", - "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" + "commit": "da188a441079b91a66a3fce9bf200e880bc82abd", + "sha256": "0xxxiqqn8n2a2fa49fijpbg2j7cc92s7vj70dz6hiw0782ql2078" } }, { @@ -61129,14 +61099,14 @@ "repo": "abrochard/kubernetes-helm", "unstable": { "version": [ - 20190201, - 320 + 20210902, + 2232 ], "deps": [ "yaml-mode" ], - "commit": "bdf9280899b5efab6d55ffd96bad716c5f8e75bc", - "sha256": "05fsxknp2jpmchvz49hpvh8xvkwl70ksar6ccjqrp7nqcn7cvz2j" + "commit": "95cf92600436f67bd7bfe650763e68635f5ecc8e", + "sha256": "0k1kk472yianf5sn05hxqfpza5yxm9lmr917wmw3mca17758hsgm" } }, { @@ -61255,16 +61225,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210819, - 1935 + 20210826, + 1017 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "af78f6a6eec6f2f1096ed9b72fc0570458365423", - "sha256": "1aw534hw7s0iijsyzzf4k496xjrx983whxvy13n7yqdmzqp728fz" + "commit": "a992e92bf80f5d9e401f916a9e74acce05af4a8e", + "sha256": "0di6p1wapm714vd8d85d1wwzlh68ikfjw3qpjninbmjrzw2bwqp4" }, "stable": { "version": [ @@ -62087,11 +62057,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20210820, - 2243 + 20210831, + 1906 ], - "commit": "bcc48c818e34d518a0513e9d2c26fd92b3989c27", - "sha256": "1bv57ymdfs848347ckcl0c7jxdjzs12hpg7mcdih04yrlbvxrhq1" + "commit": "db13769ffc821dbcf6daa37f9add46de21ed1a3f", + "sha256": "1xxhbgyki8nkkjnfzqxllrcfmqlj6sqgvwxvqz7v4j6m40c745m6" } }, { @@ -62541,11 +62511,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20210526, - 623 + 20210906, + 626 ], - "commit": "4a6da0f6ab9b43651f3fcc73412e3480b9403caa", - "sha256": "04ag7icqqdhz40fi91fx4bxx8j6vw2774gw1fbppbks3sasimyy0" + "commit": "8291e22cd0990a99cb2f88ca67a9065a157f39af", + "sha256": "1zr34fsh4l4apdm1jpd9c8863wji5f0g8nwvzgf7bfi6q58bcwzn" }, "stable": { "version": [ @@ -62619,14 +62589,14 @@ "repo": "jumper047/librera-sync", "unstable": { "version": [ - 20210810, - 529 + 20210827, + 2300 ], "deps": [ "f" ], - "commit": "b36ab4f3d8c9df1ed28d78b7d517e90195c97244", - "sha256": "0qmpk52j4fq5rp2kmsm9z8i97x6p458h2xvb53kv03r69ncxc595" + "commit": "b6b97adc08c26b1595249e1c129793100f4ca26e", + "sha256": "0795vbq794clynxcpqrzjsk8d3qisk71bpambcrbiwikpg051fv3" } }, { @@ -62726,17 +62696,17 @@ 20210303, 1751 ], - "commit": "c66377f83a7b178b6e6d8bef5c844420c47ecbdd", - "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" + "commit": "edd5c702a7b94440bd76f7ef16ca58f028d06ef6", + "sha256": "1ahmrhm2ym4qv26cf6gvfnnkx3h311v4lwdna3bzv2mw3rzfrlq6" }, "stable": { "version": [ 0, - 23, + 24, 0 ], - "commit": "f3a1d941a08443d034a6c2e090b82ca5c28bdd86", - "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" + "commit": "c351737acfdd778b81a64065d8d20ebb10a006f0", + "sha256": "1ahmrhm2ym4qv26cf6gvfnnkx3h311v4lwdna3bzv2mw3rzfrlq6" } }, { @@ -62782,8 +62752,8 @@ 20180219, 1024 ], - "commit": "a52bd2bce9d6fb73dc7fe1e867e3ea804b5abd07", - "sha256": "18fl0f3j6bfv85pjcf0fggd0k6l6gxwvi19jrp3slzf0mhrlxd8k" + "commit": "7f51793fa6c037a90a90e47b433cc8a773a3b552", + "sha256": "0wd493d678587zc10y6hjlmjiacmj3xzw20zzfnvg2qr5nlqpl2g" }, "stable": { "version": [ @@ -63014,8 +62984,8 @@ 20210215, 2206 ], - "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23", - "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l" + "commit": "7330f08dd85ee715096f3596df516877894c6c2f", + "sha256": "1hlqairbjlrcbzb4r5fjm80znr9hdgny3vgm27dwwxxa340m0r6i" }, "stable": { "version": [ @@ -63091,8 +63061,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210809, - 1001 + 20210906, + 1503 ], "deps": [ "ace-window", @@ -63101,8 +63071,8 @@ "iedit", "zoutline" ], - "commit": "5ef2e8967f1015e3936ee7a5bf3d3c4b93d5c3a7", - "sha256": "0a5gj6sa49lbn753r6b3xvxxjy2f2c2jv53y79g7mqgr7w6dcx40" + "commit": "e5d0f949f76df23245e3904463c433d0908e9b7f", + "sha256": "05qagghksg1m7dd0dijw0xjzn1yqpfb6n7vr759injpa39lswcrh" }, "stable": { "version": [ @@ -64151,8 +64121,8 @@ 20210825, 1323 ], - "commit": "9127dd0876567c8db306793e9c5e8151b9ab392c", - "sha256": "00mvvxrbz0qd73a5jqdlfd1s1mxkw63lcyy5mklp5amfrznwp6m6" + "commit": "71f0b40cdcffdbae84214d3d82c0a8aae154a69f", + "sha256": "19s5617vx5xm932anyplwcjld0p589lplkvsi4p2g69ximjlmih1" }, "stable": { "version": [ @@ -64172,14 +64142,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210811, - 244 + 20210906, + 1614 ], "deps": [ - "map" + "map", + "seq" + ], + "commit": "74840299407b23a75bd415903a2157e71e68bd7f", + "sha256": "0fl8wxv84h9y7vp4rgfa9qarsdhh42qmx7d8mpk3fqmgz8a6fm7m" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "deps": [ + "map", + "seq" ], - "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", - "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" + "commit": "f75f906397fb95a20ecdb61589d02712de0264fb", + "sha256": "02za26xsivayqmdbs2fy36vp1jvlvr5zanb19ayglbpakmg8ply2" } }, { @@ -64190,15 +64174,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210810, - 307 + 20210906, + 1539 ], "deps": [ "dash", "loopy" ], - "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", - "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" + "commit": "74840299407b23a75bd415903a2157e71e68bd7f", + "sha256": "0fl8wxv84h9y7vp4rgfa9qarsdhh42qmx7d8mpk3fqmgz8a6fm7m" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "deps": [ + "dash", + "loopy" + ], + "commit": "f75f906397fb95a20ecdb61589d02712de0264fb", + "sha256": "02za26xsivayqmdbs2fy36vp1jvlvr5zanb19ayglbpakmg8ply2" } }, { @@ -64265,8 +64262,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210819, - 106 + 20210829, + 27 ], "deps": [ "dap-mode", @@ -64274,17 +64271,16 @@ "dash", "f", "lsp-mode", - "lsp-treemacs", - "pkg-info" + "lsp-treemacs" ], - "commit": "ac52f45742fa5862611b3af04ac679076f100144", - "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" + "commit": "64fb5d93038483abab59751200749ad81698a845", + "sha256": "19b1y5fd0ik3s96qzma4ym3m2x1720x9z0hjpxx61s4y8wgngnyy" }, "stable": { "version": [ 1, - 19, - 2 + 20, + 0 ], "deps": [ "dap-mode", @@ -64292,11 +64288,10 @@ "dash", "f", "lsp-mode", - "lsp-treemacs", - "pkg-info" + "lsp-treemacs" ], - "commit": "ac52f45742fa5862611b3af04ac679076f100144", - "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" + "commit": "1a839dcdedac47c90b4f82f456fea0a7cacf2940", + "sha256": "0m1bccpamxvasimdg6pq28lnbwy2v2xnzjradbl93x7c2drsvnik" } }, { @@ -64433,29 +64428,29 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20210518, - 2034 + 20210904, + 2043 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "bccd86028e669f5a1cad78364775fe7a0741ff93", - "sha256": "0c1vpriamxnlb8hfnp4cfdkwd4y4gq6zdvhb93gvlf4mh3qmjcd6" + "commit": "3e87441a625d65ced5a208a0b0442d573596ffa3", + "sha256": "0nb9ypa8hyx7i38rbywh8hn2i5f9l2l567hvdr9767fk279yr97n" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d", - "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1" + "commit": "3e87441a625d65ced5a208a0b0442d573596ffa3", + "sha256": "0nb9ypa8hyx7i38rbywh8hn2i5f9l2l567hvdr9767fk279yr97n" } }, { @@ -64566,8 +64561,8 @@ "julia-mode", "lsp-mode" ], - "commit": "d4a7a27d6ac7c6831b4f493dd89f82fa0c75bdf5", - "sha256": "1rkf2ibjilf023fv68ql4bray8bdnl2biq5zmn1qk5pdp988iq4j" + "commit": "809da95c05fe668acbae5a35e03082d9b9577728", + "sha256": "1v3f9hwbnd4vji6say5k9110ac4qbc3gd7hb62pvsbfa7vqd06gi" }, "stable": { "version": [ @@ -64621,27 +64616,30 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210813, - 916 + 20210826, + 1034 ], "deps": [ "f", - "lsp-mode" + "lsp-mode", + "s" ], - "commit": "d9148a65961432b6ea8a4cd20c225f8c188e6dbe", - "sha256": "0v5q51jxkxmm6pipvq9jf2s33mnrf8679ymx5fg51pk1hv0svcih" + "commit": "59ecc6db3bcf80568241be2d99bb7ef60c58e502", + "sha256": "0avl1ifkc106gaznpwli0gqwfbfsxj8zij3sc4vy2d00ppr4173r" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ - "lsp-mode" + "f", + "lsp-mode", + "s" ], - "commit": "5546970c7949d498947e4b6a281707feb2aee928", - "sha256": "0s7v43jmpbjjxvfp9s51kc5d9mk3kf5mwvc4iwbvrzpi0ar4vfdy" + "commit": "5d25bfdc80da46b4839289164d1c4c3699c8908f", + "sha256": "1xf1pxbgjql9badcb1wayzv7j117syh488y82m5q061nnpq4lz06" } }, { @@ -64696,8 +64694,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210825, - 1531 + 20210905, + 1124 ], "deps": [ "dash", @@ -64707,26 +64705,25 @@ "markdown-mode", "spinner" ], - "commit": "0b4bfd43474b5e317e617834261a2b528e3f8ed4", - "sha256": "1flzknh7mls1fg4w72iv36k77lrpkaysxdd0z922xqsg6x48znb9" + "commit": "d9c8ed3a932b568614d9bbf682271cf43bb8ec73", + "sha256": "0bj87sfadry03lsnlmy4d75za5a2q5p8i981pnz8gvhi154fhz93" }, "stable": { "version": [ - 7, + 8, 0, - 1 + 0 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lv", "markdown-mode", "spinner" ], - "commit": "4db1151dbf1fe84769433d841e90803448b0b354", - "sha256": "1z8zm7qr21hvhl6rnbznv2l9drh1pp5y4zkjrx5ac4x77b8i4aaz" + "commit": "5e0524cc9a4e21c4fe5b35153ad33e7b8a4f9117", + "sha256": "1a6jc9sxf9b8fj9h8xlv5k546bkzsy8j5nj19cfama389z0bzcsl" } }, { @@ -64959,14 +64956,14 @@ "repo": "emacs-lsp/lsp-sourcekit", "unstable": { "version": [ - 20210404, - 1624 + 20210905, + 2017 ], "deps": [ "lsp-mode" ], - "commit": "ae4aa8705cc3a27ed86f1e7ee04d5c8f0522d8c0", - "sha256": "0q3dji9qy0aj7ai43xjcpb4hy6kvscrpr8r5cb9137g34zc0pd9x" + "commit": "97ff36b228a61e69734c7180f33cc6951b1a600f", + "sha256": "1pal3mga7nwfcvri1cffsjgcbbhk7wd1icd622qspqgq0zkfs8jd" } }, { @@ -64977,14 +64974,25 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210605, - 315 + 20210826, + 1046 + ], + "deps": [ + "lsp-mode" + ], + "commit": "5250c4305f2334796d65779c7b61442e17d7c69b", + "sha256": "10xlb3gqlsx9k716mmrvpwlsdn086vr0jiqakcj2f5vixpxj1sxy" + }, + "stable": { + "version": [ + 0, + 2 ], "deps": [ "lsp-mode" ], - "commit": "77ebadcb7decd953c069b421a7ab18188295e4b6", - "sha256": "0s34djc945zbzykazrd7k8gizbfws3xp8rjdbnplg4996k1c71n1" + "commit": "5250c4305f2334796d65779c7b61442e17d7c69b", + "sha256": "10xlb3gqlsx9k716mmrvpwlsdn086vr0jiqakcj2f5vixpxj1sxy" } }, { @@ -64995,8 +65003,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210618, - 1722 + 20210904, + 2039 ], "deps": [ "dash", @@ -65005,24 +65013,23 @@ "lsp-mode", "treemacs" ], - "commit": "905cc74726438cf06d8ad7cabb2efae75aeb2359", - "sha256": "0kh8yn80x1fgpcvrgj9bqmlhpnkxqsy57w8m06gws8lhlnrh4yk9" + "commit": "d82df44d632f331a46eaf1f7a37eb6b1ada0c69b", + "sha256": "05ivqa5900139jzjhwc3nggwznhm8564dz4ydcxym2ddd63571k0" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lsp-mode", "treemacs" ], - "commit": "08e256c45d2e95b510a98a8b88b0531e8785e519", - "sha256": "1z9cb7i546pbzvxii6lsj31jq8m70xrzscphl5z71vh93sydyhkb" + "commit": "d82df44d632f331a46eaf1f7a37eb6b1ada0c69b", + "sha256": "05ivqa5900139jzjhwc3nggwznhm8564dz4ydcxym2ddd63571k0" } }, { @@ -65033,31 +65040,30 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210820, - 1331 + 20210904, + 2037 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "5d643fbb0c4ef5fc4ee93d9894bf68388095160a", - "sha256": "0005kcj9kr76d5cgviyyfjm9mm13ncra08p8s903b50sm2hsxpp8" + "commit": "b625f3cb5e88559ab99bec58f7a14272edb296bc", + "sha256": "00yirx6qzlb8fv8rd53zaw93nw72z3br40rb16scdqj1v20qsp47" }, "stable": { "version": [ - 7, + 8, 0, - 1 + 0 ], "deps": [ "dash", - "dash-functional", "lsp-mode", "markdown-mode" ], - "commit": "449f3a6b80a60d88c4ed300e69d64eb8e875f1c7", - "sha256": "09dmhhxmfjnzdc5kygwsjf8nwqlnq9rbgrca679s2wy93miqj7vc" + "commit": "b625f3cb5e88559ab99bec58f7a14272edb296bc", + "sha256": "00yirx6qzlb8fv8rd53zaw93nw72z3br40rb16scdqj1v20qsp47" } }, { @@ -65260,6 +65266,40 @@ } }, { + "ename": "lyrics-fetcher", + "commit": "56073782eb8ef6a9e1391c03473b245be2aff0df", + "sha256": "1hji68ig1zldry6xrs2p62pcmfa5px9381ic84zhs02c0hsh1piv", + "fetcher": "github", + "repo": "SqrtMinusOne/lyrics-fetcher.el", + "unstable": { + "version": [ + 20210828, + 813 + ], + "deps": [ + "emms", + "f", + "request" + ], + "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", + "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "emms", + "f", + "request" + ], + "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", + "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + } + }, + { "ename": "m-buffer", "commit": "c34d02682e87c9978a3583bd903dcac5da5b41d5", "sha256": "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94", @@ -65496,11 +65536,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20210728, - 1354 + 20210903, + 1345 ], - "commit": "d221002128b7954fb5705c37b974223514a9c4f0", - "sha256": "0h04i2xif8iqlrp85kp3p34snzhfcgqcf65asd1qblh0qlhp37gn" + "commit": "d5da43b6a49b7b6a0b6b9ed19c13ac5a076b79b2", + "sha256": "15d4vzr4cww25ic6im9372nl43pdsn8bm9hnpyqjfg3c3axnfp4l" }, "stable": { "version": [ @@ -65520,8 +65560,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210822, - 529 + 20210906, + 1023 ], "deps": [ "dash", @@ -65530,8 +65570,8 @@ "transient", "with-editor" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -65710,15 +65750,15 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20210817, - 1949 + 20210831, + 1453 ], "deps": [ "magit", "transient" ], - "commit": "45ed8559171a6392d305f6626d0a8228341f88b2", - "sha256": "0ghcxhi7zwk44lyckbs8n4g7ip9ab8n5bgv45r3xv49snnv5glpx" + "commit": "9104713f6ea918e9faaf25f2cc182c65029db936", + "sha256": "0sasd9q8a3cisys979djdzidxiwcf6n612gajhrhd6fpssdc3rr1" }, "stable": { "version": [ @@ -65878,8 +65918,8 @@ "libgit", "magit" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -66040,14 +66080,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210819, - 1119 + 20210829, + 1849 ], "deps": [ "dash" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -66842,11 +66882,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210823, - 1004 + 20210905, + 1700 ], - "commit": "207eb405706f5415dd0daf490925648fd058cc42", - "sha256": "0sgb4682kz6qyrj4il551yvcz7kbnblh8yxbysjw4psn3aayyam0" + "commit": "cb1d3ba604dda17d8d44e7355ad76a1651830a30", + "sha256": "1lvw0vvb7zmpxlvrvzis6j558n00rlg9jkcnnhzsqqjwfvglhqp8" }, "stable": { "version": [ @@ -66962,11 +67002,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210819, - 57 + 20210904, + 733 ], - "commit": "0839d0709e116584bd070305e4a0d28bd03bc547", - "sha256": "04xsls7lffvhxif9c5z3ycq80yf0l31z9znmj9m3z132k7rz3bs4" + "commit": "4810cac10355310ec76cd0946d0af92d595b3b81", + "sha256": "0yl98mk1qbgwk3qhnkq73njfkrb7hxydk66lax9r2900dnrifhlg" }, "stable": { "version": [ @@ -67036,16 +67076,16 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20210629, - 931 + 20210905, + 738 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "f78cba9b5761c91058fed3a781bd3fed7f996e1f", - "sha256": "12dddxa14ppa7gaayify67w4sc6ncbc68wdg4madfqj7s71lnm45" + "commit": "3d724e518a897343b5ede0b976d6fb46c46bcc01", + "sha256": "01l48njg0x7gkssvw9nv3yq97866r945izbggx9y3z5ckr1w4hlc" }, "stable": { "version": [ @@ -67282,11 +67322,11 @@ "repo": "cpaulik/emacs-material-theme", "unstable": { "version": [ - 20201224, - 916 + 20210904, + 1226 ], - "commit": "67a496c937542f6ee7c4a2164d23f0296ef3a645", - "sha256": "14n0s4yn76b7a0qifabp1lp9g0zq82xwahz1wb5wfyfc3d0px9ck" + "commit": "6823009bc92f82aa3a90e27e1009f7da8e87b648", + "sha256": "1c0z2dxfwzgl71xwli3dmyn96xadm5wnhnp5inv5f01mp7iwhf8a" }, "stable": { "version": [ @@ -67906,8 +67946,8 @@ 20210720, 950 ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -67936,8 +67976,8 @@ "auto-complete", "merlin" ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -67970,8 +68010,8 @@ "company", "merlin" ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -68033,8 +68073,8 @@ "iedit", "merlin" ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -68109,6 +68149,24 @@ } }, { + "ename": "message-view-patch", + "commit": "93cf8649172e3b4d552e20f4ea27c439a891dfbd", + "sha256": "1vik1hkv30a379c9lyjw032iing54ykq9pkqyy5zkwk92dkr5mhm", + "fetcher": "github", + "repo": "seanfarley/message-view-patch", + "unstable": { + "version": [ + 20210904, + 2227 + ], + "deps": [ + "magit" + ], + "commit": "50dd3d92a1794f24b7e375b74e5199c63b54a2d8", + "sha256": "0l2wpapm0gng4jwicwi6w2sz71v4f2j99faakyh07acyvry1wdbi" + } + }, + { "ename": "messages-are-flowing", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0v74b7cjj87kncndxfpfs6dcc4jcl18wpbirffl7dw6mac2anw6m", @@ -68580,8 +68638,8 @@ 20210710, 1941 ], - "commit": "b07faabfec1b5ba545dc1cb961545cc1e9d78db0", - "sha256": "0b7znsgvycfx2brk782mi0n8i779n1r7pqwfq7s256rgi4fcyzap" + "commit": "57a049b9e1ea4a9b65e82fc10c8c7e70a042f636", + "sha256": "0bhsicy4van5xml8s9if2q7b36fbnzqg7kbg41zknf7nyhzl8pxi" } }, { @@ -68692,6 +68750,21 @@ } }, { + "ename": "minibuffer-modifier-keys", + "commit": "589d2ad3a1d509eda5ba0b04025b6472e8e7cd0b", + "sha256": "0ijniq92bfsbk68y6g9l9f4aykwydm990mjy5lhkr1dwpn8z7fpy", + "fetcher": "github", + "repo": "SpringHan/minibuffer-modifier-keys", + "unstable": { + "version": [ + 20210823, + 713 + ], + "commit": "38da548225f51ca7bca22d3e9b0de78e3b9e6cdd", + "sha256": "14xv0v1j1p67hlccw9a137d7hi62pwzllirdx5ixnd2lc7xfg402" + } + }, + { "ename": "miniedit", "commit": "5f2a50f62475639af011c99c6cc38928b74b3b0a", "sha256": "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87", @@ -69425,11 +69498,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210804, - 1453 + 20210906, + 1104 ], - "commit": "52532a1ac2f3b707e79ba67ada8bf36846e45048", - "sha256": "1y12c9xjs6liwgwbfvy5w8sm9kn6ww8imqgkji8nncpjy3vp81vs" + "commit": "a30b42395cdfd8759b71193e2f0804c8e54926ad", + "sha256": "12d6mg6nx7lirj0cb4r90rcnnzrlmk3165lcmcmxrjj6v7g523yr" }, "stable": { "version": [ @@ -69724,11 +69797,11 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20200722, - 2327 + 20210903, + 1142 ], - "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90", - "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb" + "commit": "34a1304edeb5a71ab22132bef8b4251f41cd1cda", + "sha256": "1xzyij1knr0z5mihakq17mnhh994jd035g48xvq7qgk4f0r09pih" }, "stable": { "version": [ @@ -69978,24 +70051,6 @@ } }, { - "ename": "mouse-slider-mode", - "commit": "8fa747999bb928c3836400a43d8ab63939381673", - "sha256": "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy", - "fetcher": "github", - "repo": "skeeto/mouse-slider-mode", - "unstable": { - "version": [ - 20161021, - 1914 - ], - "deps": [ - "cl-lib" - ], - "commit": "b3c19cd231edecce76787c5a9bbe5e4046d91f88", - "sha256": "1qkbrwicp3gaknnmfrajf1qdyhj5s0c09cx62869rp2721p8rqaw" - } - }, - { "ename": "move-dup", "commit": "3ea1f7f015a366192492981ff75672fc363c6c18", "sha256": "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f", @@ -70068,59 +70123,6 @@ } }, { - "ename": "moz", - "commit": "6839c5e52364fb32f6d8a351e5c2f21fbd6669a1", - "sha256": "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi", - "fetcher": "github", - "repo": "bard/mozrepl", - "unstable": { - "version": [ - 20150805, - 1706 - ], - "commit": "ab3e79914445039ceb62f7f2dc342358fec3492e", - "sha256": "1c7dsip5wmlf7x2hziwil5n3igvpnh17d7yg8lsg001y5sjl3mjv" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "646208b67e6c9c56d188db1eba999846d518935f", - "sha256": "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c" - } - }, - { - "ename": "moz-controller", - "commit": "fcc20337594a76a547f696adece121ae592c6917", - "sha256": "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd", - "fetcher": "github", - "repo": "RenWenshan/emacs-moz-controller", - "unstable": { - "version": [ - 20151209, - 206 - ], - "deps": [ - "moz" - ], - "commit": "46f665c03574fa922de767fc29795e0db4a7c5c6", - "sha256": "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8" - }, - "stable": { - "version": [ - 1, - 0 - ], - "deps": [ - "moz" - ], - "commit": "42fd842039620de7fb122f7e4ffc1ab802ee97c5", - "sha256": "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0" - } - }, - { "ename": "mozc", "commit": "30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c", "sha256": "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba", @@ -70131,8 +70133,8 @@ 20210306, 1053 ], - "commit": "fed70bc909ef2a67d907d1ac89bbcd042d277da5", - "sha256": "05jw43ajq404dq62kykw9ryh5kl0lhl9alxyqq3gixpyds3r2205" + "commit": "7e8beed3ddad4f8d1065cbab52f24c16d31f5898", + "sha256": "16ahy9myimsjg0csff5b6gpj4vvy1pz6y5rpvhwwg4c6id5wz1fi" }, "stable": { "version": [ @@ -70289,26 +70291,26 @@ "repo": "sp1ff/mpdmacs", "unstable": { "version": [ - 20201118, - 350 + 20210904, + 35 ], "deps": [ "elmpd" ], - "commit": "174ffbc1e8ef31339867e3d9b29fe8468b636a7c", - "sha256": "0djpvhgvbijk40p3131nrf87nrsfd02lm1gc4i65l6sl66xxszv8" + "commit": "334b066dc5bb82d9ccb6cc30d63afed0f7610fe8", + "sha256": "0pkw79sccsvx845xgd2a2rql6ic7jkzki90xj268czvcgvfy4kn1" }, "stable": { "version": [ 0, 2, - 0 + 2 ], "deps": [ "elmpd" ], - "commit": "b81d9464c04bd42509b62d4a3c23f50aed728fc3", - "sha256": "0kjhkj77x25cvx27gqwpsfn64cf9bi5hv0a2sqp8xzzxaxz2l2hd" + "commit": "66031a8993a2a704bdfaa9c63ec590dd0c5a2eea", + "sha256": "0n4b1klaf1jwd8bj9gqjy5p9yabgkgj9zai1cmsbnb4174h0719q" } }, { @@ -71414,11 +71416,14 @@ "repo": "myTerminal/myterminal-controls", "unstable": { "version": [ - 20190426, - 421 + 20210904, + 516 + ], + "deps": [ + "cl-lib" ], - "commit": "733cdd7ab4f172b6dca09720fc5ae7dbc248c822", - "sha256": "1z89d3dx77c4v1zz4ngn689ay6m2x04jznnbc6bdqsaanz9znwlz" + "commit": "c635868e13ee898ec77925d98b36421640e22aa4", + "sha256": "1y7kkb12m94z8ypnfc02xsbsv30lm6qbk3cri1fd63wjshv7wil2" }, "stable": { "version": [ @@ -72274,11 +72279,11 @@ "repo": "juergenhoetzel/emacs-nexus", "unstable": { "version": [ - 20140114, - 1305 + 20210903, + 1743 ], - "commit": "c46f499951b90839aa8683779fe43d8f01672a60", - "sha256": "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27" + "commit": "9603fd3d8ef34d4b3dcad3292c4ac743500d4946", + "sha256": "07bp6vb2d4sf0csnrc52xiib3lzxpd0mzlpjbikpcn17xjm6xjcb" } }, { @@ -72488,11 +72493,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20210318, - 1654 + 20210830, + 1619 ], - "commit": "7e9ad5a617a26641988445503e235c68fa21b611", - "sha256": "1wy06kphgljlcnl55qx5g8hzcv9bnfrrp22pfsxpyawlrmmgxp1j" + "commit": "09085ce2b1b7a7c1c9986e6e86b7cf94610fbfb0", + "sha256": "0aw2pqqfnwcbyh3b8q0lbwl27ilc1w281v78ha9316bvrydhkrdm" } }, { @@ -72605,14 +72610,14 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210809, - 1724 + 20210830, + 1610 ], "deps": [ - "f" + "magit-section" ], - "commit": "56748ac556d0406cc6c574f7347fe37decd8381e", - "sha256": "1lgakfj8dar3517rl6k6vxjijkdywq05wg7fjjmnv3a0h8ppjjz4" + "commit": "8e20de5ba7061d810b08df5557b1fdb60c94b639", + "sha256": "18kh6sb8rn391krg5a2xsk03am6ni739pw2ash81asnh112zsxzi" }, "stable": { "version": [ @@ -73221,20 +73226,19 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210822, - 1412 + 20210830, + 2334 ], - "commit": "84347ffcad24b48390c622e5a96c31c97c094daa", - "sha256": "1zn9j0sc49g7gj1fx2n1lvgcixcvjcc3kg9jlvzwniygqnncwcw2" + "commit": "49aa44bb012e8c2412b5447119b78b61842740b8", + "sha256": "008f86pb2zn3xi9d862c2bz0yzavyrypf6bzc3q275il876x4c9z" }, "stable": { "version": [ 0, - 32, - 3 + 33 ], - "commit": "3f30ee65efec7c35e56af36eaa49af5c2e220d8f", - "sha256": "005nc800cr7f32w7vdpr1bqh65ffflsm8ss6x010i5c79ndfli4n" + "commit": "676fcd70ff5aa5d88943a5982a4187cc5699aa4b", + "sha256": "0wpczv0s0sbdd0p4qhhkw50f5pz5jpx41gaf4c7afc88lwgqr8lv" } }, { @@ -73830,16 +73834,16 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20210217, - 744 + 20210826, + 1000 ], "deps": [ "dash", "f", "s" ], - "commit": "6f47fac1bc42526a7474488f560d064c08f8dd6e", - "sha256": "01rfgxkahpx17q8k72hxibysysv8pgx6bfy5gbc6finm3f7ak6ia" + "commit": "c214762fd6f539ec3e1fd8198cefbdb4b428b19c", + "sha256": "0xcb2k98ka7lks7k0mk9inmjpyz03v8aq64a24pj635xp54x3iah" }, "stable": { "version": [ @@ -75101,8 +75105,8 @@ 20210617, 1726 ], - "commit": "25ac57f10acae37f21ab3b0959d8c9b3125c4e3e", - "sha256": "0c4cvny8anx4p1i136vl881g6dsy0mrd02xzbgv860g9ix5nzvsx" + "commit": "b78f73f9c3a689be73dd6061f3898c8b998048cb", + "sha256": "0ma9ysizvnwlzb4d1dzfd8n5948gq6zy897526dwwfdj105fsmdi" }, "stable": { "version": [ @@ -75295,26 +75299,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210819, - 850 + 20210827, + 934 ], "deps": [ "org-re-reveal" ], - "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", - "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" + "commit": "7d29876e3385ad0477e95d9863b868e9d0aafcc7", + "sha256": "049k35xlv0ilpnjf1la452npv77f0sbx69pmzgkrcg85pql3az6k" }, "stable": { "version": [ 3, - 21, - 2 + 23, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", - "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" + "commit": "7d29876e3385ad0477e95d9863b868e9d0aafcc7", + "sha256": "049k35xlv0ilpnjf1la452npv77f0sbx69pmzgkrcg85pql3az6k" } }, { @@ -75451,20 +75455,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210823, - 1054 + 20210902, + 1202 ], - "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", - "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" + "commit": "95479d5178fc5017060c963a45de0d2095c00e0f", + "sha256": "0bliylh02lcga84jysf1jr80bgrn8m7cy4n047fr06cjqdqr4sp4" }, "stable": { "version": [ 2, 0, - 2 + 3 ], - "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", - "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" + "commit": "bfb221845c2e26f923ab80fdcd8f80b70b6adee1", + "sha256": "0qhv4ah9bn1mjvivgxp7z1gf91d0cdr2ma5cy5xaja97ispa4l3z" } }, { @@ -76024,14 +76028,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20210809, - 1401 + 20210828, + 1639 ], "deps": [ "zoutline" ], - "commit": "1eaf09e31d440f781ba87d0aaa4defa5568a8f48", - "sha256": "0nh3aivgjzcb8vqbwdvvhkk0lww3x1ry52ac8h9cw2k9hdr37ks1" + "commit": "47c03af0c1df2b679d800f3708d675a4c2a3e722", + "sha256": "0dah1wb9fyixwza8h2bc2vzps4zd9y9g97yhrm2vjvddabzsyq3a" } }, { @@ -76147,16 +76151,15 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20180524, - 133 + 20210828, + 1822 ], "deps": [ "alert", - "dash", - "s" + "org" ], - "commit": "f87bff4acbd839acb4d2245b56b2c3d21f950911", - "sha256": "05xhp1ggpcgd48vcrxf9l43aasxfjw1ypgzpq3gp7031x83m9rr6" + "commit": "67b2e241d9eafcabcbd7de48cca031044ebc8221", + "sha256": "1bglyry80sbsj0x4w20ncvdsnn8lw7j2ry0rnfsb866fhq03zkrn" }, "stable": { "version": [ @@ -76584,14 +76587,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20210508, - 110 + 20210829, + 2145 ], "deps": [ "org" ], - "commit": "a97232b4706869ecae16a1352487a99bc3cf97af", - "sha256": "1j4zjp0w7f17y0vddi39fj13iga0pfh5bgi66lwwghb18w0isgng" + "commit": "a9acf45aaa174aacca248272fb30a5698b5163ae", + "sha256": "0wfq0gpv89sqdzi3acw9b4697lnnpjqvf11mjdlq69y20vfm1qsv" } }, { @@ -77151,11 +77154,11 @@ "repo": "harrybournis/org-fancy-priorities", "unstable": { "version": [ - 20210427, - 900 + 20210830, + 1657 ], - "commit": "44532ab8c25eb2c0028eecca7acd9e8ea8e2ff30", - "sha256": "1cvlyq5p505vx9gcqgvhj7qan1qhq859c2fv7a44kfs0093cb9fz" + "commit": "7f677c6c14ecf05eab8e0efbfe7f1b00ae68eb1d", + "sha256": "1sd7ndr1f07r4832kfi88q9il9v6slzghs1nc1aa81g7y8gb1q8l" } }, { @@ -77506,8 +77509,8 @@ "dash", "request" ], - "commit": "9de4310c3e853f76aa47bc5bf2dc404d4cf3226b", - "sha256": "1vd49wxdj8r228xk9hpqig1f68m0iv5rsrj24ya4rdlf3z4671p4" + "commit": "f64e5da352193d8e8bc4d9f5678c8e971265e6d1", + "sha256": "0wrnkpx7ypjfajbfq2dnqxaq18rlvl7fgajsk6a6fsb2sbhfkb97" }, "stable": { "version": [ @@ -77651,14 +77654,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210822, - 322 + 20210830, + 1447 ], "deps": [ "all-the-icons" ], - "commit": "c26ea28e6093d23621b9ec20e811986f604c192e", - "sha256": "05zjjsmavpj7klb814xyd58nszladc9wfkybzr8pqfk304bdv0yx" + "commit": "19deeb8f212791cf4698a7cd844df5b3e1b5952f", + "sha256": "0p3iy23nr2saznjz94j0f55qswzmr96x39awd9r8fpvpsm02j14m" } }, { @@ -77780,20 +77783,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20210821, - 341 + 20210901, + 244 ], - "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", - "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" + "commit": "23cc52bb539c898de228fc438cd24ed10213bea3", + "sha256": "1g32chan6rhlp3kvzd2lvf104i3p37q1sm0d89pq6sya0ia2as1n" }, "stable": { "version": [ 0, 2, - 2 + 3 ], - "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", - "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" + "commit": "23cc52bb539c898de228fc438cd24ed10213bea3", + "sha256": "1g32chan6rhlp3kvzd2lvf104i3p37q1sm0d89pq6sya0ia2as1n" } }, { @@ -77899,14 +77902,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210729, - 2144 + 20210901, + 1630 ], "deps": [ "htmlize" ], - "commit": "eb01f60b1ddc132f616d2c1f4038c23f42fc3847", - "sha256": "01xhhq0r36hkfhhacvwm7nwajvl7j8v3qbpn1xhi3vyy3zabhpzp" + "commit": "599e8b056c30e84d584aa54dd7c85339cdb9dc43", + "sha256": "07mjxzip1n3j8lksfq00mfy4s015n28wxiczczqvd6cdhgynshpg" } }, { @@ -78056,8 +78059,8 @@ "repo": "doppelc/org-notifications", "unstable": { "version": [ - 20210310, - 1149 + 20210826, + 1721 ], "deps": [ "alert", @@ -78065,8 +78068,8 @@ "seq", "sound-wav" ], - "commit": "41a8a6b57e11a5b676b03925d473066655364808", - "sha256": "1fb4jm1zhfllzzrdbasgp1r3ggjs3xa4pfd5papi6mfcz9ypxqsh" + "commit": "04d648ab5f5f65b600a3af1c9e8ce4e07800d995", + "sha256": "0xi1shrm3a091fa8zv7nr1425f23z8cb1d6qb2xl1b772q9n7bkf" } }, { @@ -78360,20 +78363,20 @@ }, { "ename": "org-preview-html", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1dnr046mk5ngmic2yqcmrnn7pzrrx3sg22rk2pc3vgdxs8bhvhf9", + "commit": "cf5b192e7d31850f979d48b7c79dcc6a34bdd923", + "sha256": "0slqn2vp01lyg003icx9h31z560pwhcsqjhg7jv7jdl008saacyc", "fetcher": "github", - "repo": "lujun9972/org-preview-html", + "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20210623, - 1523 + 20210905, + 1559 ], "deps": [ "org" ], - "commit": "3fe7dd85b8a7dc4ead7495095a3abaad28e2f809", - "sha256": "1vih94z3k8qz2vkzvcqbxpipijsxyfn2kvimylfwjrfbkrmvigsp" + "commit": "04487392d977258351d06ff693a591d8e77617b7", + "sha256": "11f8ffwjllzqpqp0s0610cakh1j8028lvknibajqid4ljidm0mcj" } }, { @@ -78872,8 +78875,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210825, - 1600 + 20210901, + 1143 ], "deps": [ "dash", @@ -78883,8 +78886,8 @@ "magit-section", "org" ], - "commit": "74a6fd598a03d8d981c21267e9aa25e73d125bcd", - "sha256": "0mm3d8zbnamscnbqmdkqqsj6qy30j83gqdlgwacw1r8n1ncwx8sa" + "commit": "1795039ab93ef19611dbb3fca21c4211c4e655a9", + "sha256": "1hrb4l7b31f9glrdhn30lldqkzbyw0rhw03d5ij49pygfma2qwl0" }, "stable": { "version": [ @@ -78912,16 +78915,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210810, - 1626 + 20210903, + 2120 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "c13a05b2c855ba1516241d8a1de33bf2c689d6e4", - "sha256": "0m1mr0c6wmiw54qiqz6dm74l1cn0khywndyqfdmss3l52sipzc9x" + "commit": "9675eee4183301b16eb27776dae93e8c0b99eb07", + "sha256": "1n4nfs9ifzdmzj60adbam4qfw6vkm8z4yh5mp23gvi0j9wfx99s1" }, "stable": { "version": [ @@ -79829,8 +79832,8 @@ "request-deferred", "s" ], - "commit": "9c1c94dff1a46631669023286078b887d077c305", - "sha256": "0s3amkc193b3csffa6gqi6kyr7x6fmc3sviirqwnygjfl42788ck" + "commit": "fc63ed580101e6160edfb6f43215fb3200ce1ea7", + "sha256": "1kg3q8bhyydmd9jb41kyg8xcn5dbwpy2y0fnq7avkaypdn1q27w0" }, "stable": { "version": [ @@ -80033,6 +80036,38 @@ } }, { + "ename": "org-zettelkasten", + "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3", + "sha256": "1fhjbg3jjcinnja96fzcsxnjxg0x4vnsw84g1q63c325sv4xv2mw", + "fetcher": "github", + "repo": "ymherklotz/emacs-zettelkasten", + "unstable": { + "version": [ + 20210830, + 1025 + ], + "deps": [ + "counsel", + "org" + ], + "commit": "748e14b5a0dc2200d10b946d0111bd286e2c1c71", + "sha256": "1s9nhqbw5jxkqsvy40dd80l5wjw1407vk9qmdfiva8hj0ymcigr6" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "counsel", + "org" + ], + "commit": "dd4feae2111357d99dcde1919c1d72523cc5b68c", + "sha256": "16hqk9hdfmbjmhb6bb0xk6silgx85ji0q1dpncwgida6958rq79r" + } + }, + { "ename": "org2blog", "commit": "08b47bf72bff18efb3281509fd9f1688d8bb0349", "sha256": "1snrsqpiacmkajmiw12kpglxkrs5ngma7l7r246q0lvf1h4jzbsa", @@ -80130,15 +80165,15 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20210220, - 1845 + 20210829, + 1113 ], "deps": [ "dash", "s" ], - "commit": "e469373e0c656cec475c145037be1902d2622f09", - "sha256": "1pqrvrs54ggm2hr7b7m9n4wglbmakw0q9651mwxylz6bwm66kcc1" + "commit": "a228ebcf408de7096e5cd3a62b14087432e0afb1", + "sha256": "146xp2jsk7a973g0dn8in1sad6lp1ks7s5ma6jld4h26anprvj1g" }, "stable": { "version": [ @@ -80431,8 +80466,8 @@ 20210722, 737 ], - "commit": "6bb7deaea9ca01137e7cbd74ff23559e6a4d85e7", - "sha256": "0kq5fa3dkz6a8y8zyf588032hlmpvjl7mn7y6m2mjsamf7fxnh3h" + "commit": "3a6bd917c524c73542315f7c2b0d68161fd5c228", + "sha256": "0kjyg2vif12whfjdj7d4byjw9a4y6q9s40552v6i8b7f1yc7rz0k" }, "stable": { "version": [ @@ -80452,11 +80487,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20210819, - 1739 + 20210830, + 829 ], - "commit": "141577373600e7be16a5b67284165f54e8743505", - "sha256": "0nhaigi53nygw0fvmj335sd2kin3rlhh501sx4asdvdlhm28n2hr" + "commit": "5e826d36402f822c5981593cd106ce06420638a3", + "sha256": "0jhjm28ypqrvvxdpjqpvwrlsg0gbrnkz4hlfvivlf7wd58852r86" } }, { @@ -80482,14 +80517,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20210225, - 923 + 20210828, + 715 ], "deps": [ "cl-lib" ], - "commit": "f411d38de5e36f65336a37e43cfe9a5125b6543a", - "sha256": "05m6xq1c3cc2vpwfgknjx6rad8lr2hd6prbziq04qxp8x8qcs3sj" + "commit": "f09ba7fd304b36773a337323a0749cc681ce5049", + "sha256": "0li0zks7n8kj30z2a71xyaa6qpp5kgrrikrz1562cymp5r3ddbxv" } }, { @@ -80591,20 +80626,20 @@ "repo": "cmchittom/orthodox-christian-new-calendar-holidays", "unstable": { "version": [ - 20210507, - 1619 + 20210830, + 1657 ], - "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6", - "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6" + "commit": "6869024ecd45eefd0ec648979c6a59d7c79770e0", + "sha256": "1hw76k90bgvbdispcgmfbskhnk7cjai0bv75nmmk2b6kcj9hmx97" }, "stable": { "version": [ 1, 3, - 2 + 3 ], - "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6", - "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6" + "commit": "6869024ecd45eefd0ec648979c6a59d7c79770e0", + "sha256": "1hw76k90bgvbdispcgmfbskhnk7cjai0bv75nmmk2b6kcj9hmx97" } }, { @@ -81714,14 +81749,11 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20210529, - 1012 - ], - "deps": [ - "org" + 20210826, + 1425 ], - "commit": "7e69c04626f8d35756f3b049bd7836fb751f7734", - "sha256": "14hdjkyyh4714vsc4amkdfhdda94gpaz7hy702ygmyfx0il1v92a" + "commit": "ccabf6bd79ed87dd3bd57993321ee6d93c1818be", + "sha256": "0hww5b2d0yc8g9hhk4sqsnr091nbrmpna1v5yc6pn1g24rngh3dk" } }, { @@ -81761,14 +81793,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210815, - 907 + 20210902, + 1452 ], "deps": [ "org" ], - "commit": "8eae719acc18592a916715e74984e9222bb6d5fa", - "sha256": "12r4s8xkmyiyv8pcf0zy2jh2dp582rx41pggnfh44cd27skafd30" + "commit": "fe9148b670d144124d9697fcf5d0528f19025104", + "sha256": "034gkbc03z9jzj7ad34mmqgmvj4f14ap7iixh3zx4wp2ipw5xb7c" } }, { @@ -84691,8 +84723,8 @@ 20210808, 1745 ], - "commit": "8212f415fc5de2dedfc74d797b3951b2cbfb6f58", - "sha256": "1r9arl0v33rqgvi98xz63pf56kb7d8j1j1p74ky89g5zk8zzivd3" + "commit": "535aec81739e8e766e0420fda616efc8846f2911", + "sha256": "1z4fds5priq8dsr8gm845ykk8blghm5kz5sspnpzclgk3prwkx26" }, "stable": { "version": [ @@ -86493,6 +86525,25 @@ } }, { + "ename": "polybar-sesman", + "commit": "15e30c5c96f94c4ae05c25af45a2f08a9c0520af", + "sha256": "0rm3mjwgp7i7hbwx8qw8snaipa7yl1haffr91rd9d31yc5pd170f", + "fetcher": "github", + "repo": "markgdawson/polybar-sesman.el", + "unstable": { + "version": [ + 20210901, + 1336 + ], + "deps": [ + "dash", + "sesman" + ], + "commit": "5175b8d641aad9576519717f69f858621892d5c7", + "sha256": "101ymzis94sdlhk173my108g2s3fpi4ibc514isizfxvb4cn9gs9" + } + }, + { "ename": "polymode", "commit": "3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d", "sha256": "15i9masklpy4iwskc7dzqjhb430ggn0496z4wb1zjj0b9xx4wj66", @@ -87894,11 +87945,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210825, - 649 + 20210905, + 629 ], - "commit": "db5748ea4a6428136769e7e50c6d0a12aa7acd8f", - "sha256": "0zfvv7iyb0n61hd3q1jk0bldpfwhw49kd61c5wd44g437vr7jm6x" + "commit": "6516a9ce574a9cd8903d0148fe06fa49f954972d", + "sha256": "0pgrpdgpx7c55csrznhydfpsx5mfi8dy2g7p5mkhz7xmrqqw9ipl" }, "stable": { "version": [ @@ -88304,8 +88355,8 @@ 20210820, 2321 ], - "commit": "f84e634c99d0c6bad17e8840baf7b6173563188f", - "sha256": "07gr1czqh23kz0nw29vdg60vrc5yj9p4rymlplb6xbkq91lncnrd" + "commit": "51696277a4dc30acd61e9ebb400d99934955e450", + "sha256": "1y9bnylzml5ijczac210cs3fpy3qdx01c1wqghdvnr3a1p71w71r" }, "stable": { "version": [ @@ -88408,8 +88459,8 @@ 20200619, 1742 ], - "commit": "38f6e15e77a4e33a669d5d37efd87edfa15c7c04", - "sha256": "1n6xp8yk7vkvgigy46ybvzd3a9597c6qg0zyc9bbhqk93vhwxqkk" + "commit": "10d0faef6de038960ec825c003c85581800fba1c", + "sha256": "1lynx4vj7w8mlf9mbwz5gwxfvr6iqp99sj89zr88bz5vynl6l43j" }, "stable": { "version": [ @@ -88417,10 +88468,10 @@ 18, 0, -1, - 1 + 2 ], - "commit": "1a1710b19de57c6f68ebe599a6a22de2392e6018", - "sha256": "0v006kvgmy1m4fpkg15pa1pdf1c2xwn4vbr952jrk1z24sfyljdy" + "commit": "32461877b77f61ed8926b1f12641cbe7ea7af713", + "sha256": "0kyg8j3f94n2f2qfsgdijyqmaxp0hq9mzj9ss3dm5kg4skgdq8pk" } }, { @@ -88814,6 +88865,21 @@ } }, { + "ename": "puni", + "commit": "546f7f793fb95657f67a61070b20e11d73342dad", + "sha256": "05h7hjl5sfj6ki7ndpz1mh0hsc7l86vaskmp8r1l5xxnq5sig0cd", + "fetcher": "github", + "repo": "AmaiKinono/puni", + "unstable": { + "version": [ + 20210824, + 1555 + ], + "commit": "3a3272c881945f0dfb4467f7f053d0853f612186", + "sha256": "1m2z4sif8558qyjzp33kfbjr1laz3nh79qbpzbnykk0j73q5zb9z" + } + }, + { "ename": "punpun-theme", "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", "sha256": "10mgyrxz2habhaqyg1g4c5kn13q425j0xpkkdlg10cdfvxfl9d1s", @@ -89264,8 +89330,8 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20210824, - 1323 + 20210828, + 1848 ], "deps": [ "ivy", @@ -89274,8 +89340,8 @@ "tree-sitter-langs", "uci-mode" ], - "commit": "f3d6b5c6c8f74d7c54808759f71ff26c91c0b7e6", - "sha256": "1v5gisi22d2syb5vd9plydncjlz3hqyx9fhzamxjcmpybdzss80m" + "commit": "bbc532a85b7a5555cbf1f0b4cd91214cf9fa6751", + "sha256": "01c52vl8ynlj6awlqja461q75hz9d87l84phgdfsfngs6grvayzf" }, "stable": { "version": [ @@ -89391,14 +89457,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20210719, - 38 + 20210902, + 1714 ], "deps": [ "pyim" ], - "commit": "4812f93ee00196b8fee9f434aa5cd77fabcf90d1", - "sha256": "1wvzgyf3mq3wy0sdnx5jhscr5x28pgbvw8dmfyn18741xnsn26fb" + "commit": "4db1ca7fee75bd3aa394d620e5af2f42b3caf3c4", + "sha256": "141rzf15334r4sdqy791n3kspad8jcz4iig55mvcqabii4bqx9p1" }, "stable": { "version": [ @@ -89470,8 +89536,8 @@ 20210411, 1931 ], - "commit": "23488352bc0dbdfa519abb527af3d676244b7106", - "sha256": "0gfig5fnmsvqbfcxd973v31zhvrdldma9grxliy83p7jzphs5kgp" + "commit": "97f7933d9838853cfff901db37545b9b8478296e", + "sha256": "1zjp3h8k6a16b03zn7k1s0lar83ps9ndqqsgbnsn06h29gfzl3h6" }, "stable": { "version": [ @@ -90210,11 +90276,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20210330, - 654 + 20210904, + 1553 ], - "commit": "35e91f4b6cfbb8dd2adea4d8cf53ae76db7d00d9", - "sha256": "15xlcnimaaqgchjcs5jv8g3l36fga7zp11fj901x9nziwwis4jx1" + "commit": "78317951cd3db986d811de616b7035559831749b", + "sha256": "0z7zpsmhfhnzvf1vqpsj5wsnlxmyxgc1z6599xsbvl30fw589y1r" }, "stable": { "version": [ @@ -90372,15 +90438,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210727, - 1545 + 20210831, + 2045 ], "deps": [ "faceup", "pos-tip" ], - "commit": "ef9a3fed943495ec2b0c8258f8e00307d6434b17", - "sha256": "0rkhkhpjpnp4h3c60ms9637737sfz6nfjlvlgvw0wfa51bvmzimd" + "commit": "a879a8d67b062c9aa0c6e60602eedba80a2069c5", + "sha256": "1cf104yb8qbq6dwjk0kplz2snpb565mnpirjdsrhi0hrndd6ryh9" } }, { @@ -90956,21 +91022,6 @@ } }, { - "ename": "rdp", - "commit": "e2dd8ef80d344c9801f7d0a26b0e3ea33a53bf89", - "sha256": "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz", - "fetcher": "github", - "repo": "skeeto/rdp", - "unstable": { - "version": [ - 20120929, - 154 - ], - "commit": "b620192afada04aec33b38cc130fef0765f41ca9", - "sha256": "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd" - } - }, - { "ename": "rdxmk", "commit": "db54339795e0519f154328e54d47a7a0c80afc71", "sha256": "14iavsgqp28y2ykgly8x69sny34r32dl4bpb47m921vk5n4y6zky", @@ -91409,19 +91460,19 @@ "repo": "nickdrozd/reazon", "unstable": { "version": [ - 20210815, - 1519 + 20210831, + 1208 ], - "commit": "1bfce512612eb679d06356b5c070e6f8743fd0dc", - "sha256": "1059dqsj19k7yb2lw2vy1s6pdhbl0l4vmsfd2lscwsa6kw42kjp0" + "commit": "d697c0dfe38ac7483e453e8ce8056acf95c89ba2", + "sha256": "12s2h4wd7cz9x078698wwjjpy874rk8cm2d17p6ksb10y3cmrqsn" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "020be6467a83957adcbdcb192b61f2c76a94079b", - "sha256": "18la2g0srybr10vm1dajgbxi67j1l0cs08mr696hxb6m558yxdv5" + "commit": "d697c0dfe38ac7483e453e8ce8056acf95c89ba2", + "sha256": "12s2h4wd7cz9x078698wwjjpy874rk8cm2d17p6ksb10y3cmrqsn" } }, { @@ -91856,11 +91907,11 @@ "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20210510, - 522 + 20210831, + 1405 ], - "commit": "e02a9ea94287f4195edeeab3033e017a56872f5b", - "sha256": "1dlm24gjplfdx3cv2j6jslwgfryh0mvcyccljrwq8rzw8svgs8ac" + "commit": "b57f5d480003ab7b0880e0059dcc51747fb2e088", + "sha256": "16ajp4p26aaswxcxpqgh43p3dk699gab1xc3l3aj7x1sjf3ag3zq" }, "stable": { "version": [ @@ -92450,11 +92501,11 @@ "repo": "jjlee/rescript-mode", "unstable": { "version": [ - 20210506, - 2101 + 20210902, + 2140 ], - "commit": "964a62f907bf786cec6a60719d17244b2958ac62", - "sha256": "16r1bp6dv6s1k8pkxpf1wpk2rh7qd059z97naik60qa26rdwpa4w" + "commit": "b9a151168aa5feeedc823640e4d3863e03eef8cc", + "sha256": "11pn3c61lj3n4nf6h21kmp5j5qs9jfn1s45pnn4i8mc7m1kdznw6" } }, { @@ -93999,8 +94050,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210805, - 1755 + 20210830, + 1944 ], "deps": [ "dash", @@ -94013,8 +94064,8 @@ "spinner", "xterm-color" ], - "commit": "1941f52d34e7e4752e1e465e5636b21ef7ad42b9", - "sha256": "16vis13axbk9d4pnr7588wx527hsr6kcbjxnppc23wpd54j7sgh2" + "commit": "804ebfe0295a6bf37870e06f84a8d35f55c9f1a6", + "sha256": "0ya7l8yfbax74lrwvcr3lxaffb238m3yk8y37msvsk1pvwcjfkr7" } }, { @@ -94503,8 +94554,8 @@ 20200830, 301 ], - "commit": "4a02387d997b0b4d20b24e9a17a68270692219ad", - "sha256": "1k2382v1srcx7qc4rqxghqd87lx7c6jrls7wxgqq1warvklxfx87" + "commit": "f673cf6ab9d13e376d5c71230a693a6b88730e76", + "sha256": "0paflmwafmhk2lcsh74vixids7xkmgacnzn0pm1i7jhkp3a4mn1d" } }, { @@ -95003,11 +95054,20 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20210530, - 624 + 20210828, + 1634 ], - "commit": "1da2b3501f3732b4a58d28b502e356226a43a96f", - "sha256": "198rjkyv876h7mbs73h8dq4lx5xhl66p7xrpvb23v0vk4vw0q5vz" + "commit": "cce59d2bcc48d622f3978c583108cf853f21789c", + "sha256": "0f8aqq026j0wxkgs0p3yjq3r1jd30lk79199wrdk58x9120pp6z6" + }, + "stable": { + "version": [ + 1, + 2, + 2 + ], + "commit": "57fb0022daf5ca753dc77ee9178267c710c318db", + "sha256": "01xw04v22dh60w49i8h72wa2hvhwpqgriv0chy90m8vmn2fz40wz" } }, { @@ -95530,15 +95590,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210630, - 1805 + 20210823, + 321 ], "deps": [ "dash", "edit-indirect" ], - "commit": "4fbbd85c0f809593f6d26edf1388ff059f77e82f", - "sha256": "0jyz0cz1c6bimkd48iv09lgmzgbb63v5dybcgrjcmcg630c8yh87" + "commit": "721ff6abea500d11a23d9c70c522c5010b1939aa", + "sha256": "0fd8dibzzdp07ljw0qp0z6qflf67bs11ain2h1kv2qsz0scbsc3x" }, "stable": { "version": [ @@ -95735,11 +95795,11 @@ "repo": "vspinu/sesman", "unstable": { "version": [ - 20190909, - 1754 + 20210901, + 1134 ], - "commit": "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05", - "sha256": "16d4kkfmrzc4d0smk9m759mv11bvicixrvwh1za7c6avscg9lym2" + "commit": "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77", + "sha256": "1xczx6yavpqjx6sjhfnaw7ls5rh54zq8m7y4jidgx4rdz8y28b0a" }, "stable": { "version": [ @@ -95783,14 +95843,14 @@ "url": "https://codeberg.org/FelipeLema/session-async.el.git", "unstable": { "version": [ - 20210817, - 2218 + 20210902, + 1533 ], "deps": [ "jsonrpc" ], - "commit": "e2ff39bdd60da67214d07900582b1049f74d03fc", - "sha256": "0b05smmgcxn5144wcsxlhi4bpliv9ffk21m02fh3l32mc5h24b30" + "commit": "32a36841fbb3c864776a3a1ac08bb94d44ca10b3", + "sha256": "1r5b05dvyayj1165w5n7vshkgh3nvfga6xv61bdpvrfpy2xs6y6b" } }, { @@ -96385,8 +96445,8 @@ 20210825, 707 ], - "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", - "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" + "commit": "ef34cf7f806a726a53fcffa183280a325defbc54", + "sha256": "0mga7i1n0s4m2iqqyw7lg0qcdhcfvvfrg3rwqgds3ssmvf096lz6" } }, { @@ -96572,15 +96632,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210506, - 358 + 20210829, + 1013 ], "deps": [ "language-detection", "org" ], - "commit": "935cfc793c7380732915c88302c06271d9fc5cee", - "sha256": "0i4qsz59598cd707fm7cjqvczwa6fmgi6fjyknn2wm58hh3yjldi" + "commit": "b8a23e097b25d6c7754f9aaf4de89259f8a0b17d", + "sha256": "0krd112xglcvkgjl0dj6z4h9gwzh99avh10hlp4idcsm8b7hgdc9" }, "stable": { "version": [ @@ -96828,6 +96888,21 @@ } }, { + "ename": "sidecar-locals", + "commit": "223bf20a37b48516b6ec9886c67660151ab37da6", + "sha256": "1lw4s749ril3mfbjdvns2myd5d8jf5dhzyywmk18bp7wb5cnmjbg", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-sidecar-locals", + "unstable": { + "version": [ + 20210829, + 2323 + ], + "commit": "bc41cab4b1765e48096006465c95f62f66fcaf2b", + "sha256": "18i7c0knhl8gvwr1hhlnnfl08sh9h48f7vl31cw8jrx817kzgf2y" + } + }, + { "ename": "sift", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1kr5rxza5li3zrkfvs91y7dxmn213z0zf836rkwkmwg2b9rmqxvj", @@ -97240,11 +97315,11 @@ "repo": "dawranliou/sketch-themes", "unstable": { "version": [ - 20210719, - 2212 + 20210826, + 1816 ], - "commit": "8c4b4ef49fbb059ad00ab9fb76f22c2cdd780e7c", - "sha256": "0lvjdcsx3gvg7lk22l5c8jmdqk9s38figlr5zcbbk7fgjpf4q0p2" + "commit": "50fd9fe9caf24f42dc481560e1f41addc3a06dbb", + "sha256": "0j26a9q271cd8b6vcxs6iyn3a3xz210lgyszxb39715x8lvwhvvy" }, "stable": { "version": [ @@ -98207,15 +98282,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210817, - 1912 + 20210904, + 1621 ], "deps": [ "cl-lib", "dash" ], - "commit": "22794b5b3773504610127c5f011629402dfec20c", - "sha256": "14b65bfsh4fglm65cvzgp412na8ykqkcwaqg84hvw6j6lqrvpg6v" + "commit": "2834c66c4f09778d0c57e99886c329188eed591a", + "sha256": "0zy5jamid6qkx8rml9ccqv85f2sr10j1rp3j77acggkf6zf3c096" }, "stable": { "version": [ @@ -98719,15 +98794,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210825, - 1510 + 20210826, + 832 ], "deps": [ "dash", "s" ], - "commit": "212e7c1492a9d208ece2a85e64bd352e9cd53c89", - "sha256": "13afcxy5vs38xzx2mi5xpszwiabyc5hiwq1r9vy6jx6pgsb7pkhc" + "commit": "4d921b6e9c98fa208578b2b409e627580d1ab8c2", + "sha256": "0bh9brzqsvm6dj961smp4592bgjrhhq600qbqbgps8rnbbcjnl3r" } }, { @@ -98933,11 +99008,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210823, - 609 + 20210827, + 859 ], - "commit": "48158887c0a605b7cc1ffdbeb937f182b299f4db", - "sha256": "1l9ylidix4l8979d4wzvd9fpsxvjxb6nii09s1g90rsli4av8ps2" + "commit": "874694ed8569ae98959262cfb0c66a6528a60367", + "sha256": "1j6728229rrpamh4nn2v5mmlbb111i6ar7zh0g9d922k7vqr2nam" }, "stable": { "version": [ @@ -100333,11 +100408,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210825, - 1823 + 20210902, + 626 ], - "commit": "a6bbe36afa229b88aa5b406b9ef6e6393d9b2d5d", - "sha256": "102fhdhr3xa9jvdl5i715p07x0lgd3wxkhkh3li91p7gncxhrvyd" + "commit": "021239f0e2bcc60257b72916db9cdd110588ec28", + "sha256": "0v79z2d9l824j6chsviffdsfb4m9w93kgwcwdaksdb5rsfmryigp" }, "stable": { "version": [ @@ -100617,8 +100692,8 @@ 20210810, 1814 ], - "commit": "c78a04c5cf00320c0e1e6646295e20425537bf9e", - "sha256": "01ifxzzrn31d1gaq7yr88dciwylhy5q6lz4kvwkq6smqmvp3x80w" + "commit": "aa5bac257ebefd91f4b5dd787a835407bddd6fb2", + "sha256": "1zpvbsrmcz9zhlchfsbsfbi3g9z1wxhkhbpg2zp2dpk4czqy76lk" } }, { @@ -100761,8 +100836,8 @@ 20200606, 1308 ], - "commit": "c9761ab0439ed1430b635c97cbf7fae7d3019a15", - "sha256": "07g40r27s7qv68qzrplsvjdkrli7jibmak1a7fnbhsgngq9q9ily" + "commit": "ed1651792509ddbd1e139a884d26e6cd818160cb", + "sha256": "1kk5f1i3dl86svvnl845ya2vgc0xhhfp1lgns2bl6glpf5qy8bxb" }, "stable": { "version": [ @@ -100871,11 +100946,26 @@ } }, { + "ename": "streak", + "commit": "deb209280c77f135fc2f2544c35220160c516f72", + "sha256": "0941kfch25qn2579zjbcrhp6s92p3sh447hzswa53w8yz95hgjy5", + "fetcher": "github", + "repo": "fosskers/streak", + "unstable": { + "version": [ + 20210901, + 1646 + ], + "commit": "ac05a0d74ceaccff15f1f7128fbb976be53db549", + "sha256": "0wffyf382d2mgs4asfbljvlzz3sr1mrs0analkj1ywqblv0z8xhh" + } + }, + { "ename": "streamlink", - "commit": "e6674aefa0082fc5754c888538e447037f3618f8", - "sha256": "17r4dkpap72yz62nk9pr3l48qgpm5hidffmdfnbx7bwl07wzk6cb", + "commit": "9d776fb6dfb17d55235b6d7fefed894756fde794", + "sha256": "1zz05mhp48i3q3ai0925b7sbrriyfqrr73bngiargydx3753kizv", "fetcher": "github", - "repo": "benediktbroich/streamlink", + "repo": "BenediktBroich/streamlink", "unstable": { "version": [ 20210811, @@ -101251,14 +101341,26 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210808, - 1328 + 20210902, + 2047 + ], + "deps": [ + "transient" + ], + "commit": "5740a2b96c827c499f3ac506f98ec5f9ed31ea37", + "sha256": "0qr96a86zj6kipix6p831hj0nkcyj3kvaggyy2zsmvhx7wjavadf" + }, + "stable": { + "version": [ + 0, + 2, + 0 ], "deps": [ "transient" ], - "commit": "42c2e0b5b81c78741c069c8cfdb9e5d494157dc8", - "sha256": "08q6sccdkad4y3vv9h8bxkdn66dc4b2wxzhf7z87i70v7bw1xnwa" + "commit": "5740a2b96c827c499f3ac506f98ec5f9ed31ea37", + "sha256": "0qr96a86zj6kipix6p831hj0nkcyj3kvaggyy2zsmvhx7wjavadf" } }, { @@ -101892,8 +101994,8 @@ "deps": [ "ivy" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -102153,14 +102255,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20210422, - 2110 + 20210906, + 614 ], "deps": [ "seq" ], - "commit": "4231a36e39b7393d639e9cdef19f311d780deeab", - "sha256": "0q2x39s3g5kmjf5q47qpqcnzdscnj112dfd7qqb2z0iq0sh2nbrd" + "commit": "8629a4ddbe95d42c39ce817d724877deb1984ba1", + "sha256": "1g8zi7qky5vfrl2c2wvdcr0mrm8xkkxl3cbhrkh95bhq1vypz5p8" }, "stable": { "version": [ @@ -102223,8 +102325,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210820, - 2202 + 20210829, + 2036 ], "deps": [ "evil", @@ -102236,8 +102338,8 @@ "seq", "undo-tree" ], - "commit": "4561214b453e551253e9a273ef57c84c12c7cd8b", - "sha256": "1adzvdp54l1d6awcbfrbqx41kh40lqk5009h1gpj315l3zq3vhpx" + "commit": "cd80cfbff832b64de65fc4ecb50a53956dac760f", + "sha256": "1nh6fncm46lml9df9vlj3s21qxai43fgsvl3b8mzr7rp3c0f40l5" }, "stable": { "version": [ @@ -102470,16 +102572,16 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210825, - 116 + 20210906, + 1438 ], "deps": [ "hide-lines", "hsluv", "ov" ], - "commit": "7773a8488db88424e5e86cf4268c9bbe0b94085a", - "sha256": "0cph14cc3dzv3dp8aq6ifs3m92rq8jr4b2rpdjgc8pbcjrs9hvyb" + "commit": "f0d25da654d0666c6084fcb0d075326e13ec06c0", + "sha256": "1baa9n85vq77xha89j09n32zmwppgrwxg3z30vrbbjqaiwlb6nr3" }, "stable": { "version": [ @@ -102912,8 +103014,8 @@ 20210415, 1322 ], - "commit": "daf9920a8ecb230045f4b07834b3a6f45676f1ce", - "sha256": "0lh90x5hqxm3pyqiy4qb10nxs5ga7w4hc7k6xkax41yhi41bgd58" + "commit": "5eacb6c1c879038c4448c10b3df9a73d95a48fc3", + "sha256": "0k7y7lxdgj73mmrs228l7m9b9fdzjjw8knqzwhkvqb5bb93ii6fm" }, "stable": { "version": [ @@ -103100,15 +103202,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210825, - 2144 + 20210903, + 2313 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "08d652fd85fdb799e5b68caddc64bbbdcb08205b", - "sha256": "1f5vhxw34qbgxc99zz7m3lml18xw59qdrgdfmxa79nxfrqczabcd" + "commit": "5450160db7ab7661ec2519d53bb26429ea90a1fe", + "sha256": "1yzqlnw1vmbk2dn790ljirp253k4h5j12r0pm2zpp4iachl1z2kw" }, "stable": { "version": [ @@ -103239,11 +103341,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210802, - 249 + 20210902, + 228 ], - "commit": "23c9bce8c1e3866e7cdbe9a69777648e13707357", - "sha256": "0rn8d0zn3dlqfvr5m5v687bw96mnv02v6ngq5jvljgykyawh3h58" + "commit": "e1ccb88cdc4b482b078276960f810b82ba3b7847", + "sha256": "0wy53y7p6i0m9az0ca4zqrqfq40cgn202pilsawdy8rlpj9y619p" }, "stable": { "version": [ @@ -104048,14 +104150,14 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20210727, - 249 + 20210827, + 424 ], "deps": [ "cl-lib" ], - "commit": "32ca76dfa8100a2069ca735e28e19ae87c74f956", - "sha256": "184n2r33d99wmzrnscpl0rqqivmvm17k60gfbrw5yjppq5fl55m3" + "commit": "e6e8efd740df0b68db89805ba72492818dba61ab", + "sha256": "1cy1s9iyv2c4c2kld42aricar4s5d0irdhsqb8rsbbriif50vpvd" }, "stable": { "version": [ @@ -104191,18 +104293,18 @@ 20200212, 1903 ], - "commit": "876f7c33782aaac147e88d9063fd286f7a8a46e1", - "sha256": "1b2kfqkr9ss9lb5133zpp8sz9w7c77mydv1lvb56fi03lms94a5r" + "commit": "3569010b61baefb4324d4b28f1ae60799283a4b5", + "sha256": "10y5h8qfcbgxnihnm61ab9xs74128jni5gha9k3m7afa5wg8j84b" }, "stable": { "version": [ 2021, 8, - 23, + 30, 0 ], - "commit": "a70658fff6a7cc01e323dd7a4a5b7305906796cc", - "sha256": "04r195apvbp4b0nk4j45pxhyl5dl6hr7x35zji548v0q8dgiv5lm" + "commit": "9dabbd58640cfe95ddb7f30d497693f4ba6d9f01", + "sha256": "0mw7vhs78m0zk7mz8icd6zr4bzsjn82jcdgrb13bw76xw6i88161" } }, { @@ -104258,8 +104360,8 @@ "deps": [ "haskell-mode" ], - "commit": "7142775c2039cae4cde9bdd6f68b3e0cbae2de9d", - "sha256": "02913lhc08kwx4m0x6hm40bg1yym449y160bndmpfv4n19d92z44" + "commit": "638a1079a0ba8cd757bc74f99a58d5724b3314f5", + "sha256": "1ki0i9f1fvvhkac1ivd7smg5c3vnbdrfyxr6v9q4fms4mczj4jc9" }, "stable": { "version": [ @@ -104507,11 +104609,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210819, + 20210828, 2241 ], - "commit": "facb4da1a2ee333a3c66f56009c8dec8e9652dab", - "sha256": "0wpam6kjg53j00g4k4ar0zhf0v0nbpp00klk0cbpv06yr4lvswpc" + "commit": "07fa0c6287612693a4d9b571d6a9a72e498e41c2", + "sha256": "0fswhfn0qjpb94dlbl3rivgkbz3vdly4hk5hgl017zgj3nfb06vn" }, "stable": { "version": [ @@ -104717,16 +104819,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20200517, - 1825 + 20210905, + 2024 ], "deps": [ "dash", "org", "transient" ], - "commit": "b3f003603111b7e31b94c354cf4c83c8208c01c3", - "sha256": "0srk3chc45fl6zjwymzqwmxm22w9pcjxg7968c7fkvbqr21wk6p7" + "commit": "cd934e50d6a226c8718957877aedc4d2d947ac59", + "sha256": "12v9alrkvzwihkldn2wbn3xc3yc408kmp155j9pn9vjy53fypvg1" } }, { @@ -104931,6 +105033,21 @@ } }, { + "ename": "topsy", + "commit": "89d455ee48c4567e098bb733396fa2729bec58c6", + "sha256": "0nxgfixly4rnvn83kz8lgc7pjdvzhm0px2w711zkx9rp55d5g86z", + "fetcher": "github", + "repo": "alphapapa/topsy.el", + "unstable": { + "version": [ + 20210831, + 133 + ], + "commit": "8ae0976dfdbe4461c33ed44cf1dedc2c903b0bb0", + "sha256": "032i1prl2v5w4l37zjlqam7063s56nk61nj5l3ypmxp98yz9nrq8" + } + }, + { "ename": "tornado-template-mode", "commit": "f329baae028fd17618824128f312a49aa0a0807e", "sha256": "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h", @@ -105511,14 +105628,14 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210811, - 1609 + 20210904, + 216 ], "deps": [ "tsc" ], - "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", - "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" + "commit": "dbab35d5fc2fd5cb6ba08f31478446706e65282f", + "sha256": "0jv31399968ig4yys4jvkjzpkj1kszskil9aiba6hc0p6sips91f" }, "stable": { "version": [ @@ -105572,14 +105689,14 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20210825, - 1205 + 20210831, + 1555 ], "deps": [ "tree-sitter" ], - "commit": "81adcdc06a9700ecf9659171da275b1c9dcfdfb6", - "sha256": "0k067rkzdnxs5h5yf5l7pppbnwc0x6c41d97kygi1z03124s77s6" + "commit": "ef42920bb573b40e64b35e43968dac355f87e959", + "sha256": "03257nqxz11g4qivmq2h7gs98ssrmpvdyaghrfxpaizagbk7clmd" }, "stable": { "version": [ @@ -105638,8 +105755,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210823, - 1524 + 20210906, + 1653 ], "deps": [ "ace-window", @@ -105651,8 +105768,8 @@ "pfuture", "s" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105688,8 +105805,8 @@ "all-the-icons", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" } }, { @@ -105707,8 +105824,8 @@ "evil", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105737,8 +105854,8 @@ "deps": [ "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105761,16 +105878,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210906, + 1653 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105802,8 +105919,8 @@ "persp-mode", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105835,8 +105952,8 @@ "perspective", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" } }, { @@ -105854,8 +105971,8 @@ "projectile", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -106113,8 +106230,8 @@ 20210825, 1402 ], - "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", - "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" + "commit": "dbab35d5fc2fd5cb6ba08f31478446706e65282f", + "sha256": "0jv31399968ig4yys4jvkjzpkj1kszskil9aiba6hc0p6sips91f" }, "stable": { "version": [ @@ -106193,14 +106310,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210825, - 1946 + 20210904, + 917 ], "deps": [ "caml" ], - "commit": "d2b38f0249e3db467e9708985571f06ae191edbb", - "sha256": "1gaind3zfj1adl6dhk5yrx2fajqhxb8ch38vk66077s81qqzzw7k" + "commit": "eb0bff8d7bdf229322aa28ff0a8f44ba5e162202", + "sha256": "1y2dpc2hndqwk8gc6lp6f1c4px3kak514hk120sjxpb3133g3ivf" }, "stable": { "version": [ @@ -106457,19 +106574,19 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20201002, - 1109 + 20210830, + 1858 ], - "commit": "b369d7d2518fa11760ac3908a383405350cd51d2", - "sha256": "186bpvqxx87kp3857mq0mzn1ddsvzmpijix810k6bdz8522x7zdw" + "commit": "2a58631230fe2d176352af262a0efdecc21f90ac", + "sha256": "0fjgw71sgyrygzk9s6hfrqky06lqfwzz75bjxkxhb7yl5mdj8ccv" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "7a5c74d88e3c5513cc4431a837003736f905a75e", - "sha256": "002f1xfhq43fjaqliwrgxspryfahpa82va5dw3p8kwil2xwvc6mh" + "commit": "b369d7d2518fa11760ac3908a383405350cd51d2", + "sha256": "186bpvqxx87kp3857mq0mzn1ddsvzmpijix810k6bdz8522x7zdw" } }, { @@ -109336,11 +109453,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210824, - 1453 + 20210905, + 903 ], - "commit": "9e5a208d8871293a23a2734591fac97a584a41c2", - "sha256": "13r9zxivgml610d0hk9cagpyv982596knad6jwq48cpncckwxrvl" + "commit": "db9f47f62391e9ac02fff6f0c63528bd8e5658de", + "sha256": "19fvxyqcrhim6p06krsh4zaqkl49vcdpkd6i9xqldsmm4lzmcqj8" } }, { @@ -109351,14 +109468,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210629, - 927 + 20210902, + 828 ], "deps": [ "vterm" ], - "commit": "2258eb19e8bde75f79505c4306f3476bcedce56c", - "sha256": "0k5hmn2wnag6hirnk2ch3xviymbxha5pcb3p1j1lj2likbhwizw8" + "commit": "ea0bfeaa200d9ed02b51bbbd83222657b02637e7", + "sha256": "0bwgzpf2wyzdj9smwys06zx4yha72pw50wzdh4zld45ph40pb6qw" } }, { @@ -109572,11 +109689,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210817, - 327 + 20210906, + 347 ], - "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", - "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" + "commit": "ef34cf7f806a726a53fcffa183280a325defbc54", + "sha256": "0mga7i1n0s4m2iqqyw7lg0qcdhcfvvfrg3rwqgds3ssmvf096lz6" } }, { @@ -109664,11 +109781,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20201001, - 1448 + 20210903, + 1619 ], - "commit": "b803fcaef31539e070a08202b9039bbeb29e8f66", - "sha256": "1bjl9h8p63334dxbbcdz6rmmskslrlbbvakhklzica9al7gr92w5" + "commit": "8fa54f3cf7921e961e46d20e1afc51eec8286003", + "sha256": "196y13zjbp4j1fjsgcaqri9bplzj5445g8i8l4plv4ff9nkyyc2p" } }, { @@ -110043,11 +110160,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20210131, - 1758 + 20210902, + 1615 ], - "commit": "8ef47935d638902ba35a557cae5edd6ab6ab1346", - "sha256": "1csskh7wyyjjpn81if2ss29vaz8vqzszb9yg99ffkgkyx2fr57y1" + "commit": "61f057a6baeba6b3595e412ba79b3080dca17dcc", + "sha256": "0qmsczsx867h97yqifn9rv5d3gsy7mgwjl9radbf63wfdd89zgcb" }, "stable": { "version": [ @@ -110220,14 +110337,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210822, - 1937 + 20210906, + 1254 ], "deps": [ "templatel" ], - "commit": "cc095820669c7c2e77b06a86a887ecec70ae4853", - "sha256": "0ma5shksdha84yf18ay7a6ss4aacjh94827a5wmyv9bc5za5yvq1" + "commit": "e49a901223b9f5db390adf01e3928f134aa66f25", + "sha256": "1h1k54p5sfd5bxqg40w62nprii28g0pjkfy0ayf0vyxsyhdj6d9y" }, "stable": { "version": [ @@ -111653,8 +111770,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210809, - 1409 + 20210826, + 1000 ], "deps": [ "ace-link", @@ -111662,8 +111779,8 @@ "swiper", "zoutline" ], - "commit": "e31759db6aae8a951c0843a4c855bccb626348c4", - "sha256": "1aziil5gmiyk0qb89ydc7h72zdyr2n71z3ybrqji9ypx3vrrdwdx" + "commit": "aab516cd0cae65796cce89b29691e95d18bec3ef", + "sha256": "1kiy00r01h05p5i2g0z5kv9dhk3hcbfhjc3gibcx7bspsjsnmn7q" }, "stable": { "version": [ @@ -112082,11 +112199,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210824, - 120 + 20210905, + 1756 ], - "commit": "20737b65529ca185db663e709cca412e8d03cb1e", - "sha256": "0621vah5xm5zz6mhlgjlbqiccpbq4nssckm3wyqmw30mk2zr29mb" + "commit": "b1316dbf6b8b381a6d9149e1b09c645b748cab78", + "sha256": "1jwgw5s1midak6f15d7azvqa48nljmdbn36sjcm39xfq55m9rfj6" } }, { @@ -112097,11 +112214,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210824, - 730 + 20210904, + 716 ], - "commit": "4bd7858dadff5c5320f169ebabde379e29bb7559", - "sha256": "0ygqzyc398asczryyr4qz5sljzz0a4l87l1vys32vv49g4z1szih" + "commit": "2c39feb58415d5163e821bf83d0fa2b6d1a235c6", + "sha256": "062mxc8zbhjing13anx3hd4wnj0702r6ppwbj6glbrvvrjx44ly8" } }, { @@ -112112,11 +112229,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20210815, - 201 + 20210902, + 518 ], - "commit": "88e390e1f7ccee30cd4d5ac112acdf9b4c72780d", - "sha256": "1rhivz291580s0wn0syqhhaqdv7p3df0a7vk8zmx6485nm1hy4mh" + "commit": "a4cb60fb893b62d39ebeb79e5c322d1192c7cf4b", + "sha256": "051m6697fxkff7jh8nhzxl9dh6vjw75ndgfz1cf743i79gdgj8nk" } }, { @@ -112127,11 +112244,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210823, - 302 + 20210828, + 1914 ], - "commit": "c5a510db6aa15de78c809490571a5b2e9d765202", - "sha256": "05xzhrbn3y0wkan6cpk290cvb5gn4gdjkh64s0q466hbybm4lnj5" + "commit": "0258ce1969ea4766a2b1a89d3c091cc96ea7ae16", + "sha256": "1vfnx4p2361pzr3lf4bj09xqbp93g1s7a7fjmgfz4f7agaph77zj" } }, { @@ -112142,11 +112259,11 @@ "repo": "xahlee/xah-get-thing-or-selection", "unstable": { "version": [ - 20210813, - 834 + 20210828, + 1913 ], - "commit": "ba818dc7fd90b49b780709be5266733ede86a556", - "sha256": "15bjib9n7qakdc70x4xdjaw1q1rm9yz8k55l24mfm848fz62bq30" + "commit": "849683fa055afc982af4811f89998281ffe99315", + "sha256": "0zcjb8glb28q1vskyp4mwqpysx1nphyciw8jszfhxqgsbr7nq3fv" } }, { @@ -112157,11 +112274,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210801, - 102 + 20210902, + 519 ], - "commit": "d69eb2b66eff70ef311967bf774195bf3331cfff", - "sha256": "12ssjraw8ymphkiyvzpnmh90k9m2sskvklkjcl2ni7qmjc5774v7" + "commit": "a8ef9b5597ab176015c185a9da435b2d5e5d5b71", + "sha256": "0hsy7y1vdc8warh4h0yanckm5b0jh6kpmwhyh035j7xvkg6lzf4w" } }, { @@ -112172,11 +112289,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20210815, - 211 + 20210901, + 207 ], - "commit": "1685bb8652c28a32c6d55fe61bbf4b5cb3f3dcca", - "sha256": "11akmsmynrbzadyw502czrvaw0mly06mzlj4zg5adgvy52mpb0ip" + "commit": "e7aefa49d6335cac5c08c7aeb4f4837e2706ae9d", + "sha256": "0rkrz324l0gr1lm4nbwzlfl5cs8xh6dr2hh00shbkjby9fshy8b1" } }, { @@ -112202,11 +112319,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20210815, - 207 + 20210906, + 1001 ], - "commit": "b5e4f9ebc9e17916e736af9935bf4e17032edde9", - "sha256": "1dy3y27xyprmxymnm43d7vsmsfhdrr1nbbdpvfflqxs9q6hll2xn" + "commit": "2ae97f13ced5a25881c7d7bca1804259403c1f80", + "sha256": "0akyld9fpzw5smgqnqsv7cbqpqah262y2cwpka1di4wdmz8sijdb" } }, { @@ -112522,19 +112639,19 @@ "repo": "ndw/xmlunicode", "unstable": { "version": [ - 20210717, - 1246 + 20210829, + 1631 ], - "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77", - "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp" + "commit": "6e91a39114ae6ec98b26c9670db916a02c721b1f", + "sha256": "07qkp4igbsdxffcm1hlprf0jgvq1mc714q85pbpby5kfir9f2lbd" }, "stable": { "version": [ 1, - 24 + 25 ], - "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77", - "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp" + "commit": "6e91a39114ae6ec98b26c9670db916a02c721b1f", + "sha256": "07qkp4igbsdxffcm1hlprf0jgvq1mc714q85pbpby5kfir9f2lbd" } }, { @@ -113997,6 +114114,36 @@ } }, { + "ename": "zettelkasten", + "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3", + "sha256": "07gbkpanzs4rk066gg3nm95mfv3ng1f0si17mv2qax2dfx5k0lzd", + "fetcher": "github", + "repo": "ymherklotz/emacs-zettelkasten", + "unstable": { + "version": [ + 20210830, + 1025 + ], + "deps": [ + "s" + ], + "commit": "748e14b5a0dc2200d10b946d0111bd286e2c1c71", + "sha256": "1s9nhqbw5jxkqsvy40dd80l5wjw1407vk9qmdfiva8hj0ymcigr6" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "s" + ], + "commit": "dd4feae2111357d99dcde1919c1d72523cc5b68c", + "sha256": "16hqk9hdfmbjmhb6bb0xk6silgx85ji0q1dpncwgida6958rq79r" + } + }, + { "ename": "zetz-mode", "commit": "ad2add185cf31a92ca1fcd3a9efcbcdb0aa9e583", "sha256": "0k30c0f2h96vvb8yacpg710gi64swwslm1gljpzcwxni5kdpqkzm", @@ -114036,11 +114183,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20210605, - 513 + 20210831, + 719 ], - "commit": "acf3ee8bbf6b7e49dbfaa8bc82a4c1b9b1f2b531", - "sha256": "0wc65hr9y1yvyb5ywswiwhk8jjxswzd0qzr92b7pkfwghmf0z1yp" + "commit": "aba01b6199b7697692e5e9217f602477dd5ebd9b", + "sha256": "1qlvsm4736wr3gw54jvjq3yilf3d7564yydhid4ka1wswvl3sbq3" } }, { @@ -114458,11 +114605,11 @@ "repo": "abo-abo/zoutline", "unstable": { "version": [ - 20190520, - 1819 + 20210901, + 1100 ], - "commit": "63756846f8540b6faf89d885438186e4fe1c7d8a", - "sha256": "1w0zh6vs7klgivq5r030a82mcfg1zwic4x3fimyiqyg5n8p67hyx" + "commit": "3c0b5072a2f19a35d92dde6377ae7c1ac0d3bfe7", + "sha256": "0ickivsq8zn0b50mqfa94c63id3fki94wd1w9br84dbd6kjiy1s7" }, "stable": { "version": [ diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix index 8e29fd48c833..095d79bdf62b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sunrise-commander"; - version = "0.0.0-unstable=2021-04-23"; + version = "0.0.0+unstable=2021-07-22"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "db880fbea03d2db00db1398c91918c3c6f0392e3"; - hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE="; + rev = "7662f635c372224e2356d745185db1e718fb7ee4"; + hash = "sha256-NYUqJ2rDidVchX2B0+ApNbQeZFxxCnKRYXb6Ia+NzLI="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/featherpad/default.nix b/nixpkgs/pkgs/applications/editors/featherpad/default.nix index 42c8e77ac68e..84dc16c76d12 100644 --- a/nixpkgs/pkgs/applications/editors/featherpad/default.nix +++ b/nixpkgs/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "0.18.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "0av96yx9ir1ap5adn2cvr6n5y7qjrspk73and21m65dmpwlfdiqb"; + sha256 = "sha256-GcOvof6bD7GNrABXIR8jOfzjDEN5Lvnj24M154iqQgU="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index bd8751dcf99b..db2d36e338f7 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -242,12 +242,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0im14b52b6hgns964m946q68mvyaq8haldm92s9cn5azh8yg1arc"; /* updated by script */ + sha256 = "0knl0ca15cj0nggyfhd7s0szxr2vp7xvvp3nna3mplssfn59zf9d"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "17fzrn20mkldf74965c7abw3znyxskssdz1k4lciz6q7kn5cvdbf"; /* updated by script */ + sha256 = "18dammsvd43x8cx0plzwgankmzfv7j79z0nsdagd540v99c2r2v3"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "15pxr9w4gs342g9in7a41x0cpb7z68y28hwsamk9ic7yz2qshps8"; /* updated by script */ + sha256 = "0ayqvyd24klafm09kls4fdp2acqsvh0zhm4wsrmrshlpmdqd5vjk"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1zki6myy3wbr1sgp1gli263y32g75gna2r9m7baa06zvc6c7j9vw"; /* updated by script */ + sha256 = "1af43c51ryvqc7c9r3kz2266j0nvz50xw1vhfjbd74c3ycj8a1zz"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0gbx1ngf8i2a0dvysw5g0ikakq4a7gghb4rjk7c99jwzwq9hckjm"; /* updated by script */ + sha256 = "1257a9d9h3ybdsnm74jmgzp1rfi1629gv9kr0w2nhmxj7ghhbx4w"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -307,13 +307,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ versionMajorMinor = "2021.1"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "1gp9f4b57pr8c20qxcwax4l0d3w13x4lihxpb9z4agdqjafnc9l6"; /* updated by script */ + sha256 = "0w1nchaa2d3z3mdp43mvifnbibl1ribyc98dm7grnwvrqk72pabf"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -321,12 +321,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "11lm7mja3mc2v329i830j8w1zymlz11sj86qvcg7s4pgc4xwnzd6"; /* updated by script */ + sha256 = "1iqnq38d71wbl1iqhqr5as1802s53m3220vq4g42mdjgdj296bdk"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -334,12 +334,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "075lb50g853791hj8ahhi88zbp07cvfs3zrdahvvif2nd121r1mx"; /* updated by script */ + sha256 = "1z59yvk3wrqn0c9581vvv62wxf4fyybha426ipyqml8c405z27y4"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -347,12 +347,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1l83a8wfqz4xddscpzf7v29rhq9ibx32ximcqrj1cw0i9v7qnv9g"; /* updated by script */ + sha256 = "0sh9kdr53dhhq171p9lmsvci3qzlds4vzyqx12mzfvfs7svri1w2"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -360,12 +360,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.1.5"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "17mxqh6p9jby5qrjqaq5km0j8k1bp8061ch2j059ka3n4ycxy7ph"; /* updated by script */ + sha256 = "1b5ih6q8kyds8px7gldfz1m9ap3kk27yswwxy1735c83094l2nlm"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -373,12 +373,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "169jsd34l83n1pnrhzz548yn7ch1dzxpy8xck7vlymjgrxdqciwi"; /* updated by script */ + sha256 = "09blnm6han2rmdvjbr1va081zndzvjr1i0m3njaiwcb9rf2axm32"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -386,12 +386,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.2"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1whikk1izzvhq1d7kaf2kn4j4qpxn7aq70hlbxr1kb7zs4mzy9x3"; /* updated by script */ + sha256 = "12i9f5sw02gcgviflfs6gwmnxvzhgmm4v4447am0syl4nq8nyv1s"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index d0827bf2a7ff..7a1975c37c6b 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.6) - multi_json (1.13.1) - neovim (0.8.0) + msgpack (1.4.2) + multi_json (1.15.0) + neovim (0.8.1) msgpack (~> 1.1) multi_json (~> 1.0) diff --git a/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 28a53cc590f6..60dcc8ba3832 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -1,27 +1,33 @@ { msgpack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; type = "gem"; }; - version = "1.2.6"; + version = "1.4.2"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; neovim = { dependencies = ["msgpack" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07scrdfk7pyn5jgx5m2yajdqpbdv42833vbw568qqag6xp99j3yk"; + sha256 = "0lfrbi4r6lagn2q92lyivk2w22i2spw0jbdzxxlcfj2zhv2wnvvi"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; } diff --git a/nixpkgs/pkgs/applications/editors/neovim/tests.nix b/nixpkgs/pkgs/applications/editors/neovim/tests.nix index 5f4cda714a67..202b18efb8cf 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/tests.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/tests.nix @@ -84,6 +84,13 @@ rec { viAlias = true; }; + nvim_with_plug = neovim.override { + extraName = "-with-plug"; + configure.plug.plugins = with pkgs.vimPlugins; [ + vim-go + ]; + }; + # nixpkgs should detect that no wrapping is necessary nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; @@ -133,7 +140,7 @@ rec { configure.pathogen.pluginNames = [ "vim-nix" ]; }; - nvimWithLuaPackages = wrapNeovim2 "with-lua-packages" (makeNeovimConfig { + nvimWithLuaPackages = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { extraLuaPackages = ps: [ps.mpack]; customRC = '' lua require("mpack") @@ -141,6 +148,7 @@ rec { }); nvim_with_lua_packages = runTest nvimWithLuaPackages '' + export HOME=$TMPDIR ${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es ''; }) diff --git a/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/nixpkgs/pkgs/applications/editors/neovim/utils.nix index 837c9a79ffe8..bf0d80d1f07d 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/utils.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -78,8 +78,7 @@ let ++ (extraPython3Packages ps) ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - lua = neovim-unwrapped.lua; - luaEnv = lua.withPackages(ps: extraLuaPackages ps); + luaEnv = neovim-unwrapped.lua.withPackages(extraLuaPackages); # Mapping a boolean argument to a key that tells us whether to add or not to # add to nvim's 'embedded rc' this: @@ -115,8 +114,8 @@ let ] ++ lib.optionals (binPath != "") [ "--suffix" "PATH" ":" binPath ] ++ lib.optionals (luaEnv != null) [ - "--prefix" "LUA_PATH" ";" "${luaEnv}/share/lua/${lua.luaversion}/?.lua" - "--prefix" "LUA_CPATH" ";" "${luaEnv}/lib/lua/${lua.luaversion}/?.so" + "--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaPathAbsStr luaEnv) + "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaCPathAbsStr luaEnv) ]; diff --git a/nixpkgs/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix deleted file mode 100644 index a9afc774bc05..000000000000 --- a/nixpkgs/pkgs/applications/editors/typora/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchurl -, makeWrapper -, electron_9 -, dpkg -, gtk3 -, glib -, gsettings-desktop-schemas -, wrapGAppsHook -, withPandoc ? false -, pandoc -}: - -let - electron = electron_9; -in -stdenv.mkDerivation rec { - pname = "typora"; - version = "0.9.98"; - - src = fetchurl { - url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "sha256-JiqjxT8ZGttrcJrcQmBoGPnRuuYWZ9u2083RxZoLMus="; - }; - - nativeBuildInputs = [ - dpkg - makeWrapper - wrapGAppsHook - ]; - - buildInputs = [ - glib - gsettings-desktop-schemas - gtk3 - ]; - - # The deb contains setuid permission on `chrome-sandbox`, which will actually not get installed. - unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; - - dontWrapGApps = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share - { - cd usr - mv share/typora/resources/app $out/share/typora - mv share/{applications,icons,doc} $out/share/ - } - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/typora \ - --add-flags $out/share/typora \ - "''${gappsWrapperArgs[@]}" \ - ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" - ''; - - meta = with lib; { - description = "A minimal Markdown reading & writing app"; - homepage = "https://typora.io"; - license = licenses.unfree; - maintainers = with maintainers; [ jensbin ]; - platforms = [ "x86_64-linux"]; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/vim/vimacs.nix b/nixpkgs/pkgs/applications/editors/vim/vimacs.nix index d98e3b37514f..6eb995f86e06 100644 --- a/nixpkgs/pkgs/applications/editors/vim/vimacs.nix +++ b/nixpkgs/pkgs/applications/editors/vim/vimacs.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p "$out"/bin - cp "${vimPlugins.vimacs}"/share/vim-plugins/vimacs/bin/vim $out/bin/vimacs + cp "${vimPlugins.vimacs}"/bin/vim $out/bin/vimacs substituteInPlace "$out"/bin/vimacs \ --replace '-vim}' '-@bin@/bin/vim}' \ --replace '-gvim}' '-@bin@/bin/vim -g}' \ diff --git a/nixpkgs/pkgs/applications/editors/vis/default.nix b/nixpkgs/pkgs/applications/editors/vis/default.nix index 9a020233f3b0..a658f95ac014 100644 --- a/nixpkgs/pkgs/applications/editors/vis/default.nix +++ b/nixpkgs/pkgs/applications/editors/vis/default.nix @@ -1,8 +1,11 @@ { lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem -, ncurses, libtermkey, lpeg, lua +, ncurses, libtermkey, lua , acl ? null, libselinux ? null }: +let + luaEnv = lua.withPackages(ps: [ ps.lpeg ]); +in stdenv.mkDerivation rec { pname = "vis"; version = "0.7"; @@ -19,8 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libtermkey - lua - lpeg + luaEnv ] ++ lib.optionals stdenv.isLinux [ acl libselinux @@ -30,16 +32,13 @@ stdenv.mkDerivation rec { patchShebangs ./configure ''; - LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;"; - LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; - postInstall = '' mkdir -p "$out/share/applications" cp $desktopItem/share/applications/* $out/share/applications echo wrapping $out/bin/vis with runtime environment wrapProgram $out/bin/vis \ - --prefix LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ + --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index a4d40a0b4f64..27b698c45ba8 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1z8sxdzwbjip8csrili5l36v1kl3iq8fw19dhfnkjs3fl0sn360k"; - x86_64-darwin = "0sp5k4pk9yjx16c79hqrwn64f2ab82iizm1cy93y9rr2r3px1yga"; - aarch64-linux = "03qm5008knigsahs6zz5c614g1kid3k0ndg8vb0flfwmdrajrdw3"; - armv7l-linux = "0sls3m5zwz6w01k7jym0vwbz006bkwv23yba7gf1gg84vbqgpb1x"; + x86_64-linux = "1l3khnqb8icapnwk4pr4s639dqsvjy1k51km2p9ywnrjdg9byc12"; + x86_64-darwin = "1lb63rz9mzcw5yg3cqi022m1ldvmbxz5z70axc9n6dci8aals663"; + aarch64-linux = "0c0rxzhayklgnaf0r4hj6rwdh5qbb449vi5ja0asfyni4k2nalr5"; + armv7l-linux = "0xs8wsad64cni8vpzfh2aqgdsnsy4hwc25msl79prvh17794k8jy"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.59.1"; + version = "1.60.0"; pname = "vscodium"; executableName = "codium"; diff --git a/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix index 31d14185dcd9..8fa85803bfd8 100644 --- a/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , ghostscript , libpng , makeWrapper @@ -14,22 +13,13 @@ stdenv.mkDerivation rec { pname = "fig2dev"; - version = "3.2.8a"; + version = "3.2.8b"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; + sha256 = "1jv8rg71dsy00lpg434r5zqs5qrg8mxqvv2gpcjjvmzsm551d2j1"; }; - patches = [ - (fetchpatch { - name = "CVE-2021-3561.patch"; - # Using Debian patch since it is not possible to download it directly from Sourceforge - url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch"; - sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; diff --git a/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/nixpkgs/pkgs/applications/graphics/fondo/default.nix index 19d93cee79b4..abcb77f9f8b2 100644 --- a/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -12,23 +12,23 @@ , gsettings-desktop-schemas , gtk3 , libgee +, libhandy +, libsoup , json-glib , glib-networking -, libsoup -, libunity , desktop-file-utils , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "fondo"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "sha256-EATZRmYSGUzWYaPqFT4mLTGGvwUp+Mn93yMF2JsPaYo="; + sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0="; }; nativeBuildInputs = [ @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { gtk3 json-glib libgee + libhandy libsoup - libunity pantheon.granite ]; diff --git a/nixpkgs/pkgs/applications/graphics/foxotron/default.nix b/nixpkgs/pkgs/applications/graphics/foxotron/default.nix index 2ccc6ed401df..cd4972de4550 100644 --- a/nixpkgs/pkgs/applications/graphics/foxotron/default.nix +++ b/nixpkgs/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2021-04-19"; + version = "2021-08-13"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-YTCnWHXBNqvJmhRqRQRFCVvBcqbjKzcc3AKVXS0jvno="; + sha256 = "sha256-0cnLHTZMeh8ilP0iXaMpFgKQAkizy/FimxXFDbH0b2w="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index db14df2c1ee3..b429f5fb65bb 100644 --- a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "452"; + version = "454"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "1zzrw1fbbbayq322346dqb3a8bzb3xnx1qmdciq01dmlbc3bmza1"; + sha256 = "sha256-AX72fOiwp/CLaaGxBBKlcRskwayHCeUC2/FGUoXp3lU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/megapixels/default.nix b/nixpkgs/pkgs/applications/graphics/megapixels/default.nix index 9b1377e520c2..c949b8e6b4d0 100644 --- a/nixpkgs/pkgs/applications/graphics/megapixels/default.nix +++ b/nixpkgs/pkgs/applications/graphics/megapixels/default.nix @@ -4,6 +4,7 @@ , meson , ninja , pkg-config +, glib , wrapGAppsHook , epoxy , gtk4 @@ -26,16 +27,22 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromSourcehut { owner = "~martijnbraam"; repo = "megapixels"; rev = version; - sha256 = "0jnfzwvq58p4ksyifma10i158r2fb7fv72ymibgcxbnx596xpjb2"; + sha256 = "0dagp1sh5whnnllrydk7ijjid0hmvcbdm8kkzq2g168khdfn80jm"; }; - nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + wrapGAppsHook + ]; buildInputs = [ epoxy @@ -43,6 +50,10 @@ stdenv.mkDerivation rec { zbar ]; + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + preFixup = optionalString (tiffSupport || jpgSupport) '' gappsWrapperArgs+=( --prefix PATH : ${runtimePath} diff --git a/nixpkgs/pkgs/applications/graphics/menyoki/default.nix b/nixpkgs/pkgs/applications/graphics/menyoki/default.nix new file mode 100644 index 000000000000..0b4b80d648ac --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/menyoki/default.nix @@ -0,0 +1,44 @@ +{ fetchFromGitHub +, installShellFiles +, lib +, pkg-config +, rustPlatform +, stdenv +, libX11 +, libXrandr +, withSki ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "menyoki"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = pname; + rev = "v${version}"; + sha256 = "050c6c60il6cy0a8d3nw4z2cyp043912a7n4n44yjpmx047w7kc7"; + }; + + cargoSha256 = "0wwcda2w8jg3q132cvhdgfmjc0rz93fx6fai93g5w8br98aq9qzx"; + + nativeBuildInputs = [ installShellFiles ] + ++ lib.optional stdenv.isLinux pkg-config; + + buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ]; + + cargoBuildFlags = lib.optional (!withSki) "--no-default-features"; + + postInstall = '' + installManPage man/* + installShellCompletion completions/menyoki.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "Screen{shot,cast} and perform ImageOps on the command line"; + homepage = "https://menyoki.cli.rs/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + broken = stdenv.isDarwin; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/anytype/default.nix b/nixpkgs/pkgs/applications/misc/anytype/default.nix index c479820ba08e..403973c46e7c 100644 --- a/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.18.59"; + version = "0.18.68"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-HDhDd23kXhIFXg+QKPNpR2R6QC4oJCnut+gD//qMK1Y="; + sha256 = "sha256-VZYFMUgflc3LEk/nN7eoQbinGQS1AnPHmb8WgKzhGRM="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/nixpkgs/pkgs/applications/misc/bibletime/default.nix b/nixpkgs/pkgs/applications/misc/bibletime/default.nix index 3a0cc8ce44f6..176172236201 100644 --- a/nixpkgs/pkgs/applications/misc/bibletime/default.nix +++ b/nixpkgs/pkgs/applications/misc/bibletime/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "bibletime"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA="; + sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4="; }; nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index 7ba83e7923e6..0153d30a52fc 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchurl -, fetchFromGitHub , poppler_utils , pkg-config , libpng @@ -101,6 +100,7 @@ mkDerivation rec { regex sip zeroconf + jeepney # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll diff --git a/nixpkgs/pkgs/applications/misc/dasel/default.nix b/nixpkgs/pkgs/applications/misc/dasel/default.nix index 96042c99b283..ba2e8819517a 100644 --- a/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hV8+j66Z8cs6K1TElM+3ar2C8tSqJJBvBYoU+OWcqcU="; + sha256 = "sha256-SJWIjizPf0bRwanpnLpuqsWKjaCwc1wBV2sCPSqGiOs="; }; - vendorSha256 = "sha256-fRG70f2SZr8BOmF+MNLEdJmK1308h+HY4N0kkTpvuPc="; + vendorSha256 = "sha256-u3KsMi63wOi1fCSLpGxATZNmbhoIAGeVpwcKh+nmi3k="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 94852aa13851..23aa5f9ba4f1 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.18.3"; + version = "1.18.4"; src = fetchPypi { inherit pname version; - sha256 = "6e058dd25a8a54ead41479579fd73de71472abb980a6254765c5e538b591d162"; + sha256 = "bdb84706fdde867fe2ee11c74c8c51af4e560399bd5fa562f19bfcaf8fc0dac9"; }; propagatedBuildInputs = [ requests ]; @@ -21,8 +21,8 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; - license = licenses.gpl2; - maintainers = with maintainers; [ dawidsowa ]; - platforms = platforms.unix; + changelog = "https://github.com/mikf/gallery-dl/raw/v${version}/CHANGELOG.md"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dawidsowa marsam ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/gofu/default.nix b/nixpkgs/pkgs/applications/misc/gofu/default.nix new file mode 100644 index 000000000000..b951a3e48251 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/gofu/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gofu"; + version = "unstable-2021-09-11"; + + src = fetchFromGitHub { + owner = "majewsky"; + repo = pname; + rev = "cb398f58a5cb4f3e858fe60e84debde6ab58f7c8"; + sha256 = "sha256-R8Pr8SyLeoTaYKKV+PzHDPi1/RY4j7pkUbW8kE4ydBU="; + }; + + vendorSha256 = null; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Multibinary containing several utilities"; + homepage = "https://github.com/majewsky/gofu"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/joshuto/default.nix b/nixpkgs/pkgs/applications/misc/joshuto/default.nix new file mode 100644 index 000000000000..89e5aea943a5 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/joshuto/default.nix @@ -0,0 +1,31 @@ +{ fetchFromGitHub, lib, rustPlatform, stdenv, SystemConfiguration }: + +rustPlatform.buildRustPackage rec { + pname = "joshuto"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "kamiyaa"; + repo = pname; + rev = version; + sha256 = "08d6h7xwcgycw5bdzwwc6aaikcrw3yc7inkiydgml9q261kql7zl"; + # upstream includes an outdated Cargo.lock that stops cargo from compiling + postFetch = '' + mkdir -p $out + tar xf $downloadedFile --strip=1 -C $out + substituteInPlace $out/Cargo.lock \ + --replace 0.8.6 ${version} + ''; + }; + + cargoSha256 = "1scrqm7fs8y7anfiigimj7y5rjxcc2qvrxiq8ai7k5cwfc4v1ghm"; + + buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; + + meta = with lib; { + description = "Ranger-like terminal file manager written in Rust"; + homepage = "https://github.com/kamiyaa/joshuto"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 71d70774b11a..93e08b660787 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18118"; + version = "18193"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym"; + sha256 = "sha256-55lrPOlQQx1rmmIzBJ522zSia7RmVNTeHuE20vE1d6A="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397"; + sha256 = "sha256-OoDX5tPTLrUgGfBa11dFVyeuXSai8QJNeQLWwot2ksk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1"; + sha256 = "sha256-uXXS+urNCrGnalIAj49Bp1S+pXya/XhdfEWvPmcKKII="; }; }; in diff --git a/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix b/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix index 467945af6ac8..e2e43ae09971 100644 --- a/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix +++ b/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix @@ -7,22 +7,30 @@ , kjobwidgets , kxmlgui , lib +, testVersion +, k4dirstat }: mkDerivation rec { pname = "k4dirstat"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "sha256-U5p/gW5GPxRoM9XknP8G7iVhLDoqmvgspeRsmCRdxDg="; + hash = "sha256-KLvWSDv4x0tMhAPqp8yNQed2i7R0MPbvadHddSJ1Nx4="; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kiconthemes kio kjobwidgets kxmlgui ]; + passthru.tests.version = + testVersion { + package = k4dirstat; + command = "k4dirstat -platform offscreen --version &>/dev/stdout"; + }; + meta = with lib; { homepage = "https://github.com/jeromerobert/k4dirstat"; description = "A small utility program that sums up disk usage for directory trees"; diff --git a/nixpkgs/pkgs/applications/misc/logseq/default.nix b/nixpkgs/pkgs/applications/misc/logseq/default.nix index 46e170f4db17..949eb48f392c 100644 --- a/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.3.3"; + version = "0.3.5"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "OweKV+vF8H1QMNhIs0Z9/uUAuu1cCTitH2P7barS0ao="; + sha256 = "ruJALAI0YQNwG8An5VzoJX06Qu/pXZ9zsrPZ7EH+5Pk="; name = "${pname}-${version}.AppImage"; }; diff --git a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix index 72028478e6ee..4f2f800ebd25 100644 --- a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.7.20"; + version = "5.7.90"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "0lyfss0r0dc6skhdlkslcdagdp9k1mi0w8n5pbrskwcd09c9mxym"; + sha256 = "sha256-wUHLesJ/YV3QyTJfGUr1lFD55JBnfSmjO2VvriaqlII="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; - broken = true; maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/nhentai/default.nix b/nixpkgs/pkgs/applications/misc/nhentai/default.nix new file mode 100644 index 000000000000..6357389776d9 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/nhentai/default.nix @@ -0,0 +1,26 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "nhentai"; + version = "0.4.16"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M="; + }; + + propagatedBuildInputs = with python3Packages; [ + requests + iso8601 + beautifulsoup4 + soupsieve + tabulate + future + ]; + + meta = with lib; { + homepage = "https://github.com/RicterZ/nhentai"; + description = "nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>"; + license = licenses.mit; + maintainers = with maintainers; [ travisdavis-ops ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/notejot/default.nix b/nixpkgs/pkgs/applications/misc/notejot/default.nix index e9d63701afa0..952a7b00d087 100644 --- a/nixpkgs/pkgs/applications/misc/notejot/default.nix +++ b/nixpkgs/pkgs/applications/misc/notejot/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.2"; + version = "3.1.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-Exg9HxV3cxySuT8ifVyZgoATQ/FAC8umj3smJ7W/5/Y="; + hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 510623433173..5b4444b19851 100644 --- a/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, lib, makeWrapper, electron, makeDesktopItem, graphicsmagick +{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick , writeScript }: let + electron = electron_13; icon = fetchurl { url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; @@ -30,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.12.12"; + version = "0.12.15"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "sha256-zvWJvMmb0TlFYXrT2QUgMG6uleT42+y+F4bSZQ2ftnE="; + sha256 = "sha256-0pAwTkx89B6S0GPes2XXSRNdByIc+DwiI5HXoUqs/QE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 2bf28aa892f5..bc9b83178da0 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; - version = "2.3.56.5"; + version = "2.3.56.8"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -10,13 +10,15 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-Gg+LT1YKyUGNJE9XvWE1LSlIQ6Vq5GfVBTUw/A7Qx7E="; + sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo="; rev = version; fetchSubmodules = true; }; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; + dontStrip = true; + separateDebugInfo = true; # See https://github.com/supermerill/SuperSlicer/issues/432 cmakeFlags = super.cmakeFlags ++ [ diff --git a/nixpkgs/pkgs/applications/misc/reddsaver/default.nix b/nixpkgs/pkgs/applications/misc/reddsaver/default.nix index 23fddf3b7ed6..7bcf774b0116 100644 --- a/nixpkgs/pkgs/applications/misc/reddsaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/reddsaver/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "reddsaver"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "1czsy1bb0ja650sndwzq9rcbbhcci7s7ablw0agaynhi403shavv"; + sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; }; - cargoSha256 = "0wr6y7mfffaqdh6i5nqhx692dih159121sm6k0i37wcdvxhvd51z"; + cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix b/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix index 73d8999be5b7..1d232d8a3fad 100644 --- a/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rofi-emoji"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Mange"; repo = pname; rev = "v${version}"; - sha256 = "0knsvsdff2c7ww94120bq92735qrfriyd28mi0n72ccb2iikyi8b"; + sha256 = "01f9nw54mbwlj00mclf7qc2y95riaihzznbbmp0wc4c52pvxki4q"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/senv/default.nix b/nixpkgs/pkgs/applications/misc/senv/default.nix index 6df8dc781e70..86c896b12776 100644 --- a/nixpkgs/pkgs/applications/misc/senv/default.nix +++ b/nixpkgs/pkgs/applications/misc/senv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senv"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "SpectralOps"; repo = pname; rev = "v${version}"; - sha256 = "014422sdks2xlpsgvynwibz25jg1fj5s8dcf8b1j6djgq5glhfaf"; + sha256 = "sha256-TjlIX8FPNiPDQo41pIt04cki/orc+v30pV3o2bQQhAQ="; }; - vendorSha256 = "05n55yf75r7i9kl56kw9x6hgmyf5bva5dzp9ni2ws0lb1389grfc"; + vendorSha256 = "sha256-zOWX0AiLAs1FtOn+VtRexfn6oOmJT1PoTPHkcpwvxRY="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/nixpkgs/pkgs/applications/misc/skytemple/default.nix index d341c9821996..a242a520fc45 100644 --- a/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0780517gjc97wb2g67pwdv3fz3sqxm2ica1hdbrhqm4rfbnb28xr"; + sha256 = "03qmjp257rk4p1zkz89cv26awdgngvakqyg6jc3g6xrhmsvr4r2p"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/sqls/default.nix b/nixpkgs/pkgs/applications/misc/sqls/default.nix new file mode 100644 index 000000000000..d3ecfcbde2b0 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/sqls/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "sqls"; + version = "0.2.19"; + + src = fetchFromGitHub { + owner = "lighttiger2505"; + repo = pname; + rev = "v${version}"; + sha256 = "1myypq9kdfbhl5h9h8d30a3pi89mix48wm1c38648ky9vhx0s4az"; + }; + + vendorSha256 = "13c7nv0anj260z34bd7w1hz0rkmsj9r1zz55qiwcr1vdgmvy84cz"; + + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; + + meta = with lib; { + homepage = "https://github.com/lighttiger2505/sqls"; + description = "SQL language server written in Go"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/taskopen/default.nix b/nixpkgs/pkgs/applications/misc/taskopen/default.nix index 8933faf5fb01..88050d2f449d 100644 --- a/nixpkgs/pkgs/applications/misc/taskopen/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskopen/default.nix @@ -1,20 +1,27 @@ -{ fetchurl, lib, stdenv, makeWrapper, which, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, which, perl, perlPackages }: -stdenv.mkDerivation { - name = "taskopen-1.1.4"; - src = fetchurl { - url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz"; - sha256 = "774dd89f5c92462098dd6227e181268e5ec9930bbc569f25784000df185c71ba"; - }; +stdenv.mkDerivation rec { + pname = "taskopen"; + version = "1.1.5"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which perl ] ++ (with perlPackages; [ JSON ]); + src = fetchFromGitHub { + owner = "ValiValpas"; + repo = "taskopen"; + rev = "v${version}"; + sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg="; + }; - installPhase = '' + postPatch = '' # We don't need a DESTDIR and an empty string results in an absolute path # (due to the trailing slash) which breaks the build. sed 's|$(DESTDIR)/||' -i Makefile + ''; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which ] + ++ (with perlPackages; [ JSON perl ]); + installPhase = '' make PREFIX=$out make PREFIX=$out install ''; @@ -28,7 +35,7 @@ stdenv.mkDerivation { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = lib.licenses.free ; + license = licenses.free; maintainers = [ maintainers.winpat ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index f9bf70b661ce..0b7a766ba39d 100644 --- a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py --subst-var out + patchShebangs bin/ulauncher-toggle + substituteInPlace bin/ulauncher-toggle \ + --replace wmctrl ${wmctrl}/bin/wmctrl ''; # https://github.com/Ulauncher/Ulauncher/issues/390 @@ -99,8 +102,10 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + # do not double wrap + dontWrapGApps = true; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") ''; passthru = { diff --git a/nixpkgs/pkgs/applications/misc/wike/default.nix b/nixpkgs/pkgs/applications/misc/wike/default.nix new file mode 100644 index 000000000000..fac8ac2886d3 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/wike/default.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, python3 +, glib, appstream-glib , desktop-file-utils +, gobject-introspection, gtk3 +, wrapGAppsHook +, libhandy, webkitgtk, glib-networking +, gnome, dconf +}: +let + pythonEnv = python3.withPackages (p: with p; [ + pygobject3 + requests + ]); +in stdenv.mkDerivation rec { + pname = "wike"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "hugolabe"; + repo = "Wike"; + rev = version; + sha256 = "1qnxzxqjj0sn522k15plskwa7nlhhbcipfc3w17fbq3k2zhpr1yy"; + }; + + nativeBuildInputs = [ + meson + pkg-config + ninja + appstream-glib + desktop-file-utils + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + glib + pythonEnv + gtk3 + libhandy + webkitgtk + glib-networking + gnome.adwaita-icon-theme + dconf + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + substituteInPlace src/wike.in --replace "@PYTHON@" "${pythonEnv}/bin/python" + substituteInPlace src/wike-sp.in --replace "@PYTHON@" "${pythonEnv}/bin/python" + ''; + + meta = with lib; { + description = "Wikipedia Reader for the GNOME Desktop"; + homepage = "https://github.com/hugolabe/Wike"; + license = licenses.gpl3Plus; + platforms = webkitgtk.meta.platforms; + maintainers = with maintainers; [ samalws ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/worker/default.nix b/nixpkgs/pkgs/applications/misc/worker/default.nix index aaadc0cd4b70..21dc4a576952 100644 --- a/nixpkgs/pkgs/applications/misc/worker/default.nix +++ b/nixpkgs/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.8.1"; + version = "4.9.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-Cf4vx1f4GgjlhNtGUuXf8174v8PGJapm5L30XUdqbro="; + sha256 = "sha256-l9kWYswQ27erxmZIb+otPzeKFZNwP+d8QIqGuvMMM/k="; }; buildInputs = [ libX11 ]; diff --git a/nixpkgs/pkgs/applications/misc/xplr/default.nix b/nixpkgs/pkgs/applications/misc/xplr/default.nix index b84da33df40d..9ac39d722b56 100644 --- a/nixpkgs/pkgs/applications/misc/xplr/default.nix +++ b/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.5"; + version = "0.14.7"; src = fetchCrate { inherit pname version; - sha256 = "00kgxc4pn07p335dl3d53shiyw4f4anw64qc8axz9nspdq734nj5"; + sha256 = "sha256-rGU9Jf+MHDs3pnuddqxLaWc8YqL+Ka7Rex+fTuU62sM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1wmc4frjllj8dgcg4yw4cigm4mhq807pmp3l3ysi70q490g24gwh"; + cargoSha256 = "sha256-GwepsY7PcWjKZpJ7H4D9vtXwd2XGFgG1c+QvinMAG4Q="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/nixpkgs/pkgs/applications/misc/zk-shell/default.nix b/nixpkgs/pkgs/applications/misc/zk-shell/default.nix index 1dbaa842ba43..9f6816f00dda 100644 --- a/nixpkgs/pkgs/applications/misc/zk-shell/default.nix +++ b/nixpkgs/pkgs/applications/misc/zk-shell/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { + pname = "zk-shell"; version = "1.0.0"; - name = "zk-shell-" + version; src = fetchFromGitHub { owner = "rgs1"; @@ -11,18 +11,23 @@ pythonPackages.buildPythonApplication rec { sha256 = "0zisvvlclsf4sdh7dpqcl1149xbxw6pi1aqcwjbqblgf8m4nm0c7"; }; - propagatedBuildInputs = (with pythonPackages; [ - ansi kazoo nose six tabulate twitter - ]); + propagatedBuildInputs = with python3Packages; [ + ansi + kazoo + nose + six + tabulate + twitter + ]; - #requires a running zookeeper, don't know how to fix that for the moment + # requires a running zookeeper, don't know how to fix that for the moment doCheck = false; - meta = { + meta = with lib; { description = "A powerful & scriptable shell for Apache ZooKeeper"; homepage = "https://github.com/rgs1/zk_shell"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.mahe ]; - platforms = lib.platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.mahe ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index fe7cfb6c7b36..c509941b8f1f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -36,6 +36,7 @@ , nspr , nss , pango +, pipewire , udev , xorg , zlib @@ -80,6 +81,7 @@ rpath = lib.makeLibraryPath [ nspr nss pango + pipewire udev xdg-utils xorg.libxcb @@ -90,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.28.106"; + version = "1.29.77"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "gr8d5Dh6ZHb2kThVOA61BoGo64MB77qF7ualUY2RRq0="; + sha256 = "LJykdig44ACpvlaGogbwrbY9hCJT3CB4ZKDZ/IzaBOU="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index f095138416bd..a094e681e230 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "94.0.4606.31", - "sha256": "1f5hk2acd9lj88m2acz8ik85fh5h3giz65p19dpfg92zsyly54nf", - "sha256bin64": "1ypf9j51a4kmx27x3s9izzbd2r094idz194gwhbdly75l1x8hk4z", + "version": "94.0.4606.41", + "sha256": "0kdi8rbly002abg9jwkmv6xmfcv7g0rm68lbdsnhr0biy7wvadij", + "sha256bin64": "0ayhppzwc4ia36hpakqg9rh3cggw33c7d2zkfaias3zm14k86ga2", "deps": { "gn": { "version": "2021-08-11", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4628.3", - "sha256": "04r2db9kl77lp4jyyj01pc70jkxrifbnz5hic4r91lf8m2gf1fa3", - "sha256bin64": "1ssf8jdk6gn2mrnyvgz2c9nkk70rsidd5y26w2kx3s0cllfr7d96", + "version": "95.0.4636.4", + "sha256": "1rhkmja9p2a8cxnjsrs0ipzajxwgp3c8q3903rp8ns1g579c4g3j", + "sha256bin64": "0l89iqi95fa10m3jdhbvfdjf4x88gscx6imkhy2x2ax669d19606", "deps": { "gn": { "version": "2021-08-11", diff --git a/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index df9fc3f822cd..50ada47a4446 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-D7dUVHgYGzY4FXEnOzXw0Fao3gLgfFuCl8LJdLVpcSM="; + sha256 = "sha256-/VsxMpITBDKJqyMwl1oitS8aUM4AziibV/OHRSHbRjg="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 20f0a0f64a6a..773393287aa4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "91.0.2"; + version = "92.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ach/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ach/firefox-92.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f33d2815c214fe8961aa98d3d531bc91a548c4744fae551663fe78a087168798"; + sha256 = "f2ad99def0a6c2f778d96350b9a9db8d029cba7d6a21103f8c728f05a4143036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/af/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/af/firefox-92.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "1c9c01a01ca6be5f43477345289f67caf09651ad270b7b252a295a671de817e9"; + sha256 = "032fa343964a31cc31953a8b39be52e2328c06e2d0d37bb25dd99c2b6a286a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/an/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/an/firefox-92.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "9ec5c6b14231d52056388ca8a7380954bea6cd5281e415c0854a49cc73640806"; + sha256 = "65a99d7af2c738a35cd9a32aa73537fc39c03a49ff8c8bc79b2434c2d73fbdcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ar/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ar/firefox-92.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a45e1e427693f8196bb21aa488c6524c35e84874a32413fc0700c30a7301b050"; + sha256 = "37cf6f24f2d89373f5cc03969a1584e0eba8602c9720bcd9cb83510b00c37d9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ast/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ast/firefox-92.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0d7045894345c84e5eabd42ba9e9c8e8606aba2980893485662e9571c3779f2f"; + sha256 = "250b48aa826b8487c2a0318bd4aefa769a0e5f1ccacd3c960db76a34b8541d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/az/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/az/firefox-92.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "298562a8941641463f728522c70ebde8e8380836fc0cc8311eec52dca5ec51f7"; + sha256 = "2cd6130a3097510b0a88d71e03f902b355acb5c54b04c54fe744f02082e9258f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/be/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/be/firefox-92.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0e993e8678d0c2bdfa4499ceebfc0840bfd2ddd83c8c8e72d46d6d0c553c6819"; + sha256 = "1e6c1e3281c831040c26fe690e193eee32e04c04755776f1d5d02230aa4920d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bg/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bg/firefox-92.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "03381a727b1610aa9901bdef0325c58103ce7772561a65f6943c10cc4ba9d716"; + sha256 = "248464ee16c46a948771977a15e0740d75a4023ac7b1381caa4ab89e8854ce50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bn/firefox-92.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1802540536f260157be20865ef10c829917ecf4fa786a640f5c1ae3f5d32bf8b"; + sha256 = "22872587d0bc7cb548032163c0944b85d60f44b8b3015cd9445a1d249f226897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/br/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/br/firefox-92.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9a236a56179b5ce0aad809a85c744762c44daac465c527883157366b5037971c"; + sha256 = "5ce3b39bccf4557b726518addd963511b3184b2a5776422d470baec0c0737c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/bs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bs/firefox-92.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "bdcd9e29bb472d1519d480288709ccca8ff625b6ddb3a251d526a6cd5b68122f"; + sha256 = "3238ff9f73f0a13b1716d678594b051e02992813354c880144df1a442cf2bbe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ca-valencia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ca-valencia/firefox-92.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7df5d82aac797456b4f22fdc9ab6f4114d7ad038cc16f28f83daf2d62a5b0f5a"; + sha256 = "305e8800fe2760a9aed35d26fecdbf39be310633e45410d46f5e78414ee7c977"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ca/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ca/firefox-92.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f05391b0bcc16fb1a39710c70bd33b79965c7b0afe57e593c04e00c57e1ad447"; + sha256 = "de25616de4e2a4876309de99736db900114d9b3d2785a022eef5d4bd205f463a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cak/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cak/firefox-92.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "afc0e6676fde094764ad466b735c887a31d5ec808237cedf7ac54b8323c2fb84"; + sha256 = "348a4320ebbe14c115a419a092f73d43876b55a4788380e9145aa2d0a5bf4f14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cs/firefox-92.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "87a144952d612aa03998741a3232d93484200410d871c1823a4017e98b1d0570"; + sha256 = "9272de8867d1b590bb9912f8104e59e942463cf6aa2b47e46cb3baaa117bf62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/cy/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cy/firefox-92.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5f891c275890f746dee7f8dd27f69d610007fa553e23eaaa2bc949998b1b2d4c"; + sha256 = "32562b809a715a12074b0467d14a1deec0f3b48d1d2b4fe90a18d00b0ae05298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/da/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/da/firefox-92.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dd36c8b04d729e6746c01fa2de7f818c09dff7d75339fd4234f4285979f4a5cc"; + sha256 = "63829b7a279e2eb8e43ba374c589ec3ac65a4a5de46bcc55df757b2f9f0fdd60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/de/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/de/firefox-92.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1f02ed10313352cfc8db46bc888c25da9cd61656e022e1a3260b42a56b1142e7"; + sha256 = "c62aa20c3b3f8eb2462fe157872196fc01fdba14e19e2025a1c04887a14741ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/dsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/dsb/firefox-92.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f53ba888cf993452761ffb21647fc47c799a41c398a28c3546ffdbc9c10bfb56"; + sha256 = "84667669ece60081417e597cd00c5db9f25df9c3bce3b72c37d660aa2f9e57d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/el/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/el/firefox-92.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "4ec5b0b831ad161d501169f650c17715f6a4d505507c458e68cd74dae8aebb7e"; + sha256 = "33646c69fd8058dab93d685ef525b9c159e6161704b497f00553a9c9900713d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-CA/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-CA/firefox-92.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f07cb785234979806c03ae15e308ad72e417268cf4d9b3081ccf0c79d99a1b26"; + sha256 = "130a04cbb4bd463f39de36392d1d3bf465974ad866069b3eb7a1ac65c6e7ca8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-GB/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-GB/firefox-92.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "de25d50a780d8edc070a10b2ac7e5806814548a2ab3609e0e4f30eb2e0e18272"; + sha256 = "51839c5b3bd7c7ab471c44001318f09c0ef5fc9e82131308646adaaffca5a50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/en-US/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-US/firefox-92.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9eaac9c88ff4696228292590b65ab2fd1b0d98b7a1edf5a21abc11b7803a046d"; + sha256 = "29050d18670a61585b101f8fa4e196fcfc22d0447178143202301836f3c048eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/eo/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/eo/firefox-92.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cb11d5f6f3caac78bb8a06dd3ff29ee11b71dd159dcf8804094c0bd969864b9b"; + sha256 = "155e7fa1b564bec8cb11fd12efcfd9438be986e05fae2e978251d8baa7642c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-AR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-AR/firefox-92.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "849fba4b1375e0426efaed3ae637d9de4c6389c36869b345715a846a87b2473f"; + sha256 = "524f2abfb48663f30d92cd3da01be180ff13a182aa300f31beab3ea996ff3e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-CL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-CL/firefox-92.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "06a43322ad648c1e8c0cec8ee0a0e087c795e23fb8ef5e1e9775b009e5784673"; + sha256 = "ca79ea7d15fd829845e9bccb28ff366ea2c8dd023026e16c05adf076015ba46b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-ES/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-ES/firefox-92.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "cc0bf296b910773e7c5d58760149b2918ee35c0d7c0f9953d890bbb6ace8397d"; + sha256 = "0a31b2fc5719d46567795f4d49b0655923adee804c117d83915d8ad61dbf01f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/es-MX/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-MX/firefox-92.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "7dbaba5d426891452c285a88f557ebea9eaded970aae22d5deb530a8bb30785c"; + sha256 = "f9f4e72ac67247466539ed3c844748e34e85f4b9ba28123e9eba55fa5f845fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/et/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/et/firefox-92.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b57651dfa1630d2bb202659a8621772d0ba9f2f5b111384105ae7db2db7e1c9a"; + sha256 = "4a135e194c889b4a655c846e77d7fc7dc18faa9e1564a9ac9107ea492571bebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/eu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/eu/firefox-92.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b1a3f24309807f139dae331efa358e605fd536188bc04e39e8a52669ce5d4925"; + sha256 = "9bf92e2872590cc6879fb03885e8a89d0325696d1f5269d08b7469e384ce3134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fa/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fa/firefox-92.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ab5fc5668be9ebb9b55b29aa245382f054b088d6920e58e40fe001e4d13b10cb"; + sha256 = "5025a2eb60cb136e1aee6aa846a15577bf95cb870dc30c51b6b79b5de01b3594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ff/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ff/firefox-92.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "d57c5e4a4337b49e22c9c010c218e0e31b19a9bbf4ef47c1c68c36415ef03793"; + sha256 = "f20436867ecbf73bb2262645bcb7b566173bc7975a46a3d7fa74718ce9f1fe6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fi/firefox-92.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "93cdd41f76160ec2d2286e37ab1745bf7e88a8c4d46fff427bea3468f54b3772"; + sha256 = "4e8a5ca31f6dce0891b24e03b54c0fa3774f9bba5e99b90d73bcc5cadc20b12f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fr/firefox-92.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "04a7ea5dc8576fdfd49156693fd7fcecd1c55ba33a655f6dc832bb22caa51a5a"; + sha256 = "5e4d6b7d4f654b53afb2d6dd32291feda2a06fcd8d30a0fd8580a81e12716015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/fy-NL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fy-NL/firefox-92.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "24a5acb50252bfcfde2c6ba24949cc06d9b4b2883c3a00178b25dd88f057b9c9"; + sha256 = "3ef484bd72bbb0d4ad75d42d052e26e1da50f85e7bb124e3f7a02e96ba06d837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ga-IE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ga-IE/firefox-92.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "136b45c8a0f9197e7e02b973b11bfc25d12202fb4e26b8c0e0ce1be4c19714be"; + sha256 = "45cffb030cb8a3efe85eaee32b97d3b995b2ab0c8a5b943cdade38bc39bf6a0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gd/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gd/firefox-92.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ea674cbc970610827f731f8c8ea3086f6f30cbd4167c12c471f6592c89892d3f"; + sha256 = "9cc69e735cf67da632ad1765853224a7b442883c023bd45d87cfd5f1a90e06e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gl/firefox-92.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f8bde4cb07aab6e7e7c776377a954680184bf3d3ecaf7542fc3843099854db41"; + sha256 = "567e290d2e6a9b09db3d1b0e33ef5d88a9db2b6ab8cdfc1ebf6619327b030a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gn/firefox-92.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "845c2c94a5c3432148df173e9e5e3fe0308fbf58577da2b9d8753cedff80c2d3"; + sha256 = "bb39c07acc3bc89d7c36a121b701776793f391c05f011087367da6ac7a3f82cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/gu-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gu-IN/firefox-92.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "9cfbe57f0e0bc2f6ca070f248403b3edb36637bb2a0fd01bd621f97928378463"; + sha256 = "4bb13592ece99d0f3baf0fc2ea0e4017ae5f14f0099baf4b17a83505ad811ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/he/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/he/firefox-92.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f561c12266a3b841ccc72592caea6410b2607140b9adbb66e067377104c4bdb1"; + sha256 = "ed666bd6e000d232b7c0a2e7e1c236c4cdbea638fb6327a23629be033093ab11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hi-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hi-IN/firefox-92.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b5cea26bbbc6fd5cda63f9099f17b50dc61697c1c3a1ea07344aabdf2ad154ab"; + sha256 = "0e48dbbda7854a54465ef78c194c7c5d1dd7f3c5609ccee92739a1245e625f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hr/firefox-92.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "aa3bc54890eb5f50a51da981576d77ff89480ac52d1056fecba7c3d699f2ec49"; + sha256 = "9ec220bfbb0e8e1c745c89cf9e7ca4349d70ecdd9ef343fdedf8a477dd33f582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hsb/firefox-92.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1a07e8e22747ac148d8e9e6c9cb5f23466dd821ee40375d6401d6199e615a757"; + sha256 = "23ec07f1307a41791b0a54f3160779ae10e91ab051a1a5353a2f1b97f1495468"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hu/firefox-92.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2227a72fb5caa0f95782f19380c60890b0886469207b03bcda9d6ab090f87b29"; + sha256 = "101367ecf8df3de940bb672280569ad861cfdb17af8bcb393f9c9a7877e577d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/hy-AM/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hy-AM/firefox-92.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1cbe3aa9306de87b819c04197e769958be6aada5a192f83decbbbd9b9874c73b"; + sha256 = "e340c664894abe8b6ebb95bf8e9c0a800f19d7fcec82325a6de9a592a00a6ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ia/firefox-92.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "283daf5d143c70a416d6286cf51d7657d4d3e3785085ae574d1100cf24e40525"; + sha256 = "cce244fe4b5387f567655f974862c3df5e77398b0803ae43eb60dce42f4614fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/id/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/id/firefox-92.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3cbe27d43c810758aabb755f5745912d92b9e843a294b938224665de614612cf"; + sha256 = "a094a09793400eef4990aa638e50a2d894e434e568c2c00491a6ab444fe1a9d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/is/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/is/firefox-92.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c3a3d505efe0a181fb1c3002c19fdd6669aea41c9b31382cf9679c53fcd0e3e1"; + sha256 = "10e7a8689abf2ae940500d3562c21c3186883c6a8477c012b60d56c856fe0226"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/it/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/it/firefox-92.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "12a3edb320a2aee0d872aae1180f3b106f2f3a68c80ce6137794e00fbd0d09e3"; + sha256 = "9b5c5ff9c7a52a1b58e31ca44bc993d31d42ed4e2ef697847391559c0986c5a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ja/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ja/firefox-92.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f5b7fed8385b9132ca458983cb7ad926d453c7d62309994ee7ec8c79b653ccc9"; + sha256 = "3e8d6c06f7e66409c1a17ceffb81a4127b496bcc4a4cccae3be731414891a8dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ka/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ka/firefox-92.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2db556fe388ec3e29d603eb90e1dc2aa3c0064f09f8a6ad48158b0255433d0df"; + sha256 = "2a0406c8205cc8de560f0d9c1dcee6963dbb2df67110ed54fe54821c82132bc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kab/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kab/firefox-92.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fe0d1dbff288168c06501c2f2aca07f0de5a7ad6b1c9ee3ea9fa49a6bcc01f05"; + sha256 = "d6bcc16d8eba88cb29ab1985a717abf1e7835c01261e50f2d04bea9229327feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kk/firefox-92.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7c4ea35acdfaf20155f68b96af3289e465fe9179d7eeefa5c231bed350ad6f72"; + sha256 = "ce6467027b132c8a56c5fa96e26140a11761c0a6b630ebf1b8d6d1ef8ef717e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/km/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/km/firefox-92.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "09f9246eecc557ea89159ed67c10ffb640cdb4877e7bd3e76a70f429f80d4c7d"; + sha256 = "2af10a5004835e32c6ec579f621f7a2daa58f58f6eee831fe65efae0a2b6e5b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/kn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kn/firefox-92.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "df48636b12ef91f18c837e42beba979d83e0a0f5d25de5593984d19c6a3572b1"; + sha256 = "272821a500af703c960d2d9ff18347616237ecf7340fef39f9a9897e807683b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ko/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ko/firefox-92.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "0d21181cf503a1b203c160c86a8fb322da5dc9a8bd6ad2b19541a691ca3a9ff1"; + sha256 = "a8b44dbb7744cf1c2ec25f9fc64b6fed1fc19aa06089dc503e648bfc449f78ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lij/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lij/firefox-92.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e206101e2f05d297305aeff38becb141069fdbb7fd2b8274f150bb9bd8111318"; + sha256 = "e16be9d8119619328617e9c16a123a07aab4a4020eaae8cf0a8de1a87d9c6e58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lt/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lt/firefox-92.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "feee32cc11f81db93400d4e91104699e3968f01c09dff99fb7859ab09925833e"; + sha256 = "b3d3969331c25f74e65756b7bdd43a32234e5e40fed98597da073d0c67f96d98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/lv/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lv/firefox-92.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "16b6cdc6e993465c81937bb07ed275a79c786fe77caac3d5c7e309de62698cdf"; + sha256 = "a588b619b832aff9850692c622e1b458bbd3f481f0e9c6d12290dcbf16a05c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/mk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/mk/firefox-92.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e7eb1e3b560ba558aa4e7db1883082279752db3580b97face685f16e541f3778"; + sha256 = "9aaa0a446703e06249e8c0ad56982962d34d5a59a9d25bd744377bb011014904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/mr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/mr/firefox-92.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "18aefcd48300b1b8e7a3775539d8952341dc9f930cd4492aabf0f1c9b5db9251"; + sha256 = "7b889d5ace4d0ea80a496fa1d2e963c052e55d6cffc57b3e8f1d4088bc7b6091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ms/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ms/firefox-92.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2a4e8aa5f8fa123dec530c75db7733c7c02be47a854b1a83ca9c9de8999532e0"; + sha256 = "bb52c8b703cef9e25b41cd3d85974cce0a009a1d83a9a97b295de6bfcdc07959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/my/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/my/firefox-92.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "af73e4c5d7d07be9eef45bc4b4623e6d15158b8e195d2679aec57f5b4e5d4522"; + sha256 = "ed9f099d13f984e3ce3b8837066869df3861d5ebd6e6391ad0ded9a1db6bc946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nb-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nb-NO/firefox-92.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d7f8d00411d40955abe40861cb9cbb6c286c4123e559a4f1a1cef14a16f9a7c3"; + sha256 = "c922d44b8e8a2355e7c6231d976e9ccaed02ebee0ab1d781b079dd2bd2a6d848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ne-NP/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ne-NP/firefox-92.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "1a944d38efbdffbafd3ff2ef7caec06a7b541e50f50288b599de6f84501ceb71"; + sha256 = "5192653edff514a71ca95aa24eacf5e56dc824a47ee47df5c25d42bfb6bf521b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nl/firefox-92.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3053667a9b8fbe9f450775ea4e16f42622a365b306024ad09efb94f0f78e1ec2"; + sha256 = "9c5fc26d06f1f57e7f9f97761abcffa864b378ae259637d37e8084322df549bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/nn-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nn-NO/firefox-92.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "778f005a86a464c96fb1cd6d558dd9fe268c4ea810356aa3bbcaf366ac6af895"; + sha256 = "85380878356b288976972c3fec4f393271975ba03a6541885676e13f78b0d1df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/oc/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/oc/firefox-92.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "831240b9be6aee190a4272ea759d09fa326e3693a6733d4a9e9c68ca701d1663"; + sha256 = "f538de12b1c43a112c4ac1eac24ebeecff59bb9b820913cbf70b01cbd7cbdf9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pa-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pa-IN/firefox-92.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a49344f367d80af4d6683729534c4133e2e30f6492f27098d626caeb609c13cc"; + sha256 = "4bfd146cd7b05bb4e63ebd035360c4b7b2fd1c6ea551cd400df5ac8c647a89ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pl/firefox-92.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7630e7e09eb0c9b83af6771337494ded1e97ab8e00cf38407fb2548b5751f566"; + sha256 = "badaeaa9c937ad7766aba52a1f7a67016d50bc0c8843a0d2fc866104e5245dac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pt-BR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pt-BR/firefox-92.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0404ec267d35062191f59de8971a7c348a8b48666b571f6fc83ac72da1b71d28"; + sha256 = "ce492dc058a636704a9483e82f95f102703136cd273f653e39f38ee8ef2381dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/pt-PT/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pt-PT/firefox-92.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "939173f1bd04f71db95b3d526b03f8af9f5e543f969523dbc054e6b8fcd24f1e"; + sha256 = "2661cbca38cca08a504cd58a48b20623cbb87043240cf79a40530a315dbbe8ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/rm/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/rm/firefox-92.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4079c2b319fb8bbd53c060ac4fd3d92f7a275080efbaabcf3fb1753232d20a00"; + sha256 = "540351da416718343cab82f8756bc0b33a3a396377d27d02f1e9dc7e42e9db66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ro/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ro/firefox-92.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "611b34e2aede6d0da5269acb5973c7ba802e1c21f54f013c74900e685cc2f696"; + sha256 = "54b661b40ad66a5881a98d6c97fce50fb91542e677b7dc0be07f38c19e3927ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ru/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ru/firefox-92.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7f485ffb4db58234f09c86b03735469b9a6b0fe769e248ecb2e735f6d94e56c2"; + sha256 = "250fe6abc746a74a1e1c7be095f8766b193738eabd095213da2b6e41b4e9249a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sco/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sco/firefox-92.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "6578345753a4c043e3240aa0da35e6888fa51e91b85e08614e16ae6571ab256b"; + sha256 = "b14fd7e73b132fce408ad8398728c1a13e065bb8a86a37720cb3aa02bc7fb4b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/si/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/si/firefox-92.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d23d3f09e7a5112e5b6d28d2b2c8c99f4c86be52f1e9422eb2fc3b1906d98ac8"; + sha256 = "f6427495f30297c38225e972090efd3f02242f70a7d47ff67da06f54d747da5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sk/firefox-92.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "90a116fee8568b6a9a55c0421dc6a2860d63ad08b8fc378084c1afd4c949c1d5"; + sha256 = "a59f87ac0ee93fa517347148be8f1d519df525d63424a93faf11b6349557bcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sl/firefox-92.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "771b695988fbe0e12bce06a740e3495fa850c8868a05d67be50ba8090d4ebade"; + sha256 = "a86644ce8fa694fb6727488f566490f5cfd624edb556b94ff9ac6cd3506bd5b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/son/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/son/firefox-92.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0a645ec3f2f57ae891aaecc2ce206487518175828f4fc340736b0ea72af001ee"; + sha256 = "b76724b86c8c82036b159baf9c376de3db0d9855a256060259a6800e62fefc83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sq/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sq/firefox-92.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b3c72f26cc4f14b621bc596c93561d7a117fd5efdbe01e4235aa1fb7c8f2d1ff"; + sha256 = "233d9bd22ddd0223c5f4d9f1e96caff90b4fdfc3527c8ca39f3da4aaa34918ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sr/firefox-92.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "36044733f7ee34fdea823253f66e7e8fa3cde8d429711ee91c128960f418ff8a"; + sha256 = "9b65446757e6438ff477df76de2c9a79c5300a40b9533df90715ad842365840e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/sv-SE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sv-SE/firefox-92.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "392930224df082d89c5bc1624f8193d985c82ec11c37d3ff9d659d339f1c1814"; + sha256 = "a9b76248c2e5043129c4b55da2cedb5456df556c8cb28a3f7814e4b99ed5a02a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/szl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/szl/firefox-92.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "8481c1d119e568ed109bb6bfd0c1f897f7f284852e24da7cd2db591a00ada4c6"; + sha256 = "532e51336b7ed703f4955ad01dbb030b19ab222f20bc44e5b224d24077d96537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ta/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ta/firefox-92.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "3a6e28128ba7f167fcf6c7bb238ac66a7095708e3abeaca7fc6d5ca7eabc43e7"; + sha256 = "1093e65ad6bf476417dd34dd44fcf97cbaa23bb897b71cb5c7b81a30e7bb38ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/te/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/te/firefox-92.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1c52637dc10ea1fe3c1e7b136f64518c6a97e72d87318e0696b05f0eb25c27e0"; + sha256 = "99e4829264f1ec2ea00e3359db5f16113e30ad67d8e6f7b8611987f6c1ac5f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/th/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/th/firefox-92.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5fe6f59217a47989e79a3b05b23bde98d77e2a5b8c769e03e66e38976b39804f"; + sha256 = "fb7baf520791be7d45b197ebdd81886635328c986bb0d06ea69c2c705fcc719d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/tl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/tl/firefox-92.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "1128e69f29688da700f60832b9e87529f57d114ed944eec2f9209e7a92cfd790"; + sha256 = "1e8f5b75200fd25ad6e14f89d2be604bc724fb48d7cd15ee9b3adb2142a7d1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/tr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/tr/firefox-92.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4e643963f6a1f34553c1fd896ddd58e97208d95fa563de56869ffe5f8e8e8f1c"; + sha256 = "ca3201648b93b16513f4aeeaf6decece145e86a36706d26a0cd708f8e1c17fb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/trs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/trs/firefox-92.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "ceb96b052b352fafcec29d0f301314187f7800765df4e013394508a2fca76159"; + sha256 = "559d792599c51ba20a78e2a8cd4d10b47ccd61ad334a2504966b388fd4165991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/uk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/uk/firefox-92.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "599f1a52b843d7f1a743547ad54294d95c1f8f73c0a91b0bdbc9c3de7991f54b"; + sha256 = "290f97c09de52f639cf9c9b7cd605cf29d1b6a3419915a021a42353f9848d96f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/ur/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ur/firefox-92.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "be2aaf110942c218564aacc8318da5b317cc7546e70fbf0d0e47658196da9c6f"; + sha256 = "296d50147acf5e8564adedc1253899a5bf67d8db40eb46f8d7abb51d3dc8ad38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/uz/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/uz/firefox-92.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ef8811b53ce1cea99f068b846ff9e680cf84ad7bcdd30af45102340001cbc330"; + sha256 = "e53df4ca508cbaf49bae355fc08d1f37c90e99bd8629d3a4968e4905fe476b64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/vi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/vi/firefox-92.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "42ef9e751790fbf138ac1d75e03406cfe91b11c6b4afdd2e3a1c5b3ea921f5ee"; + sha256 = "35189770f0e63c9b1f5623c4ef3bef4115179adeeec2d1c3b9fe7595bae63329"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xh/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xh/firefox-92.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "17b3c935627c14f51e1d7ad106ef8428aa7c7399952f87cb54d668336dcd4420"; + sha256 = "df7e4988bc574de22f3419f5522cae14a8b7b6c9cb32402e990fff92895fc34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/zh-CN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/zh-CN/firefox-92.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "1bc2854070700f2899cd1cca848aa39d34394eb7c3853c4b92b693122deb0867"; + sha256 = "c9d10f3798510192c2a7e04c318e69a8f80945e72e7b7f81392d3f7f716cdbe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/zh-TW/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/zh-TW/firefox-92.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9620f5ef16421a187d1f3e98c80d5e336995a9bb195241b8c413f619a0a8a3c8"; + sha256 = "22992234bae2f13ee4c22b3f75f69aff251ea466383f423398a062e400da21ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ach/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ach/firefox-92.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "68648f5e2060c9ba841284a6cc22a793e4a13426c517e803ce0ec21dee6f7792"; + sha256 = "316ca1559fbca9ad56be2ea53636dae960e05ccb3f50868df8baf427332b289c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/af/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/af/firefox-92.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b2e55deda95b5e3d180774f5f922ad223a45a7f4ae684203b77bb07937bc2981"; + sha256 = "2a7ff4409a50d76319fc4a749f516171fc1abe2a53290b4bef3f7dd87871d4f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/an/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/an/firefox-92.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f0e5d4574213583ad8cea208955cfea48c0d0c2ec9bf5a62dcef18a20ddc04a5"; + sha256 = "dba4ce48f723ac4616906e7170e08aa14bff86def5f2e9edcbe4fa5bd283c4a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ar/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ar/firefox-92.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "1ab07eb8c327180c254061488c1ccfbbe3513657031508ee5658587437049714"; + sha256 = "db69d68b140702d595489d732c4f5909fede55cb4d5f81a91a12a7d769f96a8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ast/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ast/firefox-92.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b6bca0e8373a9f816b12f856ec0a2515531b02a5e0929a766f904ad2d65c9c68"; + sha256 = "92185bfe4198d9d4d3fe2146e6cd1ba23dfcd258933e393d2ed29dd2239e6f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/az/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/az/firefox-92.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4e56f180d96ddb0acab3abedad6fee0709d41075901180123d7bd3cbfa76590c"; + sha256 = "62fd888cd6639e208907268290b0d7eac668480a131052924c978b5356da8ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/be/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/be/firefox-92.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "030df4c436f1d1335b16fdc523180b9eb4d1f78de95aafe2b06a5dd1a8fb72a2"; + sha256 = "41f4cc7bb3f8aea6059afd61ac7518abc32708271aed42eaae058fe17c3e7691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bg/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bg/firefox-92.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "bc595dbb2930838d60d5cc7455055469498ec645877d3212f3a08f433fe149d8"; + sha256 = "59e502d69afdb5a80d6a3de0afd16caef6e2b69e86cdd716f62fd4d5631312c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bn/firefox-92.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "97fe8a049a0ca41475645171d829c19514a18320223b96a34870954a0526180a"; + sha256 = "20b3c1c5ac49607fe6198cd078e95882e1bf0efba4456b3d0b484519ad8ff2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/br/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/br/firefox-92.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "abefc4181bbcdca83ac98be38e08dfaba67ebec48481bca356828331818ab530"; + sha256 = "c532e758f36f92bb06d0c9a9e99e121ea2ae8989a216334224d79303cbe9db50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/bs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bs/firefox-92.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0e8e91da19070a5e5d283e0d3f513d01bc856ce5fbd304c9dbaa4fb3b077fed9"; + sha256 = "3b642ee6d1227fe4b459bda110285826a5f1d8d4ea32e30a9f043ac2f0d290bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ca-valencia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ca-valencia/firefox-92.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "409b9e13038e26de3bf94e7a3a4d35606e378c9a4b07a6c51250a778f4f95cd7"; + sha256 = "1ffb6094c6f56c79c1032bd73b01335277c49988d37ff8be7767cfdcd5ddb0a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ca/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ca/firefox-92.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "9b983cfbc1a3a46f8277927a5ddd73ad236fd5e29542d3e3b23708242f2ae241"; + sha256 = "e70753a344a1b4bf1c95941495508de71a5c064fec7dba981fe123be48efe85d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cak/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cak/firefox-92.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b4a4450d741e5bd3bbc5087377bbe4dda26af6ea10af5bf6286c26d09d02f3db"; + sha256 = "f71978689dcb2040910b342ca69dc863b9d50881b8015667f0ea5e16e6730429"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cs/firefox-92.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d7dd456b77af0f5e98c55013e735140e578f81a402dcf0ab2b3971a9e1562ca9"; + sha256 = "7e98ec58cecce174b3a76550bc3c4e0efea5f49ed6270137697dbe3410232b07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/cy/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cy/firefox-92.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "efee0853acfadd55dcc8a25e693cb7265a38c0ef29704b3eca0ba99036162f49"; + sha256 = "5c6b89f3ad3404ce5269c9da0ce5a2a827409f989146bad2ace80a93067ee0da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/da/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/da/firefox-92.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3835e498f68a75b31f4c6b13eced98ac458df5d3c1acfd34f44f8959388ec57a"; + sha256 = "c7f21ccb8478fcc0cc76d7895f8b4e18fb750d62f9d6a01101b106f436c015bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/de/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/de/firefox-92.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "47c3b1cde4cd2a1e57b63ec2e0f8db0e1b393c61bfb3337371764df835527daa"; + sha256 = "69cec8959bfcfb1103097657980b9a40b946fe7fe61c93c8fe78aab996a2f30a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/dsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/dsb/firefox-92.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8f3672728a49391be310bee1bfa6336735874369cd427d4f7073f833ddf54626"; + sha256 = "568d38d8650fa65d258db761c19396da66110588b50be860a107675b0420715c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/el/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/el/firefox-92.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "df6ded8d5abfb6f33c22c34578a3b12e991c1f64674a2b4b573cd1c682779400"; + sha256 = "b3567a5124db9ff3aa6878bcc24f4f484c73ac2bbf928efcbc8d5cec50acfcf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-CA/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-CA/firefox-92.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "df5e90395044ef348d766fc9ef4792edc20b8befbaef0cc42794eeace47a0a9a"; + sha256 = "aee0ffc689d817fe539473a5164b6cb0ad9a6bafa23282af56fd87743261365f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-GB/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-GB/firefox-92.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "eec39ef04bdc398fd9f6c2eeddcc4e8f85e46ec08be8f53e64564e41d39e111e"; + sha256 = "528c966c67582b5bd96e0e6ca911ecd5a30988237bb7d93d85dbb2e5979c0301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/en-US/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-US/firefox-92.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c52d82b5a73e37c5c80ccf4e206bb80b632bd835968e6bebc7b93c5f4a5acfc9"; + sha256 = "3fbb43fa7e8f1636a5c9be13af710dd5b3ef5326803b1fc35634ef68cb8db531"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/eo/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/eo/firefox-92.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e86dc36a4b14563e546e218589d74fe669083111d97df40b2ef35ad48d2c7309"; + sha256 = "62de83dc9b666f1699302754676b5657e587203c49ab71ff925657a73c53ad5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-AR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-AR/firefox-92.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "891374037a1093cb33739e55188b5fdfc54ecf3f9bf95d3eb9f700d388bc9632"; + sha256 = "08d8aa305344ea45256dcc7c574c9a8fdd5e44e7ea889a1ea4e6af17eaaa09ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-CL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-CL/firefox-92.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0063ed2e227e579591f1b7fc4c7d9acdb6667323d2110e4605402021eea117b9"; + sha256 = "41fbcf2947e91b50b5467f7341dd02be42b71240414b56aac651d6ba7f53e74b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-ES/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-ES/firefox-92.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d8b20f06f8caa991596222ca189660cc3b4c3fc86148d85d26223425c270c4df"; + sha256 = "e180d0e363ea6fdc4f2fe7c727c5958d33b42c27267b05b31928ffb5799a06d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/es-MX/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-MX/firefox-92.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8d87de0de6e6a79065f22fef7e17b5bda5fe5644160d37444a4144d26fd6c303"; + sha256 = "00ee74e5b48685accba8e37510742821a3a6ee993649429194dd46da63b553f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/et/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/et/firefox-92.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f65daaa770f2a0f0f7470b4f4ab6db20d41f107afb3431b2b08ebffb45cfcc6b"; + sha256 = "430c623e3b855dba5f13173031ebce68079f71394194cec5f60cacd6a2e1c061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/eu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/eu/firefox-92.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ff1cc7c354dcb3ce8aad5080bc88b33a4282fb678f888a8bde8bd5d8eb53867a"; + sha256 = "9e056cd390cd72fd3cb75f6c704b36798c835fed3eea46d44cd036c6d012b18f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fa/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fa/firefox-92.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "71cc81129e19253a465f3fa1a5cc22795c9496f6f4e063b39cd5fb4f8504e7a2"; + sha256 = "5ab4507f0af10790e4df3f4caacabeb9ce01e82b9b002791a1102193492f7c1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ff/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ff/firefox-92.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b2e919a9379d24ce148ac5b1ac5dc498693f3a8f502b24479fd0876403c1567c"; + sha256 = "031e7de2b235aa06ea74850506dd241621548032fb65fbb27b3389d557271e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fi/firefox-92.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cd1729d0e2885304ac6f6fdb4918617f4614754932885ec43f0b9988d647cf3f"; + sha256 = "d3f30254a4afef69da5dc59c6f77c48eb801f402e40bca9f2e97ad69d7dedebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fr/firefox-92.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e06c6d6b2e2dda4ec6c3d12798ec2aa119395e9ac252ee5ea8626024810d05f3"; + sha256 = "7e4063d25aba375375c6ef1749ddd6a49fe616ba2b293cac9220bcfcefa936f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/fy-NL/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fy-NL/firefox-92.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8f6db800766e9c3e6baaebd5ef5c32fedc3d478837cdb52e734dd9b948587696"; + sha256 = "edf12cb878e8014402c8249c89fd648a0dc5ddf5621d9ee4f92694fb92b5a6e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ga-IE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ga-IE/firefox-92.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "25cdaaa65a20a41e6a1918539106ab5a5c788e24f6afcbc6458bb57faa667948"; + sha256 = "9d7e464620bd62e81ce62fa6de176c614a8347cd2972d8ff96f3b6c7ec893c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gd/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gd/firefox-92.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "560fd9ee5c8cdbb080207793bd14d6d9502a873a2a2b06fa447bf290f30391b0"; + sha256 = "5c48eeefa57989c23810fddf8a63c0ab022e7774050f9e69f3d0abece64a7b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gl/firefox-92.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4c4bba4dbda0515ac035ee2c3878866ea3f6cb01204f761dd0c356bf95c3c238"; + sha256 = "eb1904437e14194c672e8efc493e08490b8660220ad4484fbe827d4e6c36ba11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gn/firefox-92.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "71d364c0113dc2e6d39347e898143f04b176a28ec69d19a0061737b903a06f80"; + sha256 = "1018ee1a262a44138a54f61c9755a42fd8fcf894466bc8f6ee63fd3db95eb08b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/gu-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gu-IN/firefox-92.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9a9c106439dcbf7fcfb19a0af682a3a9e755fc568a571c738fb4e385f009a392"; + sha256 = "63b248a8f170066cb27858a239da41c08d3bd0dd31f49c0532f47dd3b8531cce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/he/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/he/firefox-92.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4d0aabd64820d3e2fca5f7de902a03aed79a6b4d38c4a744cb463d6814b14df9"; + sha256 = "fa1db5d836aa3136e6051fc3a378c9ac7f6750da680e6581af1018f8f20e9c88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hi-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hi-IN/firefox-92.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "17d92c11c08c164839d9f959c81847b300cfe2542e48e7bd259cbd59b6be3ce1"; + sha256 = "d21f6a1a4edb24aea217ead940a41846a12de5004dcb8bc1145807ee32a08998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hr/firefox-92.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f22b580069c1ad3b5e29e59a2fe0e19b7e6467ae6ce55a3ad34b8ce27a1680bf"; + sha256 = "5e2fbd3e80787a8a2aad7f7324fe4d0b508bde79efe22ec0aad7f10e02db15ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hsb/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hsb/firefox-92.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "2feb509657b6889eef6d5398468987c2ce06972f25b4c0efa455be732f2d2793"; + sha256 = "3698ae1adffdac77fb639d80114eeae27241a535f8cd248432256c4e7ba923e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hu/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hu/firefox-92.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "31c96f8f03df5f128146ff071b25ea0ed13f217eefeb061f9a8bd083d5f0faa9"; + sha256 = "bdda2cffd94bfbb86311db1df2f70693717c37938dc5481ae4d4ff961b1f123e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/hy-AM/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hy-AM/firefox-92.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3cae4b4ce1aaededb6e1657b4c608967fd7b502fd1d5d73fd8721aef9bda1f67"; + sha256 = "8e03e849a5fc77ccde394f48e752c7b38d791edc748679fb99149c9ec55cf114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ia/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ia/firefox-92.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "048d341b1a3f95b9a131297a5473ccf2d056e8312ff2dbebba41d0ee6159cdca"; + sha256 = "da963fe2f9c5f739c75e0676a588d49bcc5f55e46e502f7c8fc26962e3f6b50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/id/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/id/firefox-92.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3110e13e4552b1826cc842d241668f7070898657610613c446c4bb0ce231af7d"; + sha256 = "7053bd9321bbc81e2d8c0ee44d5bae33dc61658ab98de9dc9151b23af775ce2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/is/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/is/firefox-92.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f4c929aabe2ed2ac02591f4fa556286c51aca294aed93d9db8b29b5e960c16f4"; + sha256 = "796332ab0dc70589fa719f9c43689474e6a4c4253a0334c3fcbec5ff46817a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/it/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/it/firefox-92.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2ce8cc3cb29f5db5701fe54b318c501c4b967c877b258524ba648ac3ffe89e23"; + sha256 = "78b42d241584443d2bb92bf0c35a5616bf291f10ee8912eae7d729d3c51fdb95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ja/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ja/firefox-92.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "2bc50a7af5f03393ec0f83fc7eb4ed8858d2c005f9122cc8f3e8a377f7e8ba50"; + sha256 = "9ecf782fabd96dd5e39a36b6fbd59d0ff0532107cb3e91d97857fb360f2cb00f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ka/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ka/firefox-92.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c806da6a0d3c2039d5551f25a3a4c506ddf0a2edadac4dee220040693b9547ff"; + sha256 = "17d7e4467fa606abbef19fad5eb22e3fda9435eb897560406e36f9f52daff804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kab/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kab/firefox-92.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "769a5d8ea726d9a3477d9771302f4f3157ef314012733c31c4852bb4d38782fe"; + sha256 = "b06eb4fd02a68286dd12dd5a2f1708ee11ec65d0c96e151d9a4fcf676daf7b45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kk/firefox-92.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0dfb08c348c0be7bc9f1d8ad603081e360d1bef8c91082053edbea313b429082"; + sha256 = "0b4fea3f3f06f18cf407956d9e8f1cff7c5e9b3a262bfec787c8433ddda5b5cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/km/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/km/firefox-92.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "09441c111989e0655df16a870cd91a7f445157385e1e7839588ddf6f484eae30"; + sha256 = "fd0422c095fa662c622732f2347757c058653839a9e7d29e775a5132f555797e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/kn/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kn/firefox-92.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "442cda23ed74ff049963a244b3b31d4971b656b3324ea734e31b3532ff8c5d02"; + sha256 = "23da36033e71f0bfbde58d00ed47895ace26d5cb35f440fe97e6c8572f847f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ko/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ko/firefox-92.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "accb55d70f8853dd23c32a668f887105bdd924ea717f0b75a1dcc70f347a8f2c"; + sha256 = "27279269f97127826a46fda7401fb929194c5b04107ba08158cc9169f4a35a4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lij/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lij/firefox-92.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "77b93a3e83c69940033e24e30f7e78069e39fb086d45d29aa8452e298d4044fe"; + sha256 = "d718cff103154a25a5159e788117767e82ca4581733c61e68b5c04dee7f1e21f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lt/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lt/firefox-92.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0ff4fdbbf1429bddb00236677ebc77fe6a344e509309f794e87a6d31ff1e34e7"; + sha256 = "d830090981e07344c714503b8cc37b6f2e63be4ee494a885542a998b56697ffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/lv/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lv/firefox-92.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "212639e9ccf7f1e8b325b7bb71616d6afdee13816f7592f920d86a10de2e555d"; + sha256 = "d4cd8d44dc024d3d992b263f6dfd40ae52a22ddd87fdec6cbe092a739f723025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/mk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/mk/firefox-92.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "c9f262672128a6a1e7b7e789426d827e8eba5743ed412af337b0eb9bdbe13556"; + sha256 = "45e4d1d02724c91f26b39dd5ea9f789a6ae966b31f9a0fa784b3f40a41d0d925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/mr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/mr/firefox-92.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "075d22d57c9bcd32e5d2e3487c07e1da0f49a0532b2aeff4563d3ac771de2b11"; + sha256 = "d84e53481bfad44403f1de84845444fe40cc8a92345e8a01262d98c09f47ddbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ms/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ms/firefox-92.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "43d32b01e03f786afea4738b86a1df500840874b3226500b1fc3c6149c5824a2"; + sha256 = "905f8ec65500b63ae4e04647126871200520d3a8ac5d6deb79227794da2b24d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/my/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/my/firefox-92.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ebc3ea9616a9389c1c7fc922062205ad5a4f5a12edf5b440f618d215b77d0148"; + sha256 = "37b93b5d29772952e00626b70e1e1655b483dd6d800a8e5fd55613d3f7910c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nb-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nb-NO/firefox-92.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5c33d8f9f6975bec07e3b7fecd30fad3d4b61886d0e35831517f383c08c97401"; + sha256 = "f2ecd7f0f4f53c8705181716297772e78d433c3feee17730066a31582ae0c7b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ne-NP/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ne-NP/firefox-92.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9aa9d913fc5913f4b45f208a5b81a4b5e370048861635ac67403035b6d91f78d"; + sha256 = "5104800ddab3310a0c21cd7fda903c822eae256622735469e845c6a169d9d783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nl/firefox-92.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "79da9079bd4b3e4f4f6578a0435aca36f49b28ad50cf8e251f02ef2885265d87"; + sha256 = "9c6c58ced571a0d044e8acbbaf8236d9de14df4378742086aaf4fd997c8b7509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/nn-NO/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nn-NO/firefox-92.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7a4f34f09f995bd71191690af56c7fc78312114988322f24071f9ba496804e20"; + sha256 = "9e2a1cbc3d235df91962e9835712e1a52bdc830bc930a8e577cd2edb8b47e8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/oc/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/oc/firefox-92.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c1e139347a48a19c6bded097e1b841e38005044904d6d5954e3b9a01ffeb8983"; + sha256 = "76da1a7f18f17a87c891252944bc6e2c2962b0ccaa450e1472e04ce5e1df2d90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pa-IN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pa-IN/firefox-92.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f8b22eb93e9f0c4882d5973ad1dde6e76d7a62139114c0a14e2aa1e12a89133b"; + sha256 = "60804014c94b3abb6785ce7da4f3036806f2ec378314a4b7cd61b3fd21e01365"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pl/firefox-92.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b6f1b36c9ae6fe988dce91b5f1830a27e9f7317e4e97dfcd197b1991661543a4"; + sha256 = "f956ff3882125832feb630143ac335eb094c9e4c3102646487bd5e3a36ddaf8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pt-BR/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pt-BR/firefox-92.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9ae38b8755dcb1fdaccc288e2ed558cf271a3389fcf26f99ea9acf79bb33b472"; + sha256 = "ae51131c8e6c99f15034e851d48f8b08c008a5a9edbecc05e7af2df9cb4d1c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/pt-PT/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pt-PT/firefox-92.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c6395580e5420f73ca0e29f3219e2cf9c83752f2cbc035fc80627770cb8a7f36"; + sha256 = "7568cd2077858ca9944fdb5eee9c991bbc5ad53cf355f161aa21342d61427a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/rm/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/rm/firefox-92.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "acb62c5a011782273f8129f81e3b3692c86f2ccc54825e4886721a80e9210363"; + sha256 = "089f4383a2f586a9196d683126f69164465f0ec35e7adabb57ef961820280e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ro/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ro/firefox-92.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "95b4f0f29001c364ecca9df0fa3d2550400eace9730867325547880bd0eec72a"; + sha256 = "d40ca2a9def1c5667e39d1fa711b22383ebcfc99139d2e2dd29fd891f900406b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ru/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ru/firefox-92.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f53c5d8a14b56cba20fe1aeb77074e2a0758c9592a780ba3ad630401791eba0f"; + sha256 = "3de026d11f3b6ee19f95a1ad9b6eb3620697c4afda9627d54782c0f9eff3d421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sco/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sco/firefox-92.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a475a8321aaa81ba293ff9c0ca527b198810ded5f6cb3c2b54009abf89118018"; + sha256 = "4fe831c9d2d5444c61b8310be958de7174b5058e873f897159a5db5434a38cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/si/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/si/firefox-92.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "43c6acf3fab766bcf46507fe92ad7af808740996303336d56e296848372c3864"; + sha256 = "0473706c50ba90efc8ceffcf1dd8fc7aa4f043d4494a29ff95f289d65a4d5938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sk/firefox-92.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d0e01e60c6dff585a91247f186ddcef007761e44debac2034266a0d8518c3ed9"; + sha256 = "ee20205a3b2e92e3aa54318dcaec7d9ad4a43c3cfde7b890652dbec7b7f36d30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sl/firefox-92.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4881245b4d9185fb1997a5ce3563f18aef526f2e5d04c407b9c6257ae8ac6251"; + sha256 = "d4890198b1d21ceef36c7d4531f37726e4b769874cfbc8ab3882ebabe36bc037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/son/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/son/firefox-92.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "df87da0870a0ffaffb37be3f52df6894a22904d0f0d234714d8a8667e1cf0427"; + sha256 = "715e12adc1a9e1597d9116f49598eca3f1e4161e4cb8bd80b666e4f8b5aa166a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sq/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sq/firefox-92.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "19ae236fb43e538621ef65399628d74baddf3dae4b4cb287d2c5cb1ec987fa9b"; + sha256 = "a5b982feb51839aace544c0e35244c77a3dac26ddda652ab5ee18c1472f7ee5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sr/firefox-92.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "23833e50ef5e8d22b1442f7c564aaa71a7b4c8fdd0907c3688938db8b850eee6"; + sha256 = "2bdba656b4b7fe0f83ed895b77ba7d0e1e0701b98c9603c210a10ebc4d0061fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/sv-SE/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sv-SE/firefox-92.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f1d21b5b94a95a9332892eec75da1bd2f0cc2a75c810e047369ac573c9d179e8"; + sha256 = "58bdd781766057ee0eadf439b90964c4c6d09eb27b4d085d2eb6ebdb60147922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/szl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/szl/firefox-92.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "12d53befb5c5ed158e32cfd3b8a4ee0b1a839b9303ea6615c8dd9a92703f17b5"; + sha256 = "3de916e83f388da456ecd420008dfb6a41707699c507ab318aed2b060af7e369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ta/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ta/firefox-92.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "33e905284d3f7f5002387dc769078e6cfc591484fc7377ddcbd3e90f3acd32f1"; + sha256 = "ededbd930c5430b5582093ed385ac0ed81ac48da31cc51d02fdd11fa582eba75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/te/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/te/firefox-92.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "bf2cca68f09e2773a6755a54ad30905a7cba8cd873f8e27a835bbc3514d9471b"; + sha256 = "9913061ffee19132a8a560d13c1a9948cb57c67e1fb1a243ecbfb1973fb072e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/th/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/th/firefox-92.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2adf3dfe859661dc8ce44a70f72c2f050baefb47b4b9fba50d752006aa4accb4"; + sha256 = "4e9f765ae6677e00720f1c7bd9bfd3a7f83e9c68a889958444430d086991d7c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/tl/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/tl/firefox-92.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "065f7448133e1b07135be3f1c08550e7d8ae3392b491b20945a2c6c8b962163a"; + sha256 = "d98f74c41c1b39d9946f55ac3803826bcade325458b1415ebd6e93e5ff18b03f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/tr/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/tr/firefox-92.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "52e01277d8c8681929fa9fe23a5c70243cfecc140056fcc6645b34a6f52e54c5"; + sha256 = "0b0dd787cfec56d8c7cd1fec959b589958e7ed59ac9415fc0374486b1bbc567f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/trs/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/trs/firefox-92.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "a19a59cd21872e40eb5eb51c7999dc8a585e074140053090f6c328d68747a159"; + sha256 = "98bf2ef8b94fc3cfeaa324ac4fb07c28723072a09150f68835ed07fc6429d796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/uk/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/uk/firefox-92.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "08ae68dff91152a44f79d54c65e6f40b396209755da22652740b02fa70b5f624"; + sha256 = "87c66d8f1155b428879b1fe83ca0f439cbe323b1a35d33d7d1fd6c30a73ed8ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/ur/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ur/firefox-92.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4a6d9e0b452e553b9badf05c0f6f8e3603c5d9c4db016d8e07d3b1b1de136455"; + sha256 = "8bfb0c2cdb60e7e3964cc5cfa363633d03fa28cb149411883ba00044448e0eb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/uz/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/uz/firefox-92.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d733aec122abd6ec71a17cacaed75479da23f0300d167aa470c6f7982a469150"; + sha256 = "2bfad6b583a7052b97c89681fe53b27e2c4ad97f40ee9e3d4be59a29b204f39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/vi/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/vi/firefox-92.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "612c5c0e4fc556c33e37dc8ba5792c0880293d6881d95b2567d9b1932e1d151e"; + sha256 = "54557679f6f58dded05c688338829b590eaca85cddc36a1e14263e07f39bd102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/xh/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/xh/firefox-92.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "df79b82dae25a4d36d92460be4a3e02eae683793258f2a53322391a7866b32d9"; + sha256 = "dec9743fc37e7d7f614293e65874d0dead710e6641dd3e2afb9cfc377a8900d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/zh-CN/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/zh-CN/firefox-92.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "416e5869fbb13391ac7e78f0477fecc8a00527dbc3612bc35d3c8d4b9686bd48"; + sha256 = "cdaf04b42adc999eda8108c18a62990ec18984c1133a98743b8059ff9a774c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-i686/zh-TW/firefox-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/zh-TW/firefox-92.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5d2ce39f7347216e1358f002f94d6fb3a52707412403b0e6d757de92bf9d3f72"; + sha256 = "dc84f295a187bb49172953282ccef628a492b4f24050715d9591d842143e5688"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index b0bea8269c1a..cf1a955c029d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - version = "91.0.2"; + version = "92.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "82084799524db6661d97d9942a01ca9edec2fae6b503c9dd2d79fca78bfef4ee0a888e5f5cf4cfa2b91d9c9392658bb8218bae2b9bec0fbcacfe73a174a4dbe7"; + sha512 = "1a73cc275ea1790120845f579a7d21713ea78db0867ced767f393dfc25b132292dfbb673290fccdb9dcde86684e0300d56565841985fa3f0115376c91154ba8e"; }; meta = { @@ -26,12 +26,12 @@ rec { }; }; - firefox-esr-91 = common rec { + firefox-esr-91 = firefoxCommon rec { pname = "firefox-esr"; - version = "91.0.1esr"; + version = "91.1.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "79703b3ec615d10957350719b2c034df10fd47d140c3557cd7de665ef4430973b97c1906d5408ddaf8855c1424e87eb9b1b568322ad8fbdb956fca219a865d66"; + sha512 = "dad0249eb2ce66eb90ff5daf0dfb63105a19790dd45661d977f7cc889644e86b33b9b0c472f46d4032ae2e4fe02c2cf69d552156fb0ad4cf77a15b3542556ed3"; }; meta = { @@ -53,10 +53,10 @@ rec { firefox-esr-78 = firefoxCommon rec { pname = "firefox-esr"; - version = "78.13.0esr"; + version = "78.14.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "78a5dc8713ab879ebfc3b8fd7a8219844d06f0d897342fdf9a11471633d98e148ff85cf10e561899df4910b94a33b57709b64788df4621a8c0b83eb9a7102cef"; + sha512 = "5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac"; }; meta = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix b/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix index a6762e255f43..492709d88a50 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix @@ -1,23 +1,27 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , pkg-config , bison , libevent , libressl , ncurses +, autoreconfHook }: stdenv.mkDerivation rec { pname = "telescope"; - version = "0.4.1"; + version = "0.5.1"; - src = fetchurl { - url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz"; - sha256 = "086zps4nslv5isfw1b5gvms7vp3fglm7x1a6ks0h0wxarzj350bl"; + src = fetchFromGitHub { + owner = "omar-polo"; + repo = pname; + rev = version; + sha256 = "0dd09r7b2gm9nv1q67yq4zk9f4v0fwqr5lw51crki9ii82gmj2h8"; }; nativeBuildInputs = [ + autoreconfHook pkg-config bison ]; diff --git a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index ffdd8b7ed040..5adb5bb65a8e 100644 --- a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.8.6"; + version = "2021.8.7"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-dMZu4IRdchPeoYylz1XDZeJsAW+V8HZApNndpeu+RbA="; + sha256 = "sha256-Q8Xjo60lR1x7Y9/jcxXX32IxVVlHmkr4ekIwWTgdwps="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index 1ee8f31ed890..5984710d8c29 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "07p62zifycw7gnwkd3230jsjns80k2q9fbj8drzp84s9cp7ddpa9"; + sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c"; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index 0b862718cfb2..14e7095c4b9e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-RcDZW/iOAcJodGiuzmeZk3obtD0/mQoMF9vL0xNehbQ="; + sha256 = "sha256-zIL9KG1WL+DlgC5c+b9gV1i7mB0Ge8bapcuSV4GNIck="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 729f7e472280..9afc9f02c898 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.16.2"; + version = "0.17.0"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; - sha256 = "05khmpbv42wjpkdb4n51pnq678la6hjfhkyy49d0j2kcnvfd1m5p"; + sha256 = "15ffb8damn935sfnqpshiyaazpldjcq411xrcfngpp7ncl9vbgwm"; stripRoot = false; }; in @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-hP2HQI9Oc7IlzVS5r7yqGAgSgqECOSZVe2B3vO2sgKA="; + sha256 = "1pw558d64c6ynqnnadhg8vbi4ql6f5y81l9hpxi0ki5myj2kx6an"; }; - vendorSha256 = "sha256-6ABnX0GV3HmhpUpPWS0bigubRqpXGoikEeQ/LqO6Ybs="; + vendorSha256 = "sha256-FUASe7EQ8YVv3R6fPPLtsvMibe00Ox596GoTyKt0S+E="; nativeBuildInputs = [ installShellFiles ]; @@ -34,6 +34,10 @@ buildGoModule rec { cp -r ${manifests} source/cmd/flux/manifests ''; + # Required to workaround test error: + # panic: mkdir /homeless-shelter: permission denied + HOME="$TMPDIR"; + doInstallCheck = true; installCheckPhase = '' $out/bin/flux --version | grep ${version} > /dev/null diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 4fe8bea90717..003c527a176f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-Ypy462QYmRiQrnOYjBA4BrtPKMT7sNpWb4St3KMVqbI="; + sha256 = "sha256-YjZ73Qc1lXosHopW+ZsrIyv16YupgB6ZpdcSGaZuafQ="; }; - vendorSha256 = "sha256-GUeLbngahbjEXetCfFbwWhn7jtyqKu7I2dyfjKalUM0="; + vendorSha256 = "sha256-OlM0HXFLTLYOZuVCud3k8K5X89zdZVlNkhXZzh0eKXc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix new file mode 100644 index 000000000000..ebb0abfcbd28 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "hubble"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "cilium"; + repo = pname; + rev = "v${version}"; + sha256 = "1n1930hlaflx7kzqbz7vvnxw9hrps84kqibaf2ixnjp998kqkl6d"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Network, Service & Security Observability for Kubernetes using eBPF"; + license = licenses.asl20; + homepage = "https://github.com/cilium/hubble/"; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix index cc0f1e0bf64c..7249c2a5cef4 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.8"; + version = "0.4.10"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XD8xGqtE7eaBxPL4Z0Kw4BEqM2fdgww7wl8wJ1U3u0U="; + sha256 = "sha256-D1/ljIOc5vK6HcYmk0WNnIRGBt1vJk9dGxl5GjhKhuA="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 3d2771638842..926dc1dff542 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-CwAa2YqJ0R+L+VwxqruQmZJUctP4GgKszY49ZVyyNBE="; + sha256 = "sha256-E8oI0qBDS6CcA5ZDGs1YVt/BPEfUzCrt5aaqfHAXukI="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 749dac7546c7..cc40395d6d97 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "45256745cef246dabe1ae8a7d109988f190cd7ef"; - sha256 = "0ni1v8ppg5cf35gq7nzd50kajxzp5zkbzhf022in0fgbjcprlzr2"; + rev = "35ac02085169bc2372834d6be6cf4c1bdf820d09"; + sha256 = "1jh0jrxyywjqhac2dvpj7r7isjv68ynbg7g6f6rj55raxcqc7r3j"; }; } ); @@ -15,8 +15,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-aws.git"; - rev = "3f66ee06f689021cd4c985b9b49697bdda64d961"; - sha256 = "17vn8bpy9kr259anmh3g5xwp08q69l9sz7s3nzn8sy5flqa87w50"; + rev = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48"; + sha256 = "15jz9x3ra3hsh6xj4cbri1fvvjk2rplnnhnccz7qc6f176b5r01j"; }; } ); @@ -35,8 +35,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/nix-community/nixops-gce.git"; - rev = "fed6aadace9a9e914425589c065bb969d53f2309"; - sha256 = "096ic1kzlcv8cx51hnhlq37pkg4pis2rk5kri14dwp3865si1mdw"; + rev = "712453027486e62e087b9c91e4a8a171eebb6ddd"; + sha256 = "0siw2silxvbxdfgb2dcymn11nqdf8an7q43wcq1lyg1ac07w7dwh"; }; } ); @@ -45,8 +45,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "af6cf5b2ced57b7b6d36b5df7dd27a14e0a5cfb6"; - sha256 = "1j75yg8a44dlbig38mf7n7p71mdzff6ii1z1pdp32i4ivk3l0hy6"; + rev = "1245280d97e0adc4643d02d1cf62ddd582c73e49"; + sha256 = "1z3zsx54585rcyabj6hrbwbd1c783rrlfj53np1sa3i7m93vmxzc"; }; } ); diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock index 237683661a95..bef5bbef4090 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -19,7 +19,7 @@ requests = ">=2.5.0" [[package]] name = "babel" -version = "2.9.0" +version = "2.9.1" description = "Internationalization utilities" category = "dev" optional = false @@ -38,24 +38,27 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.17.35" +version = "1.18.36" description = "The AWS SDK for Python" category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.35,<1.21.0" +botocore = ">=1.21.36,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.3.0,<0.4.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.35" +version = "1.21.36" description = "Low-level, data-driven core of boto 3." category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -63,11 +66,11 @@ python-dateutil = ">=2.1,<3.0.0" urllib3 = ">=1.25.4,<1.27" [package.extras] -crt = ["awscrt (==0.10.8)"] +crt = ["awscrt (==0.11.24)"] [[package]] name = "certifi" -version = "2020.12.5" +version = "2021.5.30" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -75,7 +78,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.5" +version = "1.14.6" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -85,12 +88,15 @@ python-versions = "*" pycparser = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "colorama" @@ -102,7 +108,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "cryptography" -version = "3.4.6" +version = "3.4.8" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -129,11 +135,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "imagesize" @@ -145,17 +151,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "jinja2" -version = "2.11.3" +version = "3.0.1" description = "A very fast and expressive template engine." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.6" [package.dependencies] -MarkupSafe = ">=0.23" +MarkupSafe = ">=2.0" [package.extras] -i18n = ["Babel (>=0.8)"] +i18n = ["Babel (>=2.7)"] [[package]] name = "jmespath" @@ -167,7 +173,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "libvirt-python" -version = "6.10.0" +version = "7.7.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -175,11 +181,11 @@ python-versions = "*" [[package]] name = "markupsafe" -version = "1.1.1" +version = "2.0.1" description = "Safely add untrusted strings to HTML/XML markup." category = "dev" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +python-versions = ">=3.6" [[package]] name = "nixops" @@ -200,7 +206,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "45256745cef246dabe1ae8a7d109988f190cd7ef" +resolved_reference = "35ac02085169bc2372834d6be6cf4c1bdf820d09" [[package]] name = "nixops-aws" @@ -214,15 +220,15 @@ develop = false [package.dependencies] boto = "^2.49.0" boto3 = "^1.13.7" -nixops = "rev master" -nixos-modules-contrib = "rev master" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} typing-extensions = "^3.7.4" [package.source] type = "git" url = "https://github.com/NixOS/nixops-aws.git" reference = "master" -resolved_reference = "3f66ee06f689021cd4c985b9b49697bdda64d961" +resolved_reference = "371aedeb7fd53b8978a60dd7c37d3a6c38101c48" [[package]] name = "nixops-encrypted-links" @@ -234,7 +240,7 @@ python-versions = "^3.7" develop = false [package.dependencies] -nixops = "branch master" +nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} [package.source] type = "git" @@ -254,14 +260,14 @@ develop = false [package.dependencies] apache-libcloud = "^3.2.0" cryptography = "^3.1.1" -nixops = "branch master" -nixos-modules-contrib = "branch master" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} +nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} [package.source] type = "git" url = "https://github.com/nix-community/nixops-gce.git" reference = "master" -resolved_reference = "fed6aadace9a9e914425589c065bb969d53f2309" +resolved_reference = "712453027486e62e087b9c91e4a8a171eebb6ddd" [[package]] name = "nixops-virtd" @@ -273,14 +279,14 @@ python-versions = "^3.7" develop = false [package.dependencies] -libvirt-python = "^6.1" -nixops = "branch master" +libvirt-python = "^7.0" +nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} [package.source] type = "git" url = "https://github.com/nix-community/nixops-libvirtd.git" reference = "master" -resolved_reference = "af6cf5b2ced57b7b6d36b5df7dd27a14e0a5cfb6" +resolved_reference = "1245280d97e0adc4643d02d1cf62ddd582c73e49" [[package]] name = "nixopsvbox" @@ -292,7 +298,7 @@ python-versions = "^3.7" develop = false [package.dependencies] -nixops = "rev master" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} [package.source] type = "git" @@ -310,7 +316,7 @@ python-versions = "^3.7" develop = false [package.dependencies] -nixops = "rev master" +nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} [package.source] type = "git" @@ -320,11 +326,11 @@ resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -358,7 +364,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pygments" -version = "2.8.1" +version = "2.10.0" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false @@ -374,7 +380,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "main" optional = false @@ -393,36 +399,39 @@ python-versions = "*" [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.3.6" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "main" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" +[package.extras] +crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] + [[package]] name = "six" -version = "1.15.0" +version = "1.16.0" description = "Python 2 and 3 compatibility utilities" category = "main" optional = false @@ -438,7 +447,7 @@ python-versions = "*" [[package]] name = "sphinx" -version = "3.5.3" +version = "3.5.4" description = "Python documentation generator" category = "dev" optional = false @@ -448,7 +457,7 @@ python-versions = ">=3.5" alabaster = ">=0.7,<0.8" babel = ">=1.3" colorama = {version = ">=0.3.5", markers = "sys_platform == \"win32\""} -docutils = ">=0.12" +docutils = ">=0.12,<0.17" imagesize = "*" Jinja2 = ">=2.3" packaging = "*" @@ -493,11 +502,11 @@ test = ["pytest"] [[package]] name = "sphinxcontrib-htmlhelp" -version = "1.0.3" +version = "2.0.0" description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" category = "dev" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" [package.extras] lint = ["flake8", "mypy", "docutils-stubs"] @@ -528,7 +537,7 @@ test = ["pytest"] [[package]] name = "sphinxcontrib-serializinghtml" -version = "1.1.4" +version = "1.1.5" description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." category = "dev" optional = false @@ -540,7 +549,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.11.1" +version = "2.12.1" description = "Run-time type checker for Python" category = "main" optional = false @@ -552,7 +561,7 @@ test = ["pytest", "typing-extensions", "mypy"] [[package]] name = "typing-extensions" -version = "3.7.4.3" +version = "3.10.0.2" description = "Backported and Experimental Type Hints for Python 3.5+" category = "main" optional = false @@ -560,16 +569,16 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.4" +version = "1.26.6" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" [package.extras] +brotli = ["brotlipy (>=0.6.0)"] secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] -brotli = ["brotlipy (>=0.6.0)"] [metadata] lock-version = "1.1" @@ -586,157 +595,177 @@ apache-libcloud = [ {file = "apache_libcloud-3.3.1-py2.py3-none-any.whl", hash = "sha256:c3722c4dd58b0ee4beaf4e615e0ba82505d9a915e55319dc84383687166a3eed"}, ] babel = [ - {file = "Babel-2.9.0-py2.py3-none-any.whl", hash = "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5"}, - {file = "Babel-2.9.0.tar.gz", hash = "sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05"}, + {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, + {file = "Babel-2.9.1.tar.gz", hash = "sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"}, ] boto = [ {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.17.35-py2.py3-none-any.whl", hash = "sha256:1e6e06b2f1eee5a76acdde1e7b4f57c93c1bf2905341207d74f2a140ce060cd8"}, - {file = "boto3-1.17.35.tar.gz", hash = "sha256:40e84a5f7888924db74a2710dbe48d066b51fe1f5549efaffe90e6efe813f37b"}, + {file = "boto3-1.18.36-py3-none-any.whl", hash = "sha256:a7fccb61d95230322dd812629455df14167307c569077fa89d297eae73605ffb"}, + {file = "boto3-1.18.36.tar.gz", hash = "sha256:4df1085f5c24504a1b1a6584947f27b67c26eda123f29d3cecce9b2fd683e09b"}, ] botocore = [ - {file = "botocore-1.20.35-py2.py3-none-any.whl", hash = "sha256:e34bbb7d7de154c2ff2a73ae0691c601a69c5bda887374c8a6a23072380b07a4"}, - {file = "botocore-1.20.35.tar.gz", hash = "sha256:9119ffb231145ffadd55391c9356dcdb18e3de65c3a7c82844634e949f0ca5a0"}, + {file = "botocore-1.21.36-py3-none-any.whl", hash = "sha256:e3e522fbe0bad1197aa7182451dc05f650310e77cf0a77749f6a5e82794c53de"}, + {file = "botocore-1.21.36.tar.gz", hash = "sha256:5b9a7d30e44b8a0a2bbbde62ae01bf6c349017e836985a0248552b00bbce7fae"}, ] certifi = [ - {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"}, - {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"}, + {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, + {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] cffi = [ - {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, - {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, - {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, - {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, - {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, - {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, - {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, - {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, - {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, - {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, - {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, - {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, - {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, - {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, - {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, - {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, - {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, - {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, - {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, -] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, + {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, + {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, + {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, + {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, + {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, + {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, + {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, + {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, + {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, + {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, + {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, + {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, + {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, + {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, + {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, + {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, + {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, + {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, + {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, +] +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] cryptography = [ - {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"}, - {file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"}, - {file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"}, - {file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"}, + {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, + {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, + {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"}, + {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"}, ] docutils = [ {file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"}, {file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] imagesize = [ {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"}, {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, ] jinja2 = [ - {file = "Jinja2-2.11.3-py2.py3-none-any.whl", hash = "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419"}, - {file = "Jinja2-2.11.3.tar.gz", hash = "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"}, + {file = "Jinja2-3.0.1-py3-none-any.whl", hash = "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4"}, + {file = "Jinja2-3.0.1.tar.gz", hash = "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, ] libvirt-python = [ - {file = "libvirt-python-6.10.0.tar.gz", hash = "sha256:47a8e90d9f49bc0296d2817f6009e18dbb69844ce10b81c2a2672bccd6f49fd5"}, + {file = "libvirt-python-7.7.0.tar.gz", hash = "sha256:cc8d6528cef7cf395c5d97566328f16faef6b5653a500b0e88c9c0fc36b72cdb"}, ] markupsafe = [ - {file = "MarkupSafe-1.1.1-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-win32.whl", hash = "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b"}, - {file = "MarkupSafe-1.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e"}, - {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f"}, - {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-win32.whl", hash = "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21"}, - {file = "MarkupSafe-1.1.1-cp34-cp34m-win_amd64.whl", hash = "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, - {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, - {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, - {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, - {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-win32.whl", hash = "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39"}, - {file = "MarkupSafe-1.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8"}, - {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, + {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, ] nixops = [] nixops-aws = [] @@ -746,8 +775,8 @@ nixops-virtd = [] nixopsvbox = [] nixos-modules-contrib = [] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -763,40 +792,40 @@ pycparser = [ {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, ] pygments = [ - {file = "Pygments-2.8.1-py3-none-any.whl", hash = "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"}, - {file = "Pygments-2.8.1.tar.gz", hash = "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94"}, + {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, + {file = "Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"}, ] pyparsing = [ {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pytz = [ {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, {file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] s3transfer = [ - {file = "s3transfer-0.3.6-py2.py3-none-any.whl", hash = "sha256:5d48b1fd2232141a9d5fb279709117aaba506cacea7f86f11bc392f06bfa8fc2"}, - {file = "s3transfer-0.3.6.tar.gz", hash = "sha256:c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ - {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, - {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"}, + {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, + {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] snowballstemmer = [ {file = "snowballstemmer-2.1.0-py2.py3-none-any.whl", hash = "sha256:b51b447bea85f9968c13b650126a888aabd4cb4463fca868ec596826325dedc2"}, {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"}, ] sphinx = [ - {file = "Sphinx-3.5.3-py3-none-any.whl", hash = "sha256:3f01732296465648da43dec8fb40dc451ba79eb3e2cc5c6d79005fd98197107d"}, - {file = "Sphinx-3.5.3.tar.gz", hash = "sha256:ce9c228456131bab09a3d7d10ae58474de562a6f79abb3dc811ae401cf8c1abc"}, + {file = "Sphinx-3.5.4-py3-none-any.whl", hash = "sha256:2320d4e994a191f4b4be27da514e46b3d6b420f2ff895d064f52415d342461e8"}, + {file = "Sphinx-3.5.4.tar.gz", hash = "sha256:19010b7b9fa0dc7756a6e105b2aacd3a80f798af3c25c273be64d7beeb482cb1"}, ] sphinxcontrib-applehelp = [ {file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"}, @@ -807,8 +836,8 @@ sphinxcontrib-devhelp = [ {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"}, ] sphinxcontrib-htmlhelp = [ - {file = "sphinxcontrib-htmlhelp-1.0.3.tar.gz", hash = "sha256:e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"}, - {file = "sphinxcontrib_htmlhelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:3c0bc24a2c41e340ac37c85ced6dafc879ab485c095b1d65d2461ac2f7cca86f"}, + {file = "sphinxcontrib-htmlhelp-2.0.0.tar.gz", hash = "sha256:f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"}, + {file = "sphinxcontrib_htmlhelp-2.0.0-py2.py3-none-any.whl", hash = "sha256:d412243dfb797ae3ec2b59eca0e52dac12e75a241bf0e4eb861e450d06c6ed07"}, ] sphinxcontrib-jsmath = [ {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, @@ -819,19 +848,19 @@ sphinxcontrib-qthelp = [ {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"}, ] sphinxcontrib-serializinghtml = [ - {file = "sphinxcontrib-serializinghtml-1.1.4.tar.gz", hash = "sha256:eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc"}, - {file = "sphinxcontrib_serializinghtml-1.1.4-py2.py3-none-any.whl", hash = "sha256:f242a81d423f59617a8e5cf16f5d4d74e28ee9a66f9e5b637a18082991db5a9a"}, + {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"}, + {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.11.1-py3-none-any.whl", hash = "sha256:c62706201ec6c14962162fa67d70bd2762753247533d70ff2442e5ac08f94fa2"}, - {file = "typeguard-2.11.1.tar.gz", hash = "sha256:33243c1cbfcb9736a06c6db22dd08876b5f297e6344aa272a2862c0f8e669f64"}, + {file = "typeguard-2.12.1-py3-none-any.whl", hash = "sha256:cc15ef2704c9909ef9c80e19c62fb8468c01f75aad12f651922acf4dbe822e02"}, + {file = "typeguard-2.12.1.tar.gz", hash = "sha256:c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051"}, ] typing-extensions = [ - {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, - {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, - {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, + {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, + {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, + {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.4-py2.py3-none-any.whl", hash = "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df"}, - {file = "urllib3-1.26.4.tar.gz", hash = "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"}, + {file = "urllib3-1.26.6-py2.py3-none-any.whl", hash = "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4"}, + {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] diff --git a/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix index fabdc7d5ab5e..257c37ff328d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.23.0"; + version = "0.24.0"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-wnm4Zprlao+zbWVJNY4BsAT1fFMft7luyDaW2HfNotg="; - aarch64-linux = "sha256-eYvfLUelSrmdY9dbgAlPm7en88hsdCnejJGq2Gz4DN0="; - x86_64-darwin = "sha256-NXMQ4mbYfIK+arGWZVhQk5iAw6AZM9PAGJ9CEC/rmgA="; - aarch64-darwin = "sha256-WqlbiDV2CuBYr6IXQ8vaESxKNZGp9vBj683igazcmwM="; + x86_64-linux = "sha256-fvGVcp6SpHY0UuWurRuypDXbWEs565bK1Peg0Q4Y0m8="; + aarch64-linux = "sha256-7h8l4Pm34UCZ5NhD1scM1c5sM4ePGLDRGAQBfI5vSHI="; + x86_64-darwin = "sha256-2S+D5Gg98GEL5L6bC8ZUSEJXFs74ZaZlNkYHYJYZvqw="; + aarch64-darwin = "sha256-rEhMX+v2sjsmc1p22uscjIyhcnpv2fWjgEnU+lUq9RE="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 6aee37c57ed4..56642fb64d33 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9UfSKMyapmDyikRqs7UiA4YYcvj/Tin9pRqC9iFLPWE="; + sha256 = "sha256-a7utYYuCgFabKILUKnKF0fcrorlV1DYMOFMRkm5QMuU="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index 064bd453301d..60fdc6902324 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.11.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-JVwFNhWAoZk3ZRl180KgE94DQPbowRya9irwwJQyN3g="; + sha256 = "1gdks7pzaqrsdihh2m3v597x0dw2qww95jlznj0h112jgicanimj"; }; - vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI="; + vendorSha256 = "sha256-dGmd6tCUKoK4uwhB5kXGOpXemtLn0VssabDE4iQWEAw="; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite diff --git a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index b4e44a05d82e..5710d456cefb 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.20.5"; + version = "0.22.4"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pUKKHrShED7yp5WSmHSbS+eiYs22Nm2/ouc2a8WYc38="; + sha256 = "sha256-bu8U3eJc10tnQhLLX0FwDrlTUVpjZBW7V4gbc/tBTBU="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index d767a381ea49..ef956c4f8b89 100644 --- a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ExpwJ4lMrYy1WztYo+RYa9jb8slIa3IJk/SUKA1fBKI="; + sha256 = "sha256-g3Yb0LAa9Ukp32p0OoXxjmw9RQwyVpi0KXQBIpKunbU="; }; - vendorSha256 = "sha256-IXA4YNdWR6DWIH4ceif2XcAdwnMr2kCuG3ozagtzsgo="; + vendorSha256 = "sha256-RBe9XzvdgE5XWBTUhvAokElNwARgwVhkMwPmdKUroC0="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index 24ec320cc431..012d00026cf5 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; - rev = version; - hash = "sha256-8W158GrvVGu5b3TG5bomK+hAF6jttZuImkmtcZOl91o="; + rev = "v.${version}"; + hash = "sha256-c/zT+FNRDu7jdooNTEYbeG9jLrL+9txe+aC7nSy4bB0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-zHtD3NVWYQ5njg17Z2YmEttiK2oiq01OiAXIZofIqKI="; + hash = "sha256-yTElaPSoTiJpfIGzuNJCWxVzdWBzim5rt0N2r0ARhvM="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/flexget/default.nix b/nixpkgs/pkgs/applications/networking/flexget/default.nix index dbbcc6596640..8b81d1134353 100644 --- a/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.136"; + version = "3.1.137"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "058sja2miwhr6lx5j8r9d97k4ywh6dsxd05nb5w19z6a0sq1vmyb"; + sha256 = "15zl97laijn42rhh524rfb3h1rky461hwfnlny2maa3h61889xrv"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/gmailctl/default.nix b/nixpkgs/pkgs/applications/networking/gmailctl/default.nix index 0042e5417df3..3e0a20a371c7 100644 --- a/nixpkgs/pkgs/applications/networking/gmailctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/gmailctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-UZzpecW4vW1JYUDCcwDIJXCGjw80fgZC4wvCh0DdE98="; + sha256 = "sha256-1gOixuOvPHEjnnDNNda9sktnhffovOfeG4XDrLRRMlE="; }; - vendorSha256 = "sha256-5oVr1qazTzsSNVLvcAsAN8UyrJOeqLjSVinImLOyJlk="; + vendorSha256 = "sha256-Yv3OGHFOmenst/ujUgvCaSEjwwBf3W9n+55ztVhuWjo="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix b/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix index 8456720cb7ac..6b8ddf9c4f58 100644 --- a/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-network-displays"; - version = "0.90.4"; + version = "0.90.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498"; + sha256 = "sha256-2SBVQK4fJeK8Y2UrrL0g5vQIerDdGE1nhFc6ke4oIpI="; }; patches = [ @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/ef3f3ff565acd8238da46de604a1e750d4f02f07.diff"; sha256 = "1ljiwgqia6am4lansg70qnwkch9mp1fr6bga98s5fwyiaw6b6f4p"; }) - # Fixes an upstream bug: https://gitlab.gnome.org/GNOME/gnome-network-displays/-/issues/147 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/23164b58f4d5dd59de988525906d6e5e82c5a63c.patch"; - sha256 = "0x32dvkzv9m04q41aicscpf4aspghx81a65462kjqnsavi64lga5"; - }) ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 41c7470a26d9..c4647b4cdfee 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -14,33 +14,19 @@ }: let - libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.56.0"; - src = fetchFromGitHub { - owner = "deltachat"; - repo = "deltachat-core-rust"; - rev = version; - sha256 = "07vcwbvpzcnvpls0hmpapi7v1npca8ydbx2i235k26xym8il89b7"; - }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${old.pname}-${version}"; - sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8"; - }; - }); electronExec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "unstable-2021-08-04"; + version = "1.21.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; - rev = "2c47d6b7e46f4f68c7eb45508ab9e145af489ea1"; - sha256 = "03b6j3cj2yanvsargh6q57bf1llg17yrqgmd14lp0wkam767kkfa"; + rev = "v${version}"; + sha256 = "1fwnv77qa9p50js98byb26ms7mhv7rfwhfv21f282a74pbqsar45"; }; nativeBuildInputs = [ @@ -52,7 +38,7 @@ in nodePackages.deltachat-desktop.override rec { ]; buildInputs = [ - libdeltachat' + libdeltachat ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index f332352e4b61..a6355fde2b24 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,20 +1,18 @@ { "name": "deltachat-desktop", - "version": "1.20.3", + "version": "1.21.0", "dependencies": { "@blueprintjs/core": "^3.22.3", "@mapbox/geojson-extent": "^1.0.0", "application-config": "^1.0.1", - "array-differ": "^3.0.0", "classnames": "^2.3.1", "debounce": "^1.2.0", - "deltachat-node": "1.56.2", + "deltachat-node": "1.60.0", "emoji-js-clean": "^4.0.0", "emoji-mart": "^3.0.0", "emoji-regex": "^9.2.2", "error-stack-parser": "^2.0.6", "filesize": "^6.1.0", - "fs-extra": "^8.1.0", "mapbox-gl": "^1.12.0", "mime-types": "^2.1.31", "moment": "^2.27.0", @@ -27,7 +25,9 @@ "react-qr-reader": "^2.2.1", "react-qr-svg": "^2.1.0", "react-string-replace": "^0.4.4", - "react-virtualized": "^9.21.2", + "react-virtualized-auto-sizer": "^1.0.5", + "react-window": "^1.8.6", + "react-window-infinite-loader": "^1.0.7", "simple-markdown": "^0.7.1", "source-map-support": "^0.5.19", "tempy": "^0.3.0", @@ -38,7 +38,6 @@ "@babel/preset-env": "^7.7.7", "@babel/preset-react": "^7.7.4", "@types/emoji-mart": "^3.0.2", - "@types/fs-extra": "^8.0.1", "@types/mapbox-gl": "^0.54.5", "@types/mime-types": "^2.1.0", "@types/node": "^14.14.20", @@ -47,7 +46,8 @@ "@types/rc": "^1.1.0", "@types/react": "^16.9.17", "@types/react-dom": "^16.9.4", - "@types/react-virtualized": "^9.21.10", + "@types/react-window": "^1.8.4", + "@types/react-window-infinite-loader": "^1.0.4", "@types/url-parse": "^1.4.3", "electron": "^13.1.6", "glob-watcher": "^5.0.5", diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix index 74449ae705e3..fc14f77198b5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -49,6 +49,15 @@ mkDerivation rec { meta = with lib; { description = "User-friendly and modern chat app, using XMPP"; + longDescription = '' + Kaidan is a user-friendly and modern chat app for every device. It uses + the open communication protocol XMPP (Jabber). Unlike other chat apps, + you are not dependent on one specific service provider. + + Kaidan does not have all basic features yet and has still some + stability issues. Current features include audio messages, video + messages, and file sharing. + ''; homepage = "https://www.kaidan.im"; license = with licenses; [ gpl3Plus diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index eda47b56b796..a7cd9116195b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, fetchFromGitHub , fetchFromSourcehut , cmake , extra-cmake-modules @@ -15,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-08-28"; + version = "unstable-2021-09-10"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "4d051bc35611fa5b75865769df7a512d90a13c65"; - sha256 = "1p8pb3pwgvxy5bvr6by54f1f62imdlddy2mk52qxcvrx8f833bml"; + rev = "40092aa096bac7e279eb5a4cc97758bac484236c"; + sha256 = "0vmsbxx4hxh35v1lbj82vq2w8z8inj83xpf24wzlbdr9inlbmym4"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index b282c5c5f210..33a746e0395b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.8.5"; + version = "0.9.0"; # 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 = "sha256-H895fyI6fdrrqhcgKMxzGSxO5BFuuizjfjBEwvl1yyg="; + sha256 = "sha256-wk8kk+PG0nw2OE7mccGjP435SEytStRy1unxg6EqP/8="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index cf46b3e98900..43985e773cb0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.16.0"; # Please backport all updates to the stable channel. + version = "5.17.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1na5ja68h14smfwxrli1kfr6fhf5dshyvcdaj0c4mwms838bdl4j"; + sha256 = "1m3bkrshlipxlbf4xr7gpw3zn1k39cdysrqmw705hy2cwf7pw7yy"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 7f97e20a85e3..17c9f9114a1f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -59,7 +59,7 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.9.3"; + version = "3.0.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -68,7 +68,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-ZmhgBL5nbgrNLRmCHocqVNC3KtaLm4LUY1f4Xl8CvB4="; + sha256 = "196w82a92jahz7caqv2cyhhq53xm3figa7kiq59kid5wbqg33c9x"; }; postPatch = '' @@ -81,6 +81,8 @@ mkDerivation rec { --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ + --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' ''; # We want to run wrapProgram manually (with additional parameters) diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index eff838256f5c..638d60777712 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.40.3"; + version = "3.40.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw="; + sha256 = "BYXp36VQQOySNTWgRIdiRl2J4zE1Cawya76Eal1mA3Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix index 8fe93fb1a44a..d2e5beb17180 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "mfpwDYRpFULD9Th8tI5yqb5RYWZJHarbWYpfKS3Q6mE="; + sha256 = "sha256-o7w2XHd5FnPYt9j8IIGy6OgKtdeNb/qZ+EiXGEn0NUQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 4e28d93e8926..3247f45b06f1 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.32.3"; + version = "0.33"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "114bbyjl2ppmy4pw0b5zwmi7lxiz6xd1k6zq0qcgdv7ahkwgybxy"; + hash = "sha256-iD4EW0v6LEjJpGcQYqQGA6f2Flck3VRhi+66EAVJ0mw="; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL + pythonPackages.cffi ] ++ lib.optional withEmacs emacs; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index a2be79f5589f..6d9f62e75ab3 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,3 +1,8 @@ +# Update instructions: +# +# To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root: +# +# nix-shell maintainers/scripts/update.nix --argstr package pkgs.firefox-bin-unwrapped { stdenv, lib, fetchurl, config, makeWrapper , alsa-lib , at-spi2-atk diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 0652ff8f7c54..3054775e2d7a 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.0.3"; + version = "91.1.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/af/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/af/thunderbird-91.1.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e9fa155cb5f1a2c4530cb568fbb2c4074f12232fa9949c2d5cdffb0d29c105d2"; + sha256 = "6b355e9b1e5c467b51aecf697d776014f52a4b71c3b67afae34e64cb8af4155c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ar/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ar/thunderbird-91.1.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "23264b0c80c0da6bbd4f10403c8a51429a36dd5befac65c6506d0b87ad18168e"; + sha256 = "1fa1acd3b21db46e70ad0295ed95be4b3839b8029de09a42d11a8523df0e4573"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ast/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ast/thunderbird-91.1.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "3028d99c36c899ce52306d11b9c26e85266e6793b306627f2c4d4f2eae280024"; + sha256 = "aa3c7ba15bd18ab420c028571fa472b25d4ffc11f5789e4330d49a787442a2f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/be/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/be/thunderbird-91.1.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0ca92e3875ea62e50449f576dfb7bb0e892bccd9093d623dc577262a3a386dec"; + sha256 = "24a39668aaadec7a77bd75dbb9174d4865776d55c33d3b6a8fd63cb6589a176c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/bg/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/bg/thunderbird-91.1.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "7c4289991f83cc2b8f6bd57e1f81ca9f49635a7582aba1935737f7dd81fad795"; + sha256 = "aed38cd5384c6e7df097fca8b37e866e0e432ea37f636c2306d2c1534b1013a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/br/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/br/thunderbird-91.1.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d34baf04a9daa69bcb83d8f312faf0436142c2b5850790764628327677c956ee"; + sha256 = "6e8558c74d7bd0fc827bae6fc948d20a8bf3a8cd1b60784bc9e45c101b781bf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ca/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ca/thunderbird-91.1.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ba561ffd34db81a6401754d80f6987da62ff043987a228842b4c4cf2e2008efe"; + sha256 = "35f23617e5a62dbb2732688add158818c9f33d1c38555c1035ebdf1511a58ba4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cak/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cak/thunderbird-91.1.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ec086e9a2709d953df3953d69eae2fe72b219b0191a04e9c8837ae16b6729adb"; + sha256 = "6029b2ec2581997916575e73e88c01068f48a6b72e606882936be5ee4d6bb69a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cs/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cs/thunderbird-91.1.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "960eafc572d6d45f549f295ae861fe6d95c98da159147bc8ef180177261c70bc"; + sha256 = "6e7d2c6fdf864c7a9951f805a867c8d2b300d31f011e8e36e7f914c269ace27f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cy/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cy/thunderbird-91.1.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ed664202a59d8f2de0fd8a9e1eb89b55af790316e03b4432a83f0d8356a0d115"; + sha256 = "7933796c5db473ca10f3633ca8f4d7d8fc6b8042e5fab2c18e45a0f1cfe542cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/da/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/da/thunderbird-91.1.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "914f30fe4b271ee3f9842636286411c0d2ceaaa7cd93dab139c45db3090fd9df"; + sha256 = "fbce1763012fbb3395668cc88cd9562ca7cb19ecaa0f4eee81def9983106b97d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/de/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/de/thunderbird-91.1.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1d0cecb39dd7e9361cef22705e2d8590d25afc6f0b23c9058a2f19c4a8dccc48"; + sha256 = "8e62c8f447cf509b31f4f54bd8537d8ff9e525ba065e225a1e1c0acdadff0d3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/dsb/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/dsb/thunderbird-91.1.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5d857231f6d061b0b7f508801dbbabd872e7048b91b9fb685fa53c211003d0c8"; + sha256 = "4c3064d94f70ed5d80ee091127de862f700904c7ea267a9f225d3e770472d0cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/el/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/el/thunderbird-91.1.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "4b8353aae1f416acfc39dd8dd62a121bfb4e722da3907e7be433af294e87680a"; + sha256 = "5307684da1676cec690ecbd47159d99f8034f4f1dd7f2785bbd673b4bde88760"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-CA/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-CA/thunderbird-91.1.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "68e404576c3fd4a619a3965298e5198bd507a6f6206c2723eebbb41063163e06"; + sha256 = "a411b006a7589c7798cf6e23d32c1096c8587904b8dec0c77c59a4864d94d077"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-GB/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-GB/thunderbird-91.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "06aa97bc593ae38d9cceed6ad91db90edee7d73a0f36310b9cc67b274fa7120b"; + sha256 = "430b01b92d52940bfc37f5d6179da4cddf36884b3b26ece298a24b7743f72833"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-US/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-US/thunderbird-91.1.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e16e01e5dfc6f9da50809ee063d3873f9039f68e975a70ecec8de2de07893712"; + sha256 = "d19eb0214c17b9738124fd196cfc64e8c98df092d7777e59ebff2fd6304ccdad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/es-AR/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-AR/thunderbird-91.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "313f2ac3b4dad0fb6952d9717cfd957efcd676771f4fca0c89848185bd1b4f9b"; + sha256 = "1614a42f7cff6e7c8d82cb7be3cbb13b056242206fb4e9b4765576d1a048c764"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/es-ES/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-ES/thunderbird-91.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e6b2b53c901051602f4d1f8827b3daad1783dce24bee856cea8aa7ae4a536ca9"; + sha256 = "36fa6d30f6a743fba64cb3c7087143d9ba270b75b9c68e2bd9f305c0dba72a36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/et/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/et/thunderbird-91.1.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4f5801287495d738b7757c85a150e6ac8cb5ef22b056e899b74a26425a2ba165"; + sha256 = "c3ccde17967aca822bf70ad836c412315c4f8315126d000369344e19d3f5e4f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/eu/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/eu/thunderbird-91.1.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b90304636198df5b90965073aee3f333e6f69686ba6ebb2b87f4f8ea57bae123"; + sha256 = "799a10b1d0d59087dcbc36ea584e7b5bd0bf6e824b8b54fd4805693a86d8a5eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fi/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fi/thunderbird-91.1.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0548dd85e75c60e4d6aa46054d548ff2d826ec669607c3f35a4c2010ca2c661b"; + sha256 = "9d4ff3871c76453ee24ecca614c2b3ee74ccec34653758cb0d6814c6cb880cf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fr/thunderbird-91.1.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1fca39902328c4808e7851f3596ca894d8f9c43c12a4f8795802f325f58b62d5"; + sha256 = "8ecd58d5e078b3764805962a5b79c34cd967b671e83bf1d4eb986dbb6a0ce01f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fy-NL/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fy-NL/thunderbird-91.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1120b79a6ce2a926c8b539aad09e6d574d103880ed0623f6e13ba0013c606310"; + sha256 = "0f06c52b5acb30787df11994c816bacbb639d52f69490ce0d14f1dcea3393522"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ga-IE/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ga-IE/thunderbird-91.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "67d912e2b4d70b553ff9ad2106beab3cf9495fd24a5e947659dd900f576c515f"; + sha256 = "ed49900c65dcc82db483f6ed25aa84d8df4ac2ef961857e2e04581a39fd2614c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/gd/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gd/thunderbird-91.1.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5ce277a93edb95dcb9e645f353d9b48181db8b491303ba24241e9833f9d52a8c"; + sha256 = "a5c60e5ec859ec7b3f3c5415e2aadbe0d934808c3ed2fd05832bdba9100f3906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/gl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gl/thunderbird-91.1.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b57d5a4fb9c14fbdbb6de402d0469d681b2f5fc5a7f8ed51b1defc0da672cb8b"; + sha256 = "952b19e3c2b228102340803095c5c3854f1e726bf3bde05a5a5706cd536f6dfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/he/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/he/thunderbird-91.1.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cf4fdcce74dcb24ad180f45b31e8165e23ebcedaf28c867fc74e4ac8b79da5dd"; + sha256 = "33121f9612d938b8f8dc040cfff99c6e76db956bf5cbd8823e8ec5488d6fb154"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hr/thunderbird-91.1.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "8d26131d28ee06df1ce63eb21db285f752dac4d3ae71d5c2349c76630e6ebd13"; + sha256 = "62060cc1b62831543bab9d8d6e63d8cc8ec755e51b463adf3823987828037196"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hsb/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hsb/thunderbird-91.1.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7d38fee7c4a897d01f0e2254c5094962a7ae1908f071b32510bae408d3647bbd"; + sha256 = "24f8af584f7f882a2a6e80ef704e58fdf1893c4690eaa9b9a6cc03fc786c6865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hu/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hu/thunderbird-91.1.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "7271548b70d0d378fb191ca2932b7382d9f5dcc4072eae9c4db0e3260558a97d"; + sha256 = "33b17c2920312de96f9e7158b9659ab5afe8fdd09454b535b2b84f72e9797669"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hy-AM/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hy-AM/thunderbird-91.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "06d9de4a86cb0791f2c3ea683a637ec5965f9014c656b142601e9c3753231067"; + sha256 = "608cbb5ce32eef21489000f92857ac45e73adbf618f44e7fc36d8d323432504c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/id/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/id/thunderbird-91.1.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "51ae3415517df352525750a4926e4587f5edce09f88294670a7cc5c5fa830ef4"; + sha256 = "29e8a54b74a6ea8e8eed88b00c833bd6b6e90c9da62090a7162642627c04cd25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/is/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/is/thunderbird-91.1.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7e9406a3a782bf0e4b80caeb42c1607fa3d45e9982550dd17ed1b7cb7279950"; + sha256 = "5d8fc62ba40847027b9dc497294fd4a6a1ca34b1aadb934388d32942f0e47b47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/it/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/it/thunderbird-91.1.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7d6005c6017f87e0374833106de045f9115cbc3ec1825429315a928f3ad19db1"; + sha256 = "f5f0b1101e4ac664af9b4acf63d40d9cd1109653ce4f397a22f0d61f13576261"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ja/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ja/thunderbird-91.1.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "7930323cecd2002b37baabf771f1f9a4be304d7b84ce9dac4bab6856d7f9f1d3"; + sha256 = "7be97e12f05418cb82d86731130f0c2ebfc0c8aacc7f4120be2ec11d53b5980d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ka/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ka/thunderbird-91.1.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "10a9e2a23bcde3c94f72701849e3ca0833cc9dbcb821eea65bf412a5feab5ddb"; + sha256 = "47438a6fa2bad17d57f90fb083f70ec023d65a9a344fd4ffa137cec9ceb1b29d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/kab/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kab/thunderbird-91.1.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "12e1ccc30b98bb9a363ab824187c5504fd2c14cf0891455681730968cb7e8126"; + sha256 = "0037b1e8514c25fcbd05fb8dbb66880cbbf22d2bee443d14cca4acb3ef994982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/kk/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kk/thunderbird-91.1.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3de1bbb675ceeff35e1a8e581e8c6a200dd68e97bb9e363e5d6b42fd6a9420c9"; + sha256 = "749e22fb529f7d710a6a2ebeae9eb5019fad8cfda8f6678da9749bb2709fccd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ko/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ko/thunderbird-91.1.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a7b011c57df5ee00dd80a6ff9df50f957190c14156e8e3557480177a73ac2379"; + sha256 = "d69205bc220de204535569d058230b9888d58cae8f8c44ff1fcec78a6443223a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/lt/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lt/thunderbird-91.1.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fc59f081a579f837afed05b394a8f503f8c24a10c282aaacc522f3fc873281e1"; + sha256 = "8d670513f40d04e73cab28bf2cbed5865c11c9ca22abd7b0c7f8e823e0d1553a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/lv/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lv/thunderbird-91.1.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c2e43c9f3bcd1889f40917238b6da71919c4ed248ab507bb71d74882d7ea2e27"; + sha256 = "1e8f6b5189b289b7538b4d49ab79e384f721c90279dbafb74fa797eed3144a00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ms/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ms/thunderbird-91.1.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6bf1c022f9384894e4047d7d96e3236cf92427ba6de99a0d650e3da985ff7698"; + sha256 = "6c29d08a31ddf074afe987864fd597822d70438b27b4f3ba09637235d387c4c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nb-NO/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nb-NO/thunderbird-91.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "82797bc5227b429a51801f60edf485b62c774be19c9befc055d695f9e4ba4e47"; + sha256 = "b0427494aa505bc4fb0dbd22881c480d9b3b0003a1768010ae277403964cc069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nl/thunderbird-91.1.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0e07d3cea432f914d17016998d5a6cebfe43549e1fb4599f0a92cc73c265fde4"; + sha256 = "b690288643ecdda0f92c74ea1e27555dcbbfb5600e4b96c5f09fc6d438a07904"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nn-NO/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nn-NO/thunderbird-91.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "70dc2d1d427bc93105fc6cba79c27e9f5062a6a9572c5adbe55bad737e359bbc"; + sha256 = "2d75277596380c477334f81ef75a20216502a767c307b50b29b1e9fb9c859c44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pa-IN/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pa-IN/thunderbird-91.1.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2e07c0661e29e35bc42360894dbc5d4ca0313a3da9f2b96ddcc82936665339e2"; + sha256 = "1ab4a0c67f0ece7263b5aa67ff83e525b22aff82577ee80c422ebe8dc3df88e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pl/thunderbird-91.1.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5f16cafaa287f67dd33eebd2f0cd3d128b0d0c7119c0721de8e5434be4dbecd0"; + sha256 = "d4ef5d8678c8ef56bfc29362ef1745daef81ae7f8769eef6dcb38e9c2575f694"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pt-BR/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-BR/thunderbird-91.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6e1eb47c6c794f27d7cbb442954450fafc5d22a17c6c4e53dad80d38e8e4a885"; + sha256 = "e29a8f74c456c3bb74e2c32aeb8b33b2e43a44f34ebdb965c62c26899c209b3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pt-PT/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-PT/thunderbird-91.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "606df5acad3221f4f9eaf9da7c0b6ad30bd8b87ea71dae30b93796342315ea51"; + sha256 = "2e4af178f24ef709d770e53511da6c9445b4c68f8326a820839dccc1c7f5f018"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/rm/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/rm/thunderbird-91.1.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "efe31e78f7e6a6351366186e608c680533c89c7947575792b05ecf706727af89"; + sha256 = "720067814b8b2ebcf4e4befffca4b64a2b3ede35a52cfbe155eacaaa55e3751f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ro/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ro/thunderbird-91.1.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a9c829b1e367ea7ce0176901fd07e6c5f67c8d5d178a7e998f01859c53f59ecf"; + sha256 = "c1c86c6e702182eb058abda2e3aae249f2baa84b8c920216d82b02dd93336736"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ru/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ru/thunderbird-91.1.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "94c4dc9fbacb07942978decabd0f9e26fe5183c671f865c6a93e906aebbc0254"; + sha256 = "79fa279c4b384c82952a8622c1fdbdd380f5c7c8519739daae923fe68a008168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sk/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sk/thunderbird-91.1.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "3a52978887a7c52d37704f264f8ec640f6110ea64b568995794ce62b6ae86228"; + sha256 = "dcc35cf4d23ad70e58378d9ce85d6cb627601ba1b6703bfa91b1350d7c9db460"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sl/thunderbird-91.1.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c2b3b28c3bdfa969af465a9aa5dc75334f7372a6317df6075ba7d594f52c0294"; + sha256 = "ffd4fd2047d6be06763c7e5d64936ed781ac55a6412236d3f4373e740f3effe2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sq/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sq/thunderbird-91.1.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5524ce37c39018b9b60034ca06b3cd5f862149b7885733af8f840e1b39f13865"; + sha256 = "db989f096cfbb11451877f7a55b89ecc3d95f3920716f3c094272f7f606350f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sr/thunderbird-91.1.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8cbfac96a6ce6d35dd68d6d4cf9fcafc146e69a81bc8144f6407621fe992fc1a"; + sha256 = "bc63020249bd66abcf17dd86daf72960c80fdfa334257031f88060d610b7b420"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sv-SE/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sv-SE/thunderbird-91.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6887854f7efa083f25a21874becd7e34c4b57a35b3898a790ad9988415f143e2"; + sha256 = "018f169ef69d4d43c860fa0b31102f87001035cdebbdaf9a296a5a9a42ffd351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/th/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/th/thunderbird-91.1.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "0e220caaf692550e8424c64bafbc3b9f5efb608fa8dc54f007c9e378e1bc9ec6"; + sha256 = "10a062c36ee778f9fb16cc90b27e51a00efc143008ea11c4e04a0261bcfd2001"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/tr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/tr/thunderbird-91.1.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7c0d780968a1dab36372320ca47ea812e2b522074ba124f29472026d5ee88f73"; + sha256 = "bbafbc16b0437fd507db0c72cdd0f13f40485329a1f6b238daf7f77c21290acb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/uk/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uk/thunderbird-91.1.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "34c1e098b7746bfeb531886463114479278d98de450136d49c594f30f537a07e"; + sha256 = "fb7488a541f284eda5862cf3f1f16e274fc3604d1ab3ec03c39c4779c9900c8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/uz/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uz/thunderbird-91.1.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "edeee2d40fe634bc34733511895f1345d8b4e0eed49fa5ef8f5598245884c20d"; + sha256 = "c8238bb841b37e4f468c95e07c714caacb2c028969d10ed88027b89ebd12f11a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/vi/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/vi/thunderbird-91.1.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "2d51311b5e8811254a1a8b68236f60029e3ac8f3528c5d46bef0040917b520f6"; + sha256 = "34bb1df38a05b37a0e8f976bf45aa2b95295e54d3cea32a199ac1a3b623086c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/zh-CN/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-CN/thunderbird-91.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "23a97b03c84ba34164a2ea3a80444040da404bcbf702c171e45a12bf1220623f"; + sha256 = "e30dbf4980e33684f2011ce5fb938b1c78e106bf9f0386e720674e494e78b3a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/zh-TW/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-TW/thunderbird-91.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "66e3a359752d1a1dabb881189e9a898729f273b420c57c94c5bfa459967cb364"; + sha256 = "09e33501f8df2889820bea4ece53edd3a732b94cfad1a5006aca2f0930db80d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/af/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/af/thunderbird-91.1.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "369393b32dd642c757c86f793be6acbf5d9b2cb4e8b893e76cbc422964ef5df2"; + sha256 = "def6badfd1fc47bcaf39eb729b32b7b18b60644d30ce1851e3c05a4e434aa55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ar/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ar/thunderbird-91.1.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c1cf67bf674031da9c0d6d9aa76c86acb89a6227b029f9b0b80f555d6bb46a4f"; + sha256 = "53d0a95c544e619a25ac6cc7cc6679b1acee486e9c421a1daddbf8654b887afd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ast/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ast/thunderbird-91.1.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7eb25e0238fcbcd779bd1c0ccb6193750f88aae4eec8544b0ca98734c9253259"; + sha256 = "887af3d430ae6a9f8ab8c4e8660ad3ee96b7bdd0a20b97382e2ee19c75881907"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/be/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/be/thunderbird-91.1.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8ae8e53c28005eefd99ea21109fd100359a7a157a72558882781b4fa28420adb"; + sha256 = "b1c98702341cb8250518226dc6ce1403ff6e8c4d693d6e2c71216b8448fa8685"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/bg/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/bg/thunderbird-91.1.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ea01a55258e25c897bf5792f0001bfc332aabefbc09ef24d5cc145831ab3a48a"; + sha256 = "77637e9d2e135116f2136ba04a48e787b1c44f137430255126f9d45ecb1fb56b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/br/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/br/thunderbird-91.1.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "cdef12d70df4a407adbb8c9f370daed965d20b243433942cabffecdb3a225737"; + sha256 = "f05f6536e425685296d257a7dabe838a9e09e3663d8315ac3f810a2f434e7087"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ca/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ca/thunderbird-91.1.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "01864d608a98d179cdd2d67480c650c4764d883b4b6a6d9d73256112d5eccffe"; + sha256 = "0509d0cde2a0fe2d6ac8dc2d5b850ddff7815145673dd2ee5a121dea95253f2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cak/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cak/thunderbird-91.1.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "968fdc7d1feb0247f159489e6600a8e18ef1715c355418e7341de193da418d26"; + sha256 = "9838e298051a41e26f07b4b3fe2b986f17dae2a28abe6d6f1117c6f0a07a3792"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cs/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cs/thunderbird-91.1.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "fbd819e3f5a3be0d0624472b902af1f29c18cf3c9e524826882efacedc6965fe"; + sha256 = "c480356bed2203f20c2e56b84a4f57782d8c439ee6f760a7bf71f6b635ff30fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cy/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cy/thunderbird-91.1.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f2ed1bc1544046b30ecffaeb62ec09328da115eb7d5da9ae1bada33960624917"; + sha256 = "0b3787a4b535630cd18be5bd643f8a26bbe92b2a0d43a20638572bafd0ce7725"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/da/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/da/thunderbird-91.1.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "f1b7fcb4b904bab9b1e669505d477225b5178dcf3b0ab7ebae5d45092284b04b"; + sha256 = "83be22576ad41fa1c8cad84c7f7236f810248ecdf5cb0d1605693fe0193b28d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/de/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/de/thunderbird-91.1.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8f8c81448ec9c82d18d764ba323577687381d67b839a804eec6a48709866a334"; + sha256 = "3edc194f461c6785f71353917a7e8451b838066238ac178031f0584b0c44c23d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/dsb/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/dsb/thunderbird-91.1.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8ff175908da6d2032f47d0a74c58576b1552c0e9bf304b678c66c43f9e282289"; + sha256 = "4d11e2475112e28836d08e091a4a42a6bb6cffc2ef91a5daa909af0559c564cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/el/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/el/thunderbird-91.1.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "da644e9386ff3526a9332869a240ed07b15f40c57a90eaa0678f1d5cad58bc79"; + sha256 = "d4d1e9c7ab327bacfa0077cd1935660c7e49adba24be2be1af91ba5661872e65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-CA/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-CA/thunderbird-91.1.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fa5fbc0e60a93ec657a9c8a8140c1318423c5a58e1a6df70706095347a150780"; + sha256 = "4ea129ba96f00ad35e727af252d864b5b7b5d299cd4d75961c399a1b112638b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-GB/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-GB/thunderbird-91.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "db11e5ce13b48cb2d8456c2c542eb24adc51fb6d0151b49459b894266fb62b4d"; + sha256 = "a8fb21782b4556d9f050b471c6de8871cd156b83bf3453e3fb1d5845d8cadc7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-US/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-US/thunderbird-91.1.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b76a3db6b41ed843471fdec8394b58ddfd231d6ff7575ebe650f0c5fa91535e7"; + sha256 = "46e6de8047c63b877ca7a34f2154851060833502d5bced598873d3f8d89cb099"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/es-AR/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-AR/thunderbird-91.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f1182cbc6f3760555ba41a4d2db415519f2a2f2c6c7c6abde94f6c72b5864a52"; + sha256 = "d24b1067cc6249b7d89fbcfedf18e390939c7aa3c1e009554ae4a3e980ce8605"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/es-ES/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-ES/thunderbird-91.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "19e538e90ee435ee29e347720fea42eca5533e4025ef285820c18c62e981023a"; + sha256 = "5ab7cbff3a0bb6684eeed6698826f7c417fef3a774a08995b087dbb069768e37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/et/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/et/thunderbird-91.1.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c3ca7abbd340306b30ed4a60c8f238d18d06be11fe3ffaa9b1bb917f629bdd31"; + sha256 = "fd0a1e89d8c045e7858828c384ec9c1d805424b6d54cb46de7b45bec1266b89f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/eu/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/eu/thunderbird-91.1.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "27c4d06f073e52c631a46174eff52b4dbc8db509f08e1e394a46552a56a8798b"; + sha256 = "02ddc8a6dc782d7148dcd799b87d10fe9d6417199bf4c245bf1baccfa173d6c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fi/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fi/thunderbird-91.1.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "57ef2dff097e9cb32ffd4540925c798e13174ee3f6d08473c745952cc2efcf71"; + sha256 = "ede8df4035b3fbeb7a2dcd49fbfcf56d9be4c152e57d7bcffcf66b35eb02e8ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fr/thunderbird-91.1.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3e4bf7cef09c1c2f787ff37f07fb3284b03d5b579330b6cb0fd1a3d9f5ac137f"; + sha256 = "c343bc336f4c556af1ceaa597391608edcbc4f970f1fc6af6699853331d6b574"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fy-NL/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fy-NL/thunderbird-91.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "867e4f64830ddd7918fd6f1e1f5a4814b174d4ac21ce1755691493b852732742"; + sha256 = "2f2d2e7b47ea8b38379b883f4c3296110f82450d5dd5e64b76588b4bb8de6462"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ga-IE/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ga-IE/thunderbird-91.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "6e5bc42c2e923d37c843b1b971a8afccdaf1de3b271bdde003f58aa2c43c09c2"; + sha256 = "3b60ca04b46298c5e560a9a85d01bdb1e2254b25b1592f78c616822f07454bc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/gd/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gd/thunderbird-91.1.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d0138ebe2ae5550f5d911d6ca8f0a27aa27338de7cd948b0665ec3e0cdee0947"; + sha256 = "bc07c4aaa55fb554fbf5a5ff5f7f03360ba048047e3e3365e28b995d40c60372"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/gl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gl/thunderbird-91.1.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "233b0fc6394a3dd6c96fa3fd800e4254c5cff026bc6d91e53d872f46de06895a"; + sha256 = "b5ce738aeff507c8aa9dd3f7d0303d877188e0f51a99291ab8090b3af7e92a2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/he/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/he/thunderbird-91.1.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "73b9546fb5b7a98be1f4431b374e0ebe59557a765747e04688b0a0319b30c845"; + sha256 = "3fe4505d46483e73e165185b449633169f8d3507c4c1a30d99e3442269907f79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hr/thunderbird-91.1.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c500cf6adb60131010054d5f99976559ac2f7f2e83799715c5de0e62765df71c"; + sha256 = "87d7a3dce52e7fe0ea9d8fe610bd6683e14c0e65cfc6c4c25e5b258a468ff9ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hsb/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hsb/thunderbird-91.1.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e67b1e15c968334476ec5775e68893dcffd1dae7ce012ef95a9c97edd506be3b"; + sha256 = "4befc38910d18cc91b27ccbcd54a04cc87f709a7a5908f48c16b90fa5118b833"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hu/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hu/thunderbird-91.1.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7b452c3dcf394c04f534c03f55f5fd0cad1c4026a818676e85ac57a988f6ca3f"; + sha256 = "9ae438b5b09d2390e3d934c85cad39d7a5dc733b1ad3add74c1700faff19bc6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hy-AM/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hy-AM/thunderbird-91.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "36b89d8d88a80fc1964eb56895df0da4e75ec64837fdca3cfd0681ec14375889"; + sha256 = "f0bf9acdc4f7b7b5b9e0d1a6005bb4919f10474a19aa9c54a4696ec3b6ec6853"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/id/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/id/thunderbird-91.1.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f91517767696f5b248cdea262dfaf7b7a2fb6a0542481cb1ceba6360c0aa5497"; + sha256 = "3b266327a9681e5b2299b860f4ba6153c49d2417c3f506bb721dad4e6bebf21f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/is/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/is/thunderbird-91.1.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "427f4e82a60587ebfe30987c21731840010dcb92471814501237ed5efe78e866"; + sha256 = "63c5947e73d86ccda38e2f600b2bf17378e44c8ef0137fc8cf788d9fd04c90b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/it/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/it/thunderbird-91.1.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "92f3e2bda56bdd4fccf431103ecfbfd897959e3bc2c15ef64fb1bafe3f8ff15c"; + sha256 = "de701cb3aa59f540e7fe9cb364a34ad7b6072ef407530555e9bcde1799cf1afe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ja/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ja/thunderbird-91.1.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9fb9f0f323246dc94045c6bb09c74d98bfba1005b8b0e68bca843ef34d363b73"; + sha256 = "16ddb5bf1cb3338a511b0e22f7b48e4dee43c364e0d8f1df5dca4354946c6d41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ka/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ka/thunderbird-91.1.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5b4d7c8a6d8818fb9e336e0b595139138be5a4fedcbafa0895a62aceb8ef6007"; + sha256 = "4fa177e0e9f4227bb389fb784a491730da682331161b6716caa64f9859756a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/kab/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kab/thunderbird-91.1.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7661d1af8b25f727219f75ddc0e9c5c75f36d2a84b2af27ac09b548767f01c5b"; + sha256 = "79ece60db326d24b0672c518356c5af52f4bc32955d9e9df3d342d5179768f2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/kk/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kk/thunderbird-91.1.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a0db8097caceb8f3d58e4c77ee137790b087c569587a06c78cbd5aa2d9b2819d"; + sha256 = "cdd426bf11206588de80d4b8d68498748444e0536da9e6cc62f1b066faf195dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ko/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ko/thunderbird-91.1.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5352f1d9fdff63913c137aa54b5d16893a374c0f1ca245f6de3a4f17ed7d8f47"; + sha256 = "4b18853761c82122d814d95a57c161647f97de344e57f2600fa562332b56362e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/lt/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lt/thunderbird-91.1.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a3bc0caeb2c1c3f81e3d705186ccc83e831c2f094742e93304483cc61666e3ad"; + sha256 = "dc44e61c6bbc3efe61310cf8541e33b04f2ad4a38a70826704706dba50622658"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/lv/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lv/thunderbird-91.1.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4bf8b846a0ffa95a3e74a9dc7a05f5283abdb907529dac2ea346570d7e5e4d97"; + sha256 = "1ed31684fd7279c051c47a9d032c4c4e77e2ff396977dcd223a0608fc3ecc400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ms/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ms/thunderbird-91.1.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4d0678116562ab28a7a4bd1ca39b94f87e2f09d79acf2baac51b69c179cf8207"; + sha256 = "da27a3e094394650fb86ce53e737502628c12dd7a3c7d179367f7e5f4810bd13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nb-NO/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nb-NO/thunderbird-91.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4f3e467cb652e2c92631723ce599716f6e1b6ba9137aa2fd51bfdda2016b75b8"; + sha256 = "ac7acf9de057d8beded959c557ee1fb42513191c1580784cb710118ff9bbb919"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nl/thunderbird-91.1.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "522186f15b6ff574e8b5a7c64d7f376d2bfcd148fb54b5faddb5647a23703076"; + sha256 = "6311048f81b579cc49cac62b6b21c138d5d91c8ad3bebbf1c27c63cb1e60afc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nn-NO/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nn-NO/thunderbird-91.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3dc1dadd4cb1af7bb11b4c77ebab20a7c43bd75639a866fcdc3a51099e078b0c"; + sha256 = "840c272897c1bd36e7e182acaf7eb1adda59c59c4b9809fbfe5fe71c14a67074"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pa-IN/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pa-IN/thunderbird-91.1.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "586e6a3fd41903dd4eef357207839d195c1eb7e40b152baa2394880db539499a"; + sha256 = "b56782bbd782840b9a1e4b9eb721539881443e7cf99f521078f86a220f425ad1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pl/thunderbird-91.1.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "2a064b763ae9b0b11d266cf413cec98f00ab6d350f44469a2dea4713ba17521a"; + sha256 = "e8883f496b67b9689e28d9313e038141876cd95e539b05fe020760f62057e934"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pt-BR/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-BR/thunderbird-91.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a897c43eccb7c91732e1fa623ff675877de014a176119ea049e9eadc579e59e9"; + sha256 = "b5f24053b799799b161a572ad51b591c8145743c6d00ece95a7c9f57753fbb98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pt-PT/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-PT/thunderbird-91.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4aa4f70dad8116e2f6fe4dbd6c7bf7cf3c090b6f0e776dfde34c594bc785f33b"; + sha256 = "83e4a41dab8ba18dd4bf14adcbc5cd27ea3fd9a3c5ad7d49c696eaa7159ec536"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/rm/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/rm/thunderbird-91.1.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f437ac48a9888abc4c63aa14c1e5561ea06a3e0287596fdae10f0f3dd071b0e6"; + sha256 = "079756fde88f2701a044b553b5c3076988951efed9029dc4e7a5b4e0e8ba4e93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ro/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ro/thunderbird-91.1.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "dfc376eb4baac472c634b4b25c43f6eaebb27c98bbda68a5fbe905b545bcf858"; + sha256 = "8c30ba26f8e8cd684bd72394164e4f9dc1ebc0d8186e78ab39a6ea8fa5119f66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ru/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ru/thunderbird-91.1.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3707b961d3b42b23a3883ebf091f7456521257f16fbf906aeda436e85019679e"; + sha256 = "718c94a9a7879dcde959665d1b78d8ac78e6e4ff1fa047178587b543cdcdc046"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sk/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sk/thunderbird-91.1.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6361c53e1908c308929054a87a276e5a43d2eefda75edc4991e845e4055a59c7"; + sha256 = "46e0a7046c1b87ee70122a499778af86cc7d0af01995a081e8a6f1e9ff3bcbae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sl/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sl/thunderbird-91.1.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "de5d84cacd50edd00184316d9122e881217017e78f0a73a79b745b130c58fb6d"; + sha256 = "bb789aefaefa4c12276dd26e97684fd3ef2294b67ca6950f8acbf515377b0848"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sq/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sq/thunderbird-91.1.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2ab70162fd53943f6a46c1c9459dadcd6e7ca5ee19c1bca161368739c74068b1"; + sha256 = "47a05b2db86bd268a44fe7a77a8960f11142ecdca16ffcee427603801add1c33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sr/thunderbird-91.1.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4baaa9d43c1f4c9db85b2a12fa52cbe2d2807b5781ac5c7287901153c1b6c81f"; + sha256 = "cf9789eb0f84697c66ed3ceccdbbe6a9e13fea2c27768e822f4e24a90950dfab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sv-SE/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sv-SE/thunderbird-91.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6151beb596c9742345ee749239e1fcf983feaa8bebc06908fbfefbe169d8cb3e"; + sha256 = "bf3482ee0f9203acc262984ee886ab32da27f2a75c7681028bc0b3ab1f0a0c71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/th/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/th/thunderbird-91.1.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e063338beec45e1d4ec69ac4c3502df243d98802dd1ce0df28634e003e5a0477"; + sha256 = "167a81fc42ef0bd51f149695c6acc36ab7df04c10ff727b119c295b7046481f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/tr/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/tr/thunderbird-91.1.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "38be40e163b0b0426318d20dca127f257861441e29b9d282f2fa352cfa2c2ccc"; + sha256 = "f508d7a071fd6c641cbd70944b784e553ab7bd4ec8e084e0ece6746b7ad149ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/uk/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uk/thunderbird-91.1.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ac1bdb90a15bc245b55e0dcda57e381ce9521d0fbcac240a55806c5ee859d90f"; + sha256 = "2505fe82a01770c279a0c3c9a29d8eb02c3078ea3c6f3be956b531277a6125aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/uz/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uz/thunderbird-91.1.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "584cd95cc34193c868949d9aac3213a779cdedde14f6f3088657ab61d32197c7"; + sha256 = "25ffeef15ef2f0f9d939ce09edc9a5e8d58f23c94c0cfd4bf952e2ad5a373fd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/vi/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/vi/thunderbird-91.1.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1725bbed0bba4e6c3fa7a44df700c4a04b47eaffda3189b8b6efff33d6e30c3a"; + sha256 = "fab7cdf7def4e8f34d891275c914b42a75d174e5fe807642c6d47ad09622dd07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/zh-CN/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-CN/thunderbird-91.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9afeaf173047c708595e0e58cbd6cdbd8a55b390420e100f4aea33597803c01a"; + sha256 = "e113f02eba4e13ce2a17098576b87a2b64b969d97c11a4dd8bb561467bf26f3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/zh-TW/thunderbird-91.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-TW/thunderbird-91.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "60367168ee3e92774b040f82b5ec733be00c958ac6c2fa07f7821020a571158f"; + sha256 = "0a3733c11855cd48504e82c32172e7cedb1a57d402e8f1f4a6e8a305b9eda3ec"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1740eebf6e3f..0be69104a5fe 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.0.3"; + version = "91.1.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "1c7b4c11066ab64ee1baa9f07bc6bd4478c2ece0bcf8ac381c2f0774582bb781b8151b54326cd38742d039c5de718022649d804dfceaf142863249b1edb68e1e"; + sha512 = "c465ff25d67c5c28db53d3b1ccda10a743276e58c693406bf31bde0253f34123348180ae18765bd60b958c050e3a874dd69ac82d7612007a8c7a2e25939840ff"; }; patches = [ ./no-buildconfig-90.patch @@ -44,12 +44,12 @@ rec { thunderbird-78 = common rec { pname = "thunderbird"; - version = "78.13.0"; + version = "78.14.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "daee9ea9e57bdfce231a35029807f279a06f8790d71efc8998c78eb42d99a93cf98623170947df99202da038f949ba9111a7ff7adbd43c161794deb6791370a0"; + sha512 = "0zan30jvv45pd6i59l2kfyfjwivqk5qq6vyf77xhss2dk8qhk3mfrfxpfbkrab676l14b9hs09nr6ni1h1iwn82zx5k7fx5x8sh5dx6"; }; patches = [ ./no-buildconfig-78.patch diff --git a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 53168307ea7a..1781d37e6c9b 100644 --- a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-sqoOppq0QdLcA2IFZYnixMNnFWb3x83tqTp6hqqVU14="; + sha256 = "sha256-QE6F+L1uy2Tmsf/DI8eUF5Ck+oE8CXDTpZS3xg2tiSs="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix b/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix new file mode 100644 index 000000000000..0088e517914f --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "dht"; + version = "0.25"; + + src = fetchFromGitHub { + # Use transmission fork from post-0.25-transmission branch + owner = "transmission"; + repo = pname; + rev = "25e12bb39eea3d433602de6390796fec8a8f3620"; + sha256 = "fksi8WBQPydgSlISaZMMnxzt4xN7/Hh7aN6QQ+g/L7s="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "BitTorrent DHT library"; + homepage = "https://github.com/transmission/dht"; + license = licenses.mit; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix b/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix new file mode 100644 index 000000000000..721f0ca259f0 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, vala +, ninja +, pkg-config +, wrapGAppsHook +, desktop-file-utils +, appstream-glib +, python3 +, glib +, gtk3 +, libhandy +, libtransmission +, libb64 +, libutp +, miniupnpc +, dht +, libnatpmp +, libevent +, curl +, openssl +, zlib +}: + +stdenv.mkDerivation rec { + pname = "fragments"; + version = "1.5"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Fragments"; + rev = version; + sha256 = "0x1kafhlgyi65l4w67c24r8mpvasg3q3c4wlgnjc9sxvp6ki7xbn"; + }; + + patches = [ + # Fix dependency resolution + ./dependency-resolution.patch + ]; + + nativeBuildInputs = [ + meson + vala + ninja + pkg-config + wrapGAppsHook + desktop-file-utils + appstream-glib + python3 + ]; + + buildInputs = [ + glib + gtk3 + libhandy + libtransmission + libb64 + libutp + miniupnpc + dht + libnatpmp + libevent + curl + openssl + zlib + ]; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/World/Fragments"; + description = "A GTK3 BitTorrent Client"; + maintainers = with maintainers; [ angustrau ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/p2p/fragments/dependency-resolution.patch b/nixpkgs/pkgs/applications/networking/p2p/fragments/dependency-resolution.patch new file mode 100644 index 000000000000..0446bc1390c7 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/p2p/fragments/dependency-resolution.patch @@ -0,0 +1,25 @@ +diff --git a/meson.build b/meson.build +index 5030d0c..6de7a20 100644 +--- a/meson.build ++++ b/meson.build +@@ -32,10 +32,11 @@ transmission_dep = declare_dependency( + meson.get_compiler('c').find_library('dht'), + meson.get_compiler('c').find_library('natpmp'), + meson.get_compiler('c').find_library('event'), +- meson.get_compiler('c').find_library('libcurl'), +- meson.get_compiler('c').find_library('libcrypto'), ++ meson.get_compiler('c').find_library('curl'), ++ meson.get_compiler('c').find_library('crypto'), ++ meson.get_compiler('c').find_library('ssl'), + meson.get_compiler('c').find_library('libpthread'), +- meson.get_compiler('c').find_library('libz'), ++ meson.get_compiler('c').find_library('z'), + transmission_vapi, + transmission_lib + ]) +@@ -45,4 +46,4 @@ subdir('data') + subdir('po') + subdir('src') + +-meson.add_install_script('build-aux/postinstall.py') ++meson.add_install_script('python3', '../build-aux/postinstall.py') diff --git a/nixpkgs/pkgs/applications/networking/p2p/libutp/default.nix b/nixpkgs/pkgs/applications/networking/p2p/libutp/default.nix new file mode 100644 index 000000000000..6fba4faf50c0 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/p2p/libutp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libutp"; + version = "unstable-2017-01-02"; + + src = fetchFromGitHub { + # Use transmission fork from post-3.3-transmission branch + owner = "transmission"; + repo = pname; + rev = "fda9f4b3db97ccb243fcbed2ce280eb4135d705b"; + sha256 = "CvuZLOBksIl/lS6LaqOIuzNvX3ihlIPjI3Eqwo7YJH0="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "uTorrent Transport Protocol library"; + homepage = "https://github.com/transmission/libutp"; + license = licenses.mit; + maintainers = with maintainers; [ angustrau ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix index d80165c44056..e5c17581cb52 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.81"; + version = "2.84"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "sha256-qwKxlmE59V+rXtuYWBMwD1O7OO4gb36lN8syFyQ6uLc="; + sha256 = "sha256-l3giWCMymUk5z4r4sEBZoeCh3K8jAp8TSf+xvhjeAEU="; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix b/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix index cbeb6afa4088..7290ec65ad56 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix @@ -1,56 +1,70 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, cmake +, desktop-file-utils +, meson +, ninja , pkg-config -, vala_0_40 -, pantheon +, python3 +, vala +, wrapGAppsHook , curl +, dht , glib , gtk3 , libb64 , libevent , libgee , libnatpmp -, libunity +, libtransmission +, libutp , miniupnpc , openssl -, wrapGAppsHook +, pantheon }: stdenv.mkDerivation rec { pname = "torrential"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "davidmhewitt"; repo = "torrential"; rev = version; - fetchSubmodules = true; - sha256 = "17aby0c17ybyzyzyc1cg1j6q1a186801fy84avlaxahqp7vdammx"; + sha256 = "sha256-78eNIz7Lgeq4LTog04TMNuL27Gv0UZ0poBaw8ia1R/g="; }; nativeBuildInputs = [ - cmake - vala_0_40 # https://github.com/davidmhewitt/torrential/issues/135 + desktop-file-utils + meson + ninja pkg-config + python3 + vala wrapGAppsHook ]; buildInputs = [ curl + dht glib gtk3 libb64 libevent libgee libnatpmp - libunity + libtransmission + libutp miniupnpc openssl pantheon.granite ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; @@ -60,8 +74,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; homepage = "https://github.com/davidmhewitt/torrential"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index 1efa9ec76da7..6e1367a6b4e5 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -10,6 +10,11 @@ , systemd , zlib , pcre +, libb64 +, libutp +, miniupnpc +, dht +, libnatpmp # Build options , enableGTK3 ? false , gtk3 @@ -69,6 +74,11 @@ in stdenv.mkDerivation { libevent zlib pcre + libb64 + libutp + miniupnpc + dht + libnatpmp ] ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] @@ -123,7 +133,7 @@ in stdenv.mkDerivation { * Full encryption, DHT, and PEX support ''; homepage = "http://www.transmissionbt.com/"; - license = lib.licenses.gpl2; # parts are under MIT + license = lib.licenses.gpl2Plus; # parts are under MIT maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ]; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix index 3518c86790b7..ea6b92c08e7e 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages , x11Support ? !stdenv.isDarwin , xclip ? null , pbcopy ? null @@ -21,6 +21,15 @@ python3Packages.buildPythonApplication rec { sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5"; }; + patches = [ + # Remove when version >0.9.2 is released + (fetchpatch { + url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch"; + sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5"; + name = "replace-decodestring-with-decodebytes.patch"; + }) + ]; + buildInputs = with python3Packages; [ python wrapPython diff --git a/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix index a0ab6304e34a..4b1150159a4e 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1sm4d0pjgk0spz9pddqb3i8hli10pibd5xs18mhcwrhnxj2xky1y"; + sha256 = "1r5vd501p3ydi6rr2k4cqdl3pixdr79lfwpnc90xmd1i6mlyxrma"; }; - vendorSha256 = "1qqpxm4s1s2yp1zmi4m25y1a6r7kxc5rmvfsg50jmqsfnwligpz6"; + vendorSha256 = "1v8hdr2na7bndx6q1kk0dkg1v9149gbhxcva1wq075xjl0kw21ip"; doCheck = false; diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 4f3fde81e980..c0d1c8a2a4e5 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -1,15 +1,17 @@ -{ mkDerivation, lib, stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets, qtx11extras -, qtwayland }: +{ mkDerivation, lib, stdenv, fetchurl +, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets +, qtx11extras, qtwayland +}: mkDerivation rec { pname = "qownnotes"; - version = "21.7.4"; + version = "21.8.12"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "3957dc623b419582ef7ccc5cb04b8f97bed4e96e8ecc2e99bef9dca7ce255b8e"; + sha256 = "85fbfb6288411ed585de85dd2cfcf3b3308eb4634824b96c5842d091da4cd476"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/applications/office/semantik/default.nix b/nixpkgs/pkgs/applications/office/semantik/default.nix index 371dd52a8402..41bf38fc4b47 100644 --- a/nixpkgs/pkgs/applications/office/semantik/default.nix +++ b/nixpkgs/pkgs/applications/office/semantik/default.nix @@ -24,13 +24,13 @@ mkDerivation rec { pname = "semantik"; - version = "1.2.5"; + version = "1.2.7"; src = fetchFromGitLab { owner = "ita1024"; repo = "semantik"; rev = "semantik-${version}"; - sha256 = "0dkg6mbnsbvbis17iz8v59wlhld93nc51abnkbyqvvkyyiqb006c"; + sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss="; }; patches = [ ./qt5.patch ]; diff --git a/nixpkgs/pkgs/applications/office/timetable/default.nix b/nixpkgs/pkgs/applications/office/timetable/default.nix deleted file mode 100644 index 9c9df892a047..000000000000 --- a/nixpkgs/pkgs/applications/office/timetable/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, nix-update-script -, glib -, gtk3 -, vala -, json-glib -, libgee -, meson -, ninja -, pkg-config -, pantheon -, python3 -, wrapGAppsHook -}: - - -stdenv.mkDerivation rec { - pname = "timetable"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "lainsce"; - repo = pname; - rev = version; - sha256 = "12c8kdrbz6x2mlrvr0nq9y5khj0qiiwlxf7aqc2z3dnrawjgy1rb"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - json-glib - libgee - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "Plot out your own timetable for the week and organize it"; - homepage = "https://github.com/lainsce/timetable"; - maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers; - license = licenses.gpl2Plus; - }; -} diff --git a/nixpkgs/pkgs/applications/office/watson/default.nix b/nixpkgs/pkgs/applications/office/watson/default.nix index 74e06d4311ce..ff458cedba10 100644 --- a/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/nixpkgs/pkgs/applications/office/watson/default.nix @@ -1,6 +1,4 @@ -{ lib, fetchFromGitHub, pythonPackages, installShellFiles }: - -with pythonPackages; +{ lib, fetchFromGitHub, python3, installShellFiles }: let # Watson is currently not compatible with Click 8. See the following @@ -10,11 +8,12 @@ let # https://github.com/TailorDev/Watson/pull/432 # # Workaround the issue by providing click 7 explicitly. - click7 = pythonPackages.callPackage ../../../development/python-modules/click/7.nix {}; - click7-didyoumean = click-didyoumean.override { - click = click7; + python = python3.override { + packageOverrides = self: super: { + click = self.callPackage ../../../development/python-modules/click/7.nix { }; + }; }; -in buildPythonApplication rec { +in with python.pkgs; buildPythonApplication rec { pname = "watson"; # When you update Watson, please check whether the Click 7 @@ -34,7 +33,7 @@ in buildPythonApplication rec { ''; checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; - propagatedBuildInputs = [ arrow click7 click7-didyoumean requests ]; + propagatedBuildInputs = [ arrow click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index 861dc66293ee..cf3ea143cedf 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-kgUsG2k2YSAAH7ea2qfGw4gON5CFdUoQ3EwOnATXZ5g="; + sha256 = "sha256-JCdSYcogvoUmu+vB/vye+6ZMIJqVoScAKreh89dxoDU="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -33,6 +33,11 @@ mkDerivation rec { cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver ]; + # See https://bugs.kde.org/show_bug.cgi?id=439541 + preConfigure = '' + rm po/de/docs/kstars/index.docbook + ''; + cmakeFlags = [ "-DINDI_PREFIX=${indi-full}" "-DXPLANET_PREFIX=${xplanet}" diff --git a/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix b/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix index 082a779e12bf..c636942ca781 100644 --- a/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix @@ -6,11 +6,11 @@ in pythonPackages.buildPythonApplication rec { pname = "obitools3"; - version = "3.0.0-beta14"; + version = "3.0.1b11"; src = fetchurl { url = "https://git.metabarcoding.org/obitools/${pname}/repository/v${version}/archive.tar.gz"; - sha256 = "17krklxfvxl6baf2m394gm1a88y0lg0bwqx20cf5q39zyw04z442"; + sha256 = "1x7a0nrr9agg1pfgq8i1j8r1p6c0jpyxsv196ylix1dd2iivmas1"; }; preBuild = '' diff --git a/nixpkgs/pkgs/applications/science/electronics/openems/default.nix b/nixpkgs/pkgs/applications/science/electronics/openems/default.nix index 64afe3222c2d..e7b947450acc 100644 --- a/nixpkgs/pkgs/applications/science/electronics/openems/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/openems/default.nix @@ -15,13 +15,10 @@ , withQcsxcad ? true , withMPI ? false , withHyp2mat ? true -, qcsxcad ? null -, hyp2mat ? null +, qcsxcad +, hyp2mat }: -assert withQcsxcad -> qcsxcad != null; -assert withHyp2mat -> hyp2mat != null; - stdenv.mkDerivation { pname = "openems"; version = "unstable-2020-02-15"; diff --git a/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix b/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix index 5052a3715ef4..7a9f58a0c6e3 100644 --- a/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,18 +1,26 @@ -{lib, stdenv, fetchurl, gtk2, pkg-config}: +{ lib +, stdenv +, fetchurl +, gtk3 +, gtkdatabox +, fftw +, gnum4 +, comedilib +, alsa-lib +, pkg-config +}: stdenv.mkDerivation rec { - name = "xoscope-2.0"; + pname = "xoscope"; + version = "2.3"; src = fetchurl { - url = "mirror://sourceforge/xoscope/${name}.tgz"; - sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; + url = "mirror://sourceforge/xoscope/${pname}-${version}.tar.gz"; + sha256 = "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - - # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 - patches = [ ./gtkdepre.diff ]; + nativeBuildInputs = [ pkg-config gnum4 ]; + buildInputs = [ gtk3 gtkdatabox fftw comedilib alsa-lib ]; meta = { description = "Oscilloscope through the sound card"; diff --git a/nixpkgs/pkgs/applications/science/electronics/xoscope/gtkdepre.diff b/nixpkgs/pkgs/applications/science/electronics/xoscope/gtkdepre.diff deleted file mode 100644 index 993df9cb5503..000000000000 --- a/nixpkgs/pkgs/applications/science/electronics/xoscope/gtkdepre.diff +++ /dev/null @@ -1,58 +0,0 @@ -diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c ---- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200 -+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200 -@@ -661,7 +661,7 @@ - static void - gtk_databox_calculate_hcanvas (GtkDatabox *box) - { -- if (!GTK_WIDGET_VISIBLE (box)) -+ if (!gtk_widget_get_visible (box)) - return; - - if (box->priv->adjX->page_size == 1.0) -@@ -698,7 +698,7 @@ - static void - gtk_databox_calculate_vcanvas (GtkDatabox *box) - { -- if (!GTK_WIDGET_VISIBLE (box)) -+ if (!gtk_widget_get_visible (box)) - return; - - if (box->priv->adjY->page_size == 1.0) -@@ -780,7 +780,7 @@ - gtk_databox_draw (box, event); - - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], -+ widget->style->fg_gc[gtk_widget_get_state (widget)], - box->priv->canvas.pixmap, event->area.x, event->area.y, - event->area.x, event->area.y, event->area.width, - event->area.height); -@@ -940,7 +940,7 @@ - GtkWidget *widget = GTK_WIDGET (box); - - g_return_if_fail (GTK_IS_DATABOX (box)); -- g_return_if_fail (GTK_WIDGET_VISIBLE (widget)); -+ g_return_if_fail (gtk_widget_get_visible (widget)); - - gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0], - TRUE, 0, 0, -@@ -1150,7 +1150,7 @@ - /* Copy a part of the pixmap to the screen */ - if (pixmapCopyRect) - gdk_draw_drawable (widget->window, -- widget->style->fg_gc[GTK_WIDGET_STATE (box)], -+ widget->style->fg_gc[gtk_widget_get_state (box)], - box->priv->canvas.pixmap, - pixmapCopyRect->x, - pixmapCopyRect->y, ---- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200 -+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200 -@@ -196,7 +196,6 @@ - -DG_DISABLE_DEPRECATED\ - -DGDK_DISABLE_DEPRECATED\ - -DGDK_PIXBUF_DISABLE_DEPRECATED\ -- -DGTK_DISABLE_DEPRECATED\ - `pkg-config gtk+-2.0 --cflags` - - all: all-am diff --git a/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix index d05f93a4653a..a04ac5a6945e 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://fasttext.cc/"; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 0dd9a19c95c8..1644ca3d1433 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec { description = "Utility for training word and subword embeddings"; homepage = "https://github.com/finalfusion/finalfrontier/"; license = licenses.asl20; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 4c04b3c07368..77dbbd7cdd1e 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -50,6 +50,6 @@ rustPlatform.buildRustPackage rec { description = "Utility for converting, quantizing, and querying word embeddings"; homepage = "https://github.com/finalfusion/finalfusion-utils/"; license = licenses.asl20; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/science/math/geogebra/default.nix b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix index eb98b3ad20c5..124caf4180c8 100644 --- a/nixpkgs/pkgs/applications/science/math/geogebra/default.nix +++ b/nixpkgs/pkgs/applications/science/math/geogebra/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; - version = "5-0-644-0"; + version = "5-0-662-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; @@ -41,9 +41,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "https://web.archive.org/web/20210604132513/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "https://web.archive.org/web/20210910014320/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "dd992654175812d8770d94f063fc1430a743e8e0efcae03f51bf9a3a073c2522"; + sha256 = "08gaiid5qgdznd9f8hb32m4qa90z7qlcx1cs7y0jr9ilnbmrgs8n"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/misc/root/5.nix b/nixpkgs/pkgs/applications/science/misc/root/5.nix index 0da3014507a5..715c5c90cbcd 100644 --- a/nixpkgs/pkgs/applications/science/misc/root/5.nix +++ b/nixpkgs/pkgs/applications/science/misc/root/5.nix @@ -47,6 +47,17 @@ stdenv.mkDerivation rec { # disable dictionary generation for stuff that includes libc headers # our glibc requires a modern compiler ./disable_libc_dicts_root5.patch + + (fetchpatch { + name = "root5-gcc9-fix.patch"; + url = "https://github.com/root-project/root/commit/348f30a6a3b5905ef734a7bd318bc0ee8bca6dc9.diff"; + sha256 = "0dvrsrkpacyn5z87374swpy7aciv9a8s6m61b4iqd7a956r67rn3"; + }) + (fetchpatch { + name = "root5-gcc10-fix.patch"; + url = "https://github.com/root-project/root/commit/3c243b18768d3c3501faf3ca4e4acfc071021350.diff"; + sha256 = "1hjmgnp4zx6im8ps78673x0rrhmfyy1nffhgxjlfl1r2z8cq210z"; + }) ]; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 4f83f957dbf7..072207da0ce5 100644 --- a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.40"; + version = "1.8.41"; src = fetchPypi { inherit pname version; - sha256 = "cad317e2e879f1f7cb59af078788aaf0d09cd761ecd91ad091adf7ac6cc1bcdb"; + sha256 = "3dffb9b5b1e23c8dcb54bb8bdf1435337c01a4ab9faf34ffdfcb1dd26a4d8890"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index 8e7bbed90978..ec75454514c4 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitea , fetchurl -, fetchpatch , runCommand , fcft , freetype @@ -28,7 +27,7 @@ }: let - version = "1.8.2"; + version = "1.9.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -89,6 +88,8 @@ let # using a compiler which foot's PGO build supports (clang or gcc) doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform) && compilerName != "unknown"; + + terminfoDir = "${placeholder "terminfo"}/share/terminfo"; in stdenv.mkDerivation rec { pname = "foot"; @@ -99,18 +100,9 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; + sha256 = "0mkzq5lbgl5qp5nj8sk5gyg9hrrklmbjdqzlcr2a6rlmilkxlhwm"; }; - patches = [ - # Fixes PGO builds with clang - (fetchpatch { - url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch"; - sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s"; - includes = [ "pgo/pgo.c" ]; - }) - ]; - depsBuildBuild = [ pkg-config ]; @@ -154,7 +146,15 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Db_lto=true" - "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" + # Prevent foot from installing its terminfo file into a custom location, + # we need to do this manually in postInstall. + # See https://codeberg.org/dnkl/foot/pulls/673, + # https://codeberg.org/dnkl/foot/src/tag/1.9.0/INSTALL.md#options + "-Dterminfo=disabled" + # Ensure TERM=foot is used + "-Ddefault-terminfo=foot" + # Tell foot what to set TERMINFO to + "-Dcustom-terminfo-install-location=${terminfoDir}" ]; # build and run binary generating PGO profiles, @@ -174,11 +174,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "terminfo" ]; - # make sure nix-env and buildEnv also include the - # terminfo output when the package is installed postInstall = '' - mkdir -p "$out/nix-support" - echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" + # build and install foot's terminfo to the standard location + # instead of its custom location + mkdir -p "${terminfoDir}" + tic -o "${terminfoDir}" -x -e foot,foot-direct "$NIX_BUILD_TOP/$sourceRoot/foot.info" ''; passthru.tests = { @@ -189,6 +189,10 @@ stdenv.mkDerivation rec { clang-latest-compilation = foot.override { inherit (llvmPackages_latest) stdenv; }; + + noPgo = foot.override { + allowPgo = false; + }; }; meta = with lib; { @@ -198,5 +202,18 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; platforms = platforms.linux; + # From (presumably) ncurses version 6.3, it will ship a foot + # terminfo file. This however won't include some non-standard + # capabilities foot's bundled terminfo file contains. Unless we + # want to have some features in e. g. vim or tmux stop working, + # we need to make sure that the foot terminfo overwrites ncurses' + # one. Due to <nixpkgs/nixos/modules/config/system-path.nix> + # ncurses is always added to environment.systemPackages on + # NixOS with its priority increased by 3, so we need to go + # one bigger. + # This doesn't matter a lot for local use since foot sets + # TERMINFO to a store path, but allows installing foot.terminfo + # on remote systems for proper foot terminfo support. + priority = (ncurses.meta.priority or 5) + 3 + 1; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix index 591b68b49ab0..3a2180ce8d82 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix @@ -2,34 +2,33 @@ , stdenv , fetchurl , pkg-config -, writeText -, libX11 -, ncurses , fontconfig , freetype +, libX11 , libXft +, ncurses +, writeText , conf ? null , patches ? [ ] , extraLibs ? [ ] }: -with lib; - stdenv.mkDerivation rec { pname = "st"; version = "0.8.4"; src = fetchurl { url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; - sha256 = "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl"; + hash = "sha256-1C087OtNamXjLpClM249RG22EsP72evBeAvGyaAzRqY="; }; inherit patches; - configFile = optionalString (conf != null) (writeText "config.def.h" conf); + configFile = lib.optionalString (conf != null) + (writeText "config.def.h" conf); - postPatch = optionalString (conf != null) "cp ${configFile} config.def.h" - + optionalString stdenv.isDarwin '' + postPatch = lib.optionalString (conf != null) "cp ${configFile} config.def.h" + + lib.optionalString stdenv.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; @@ -52,11 +51,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + TERMINFO=$out/share/terminfo make install PREFIX=$out + runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff b/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff new file mode 100644 index 000000000000..f451297dffa9 --- /dev/null +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff @@ -0,0 +1,14 @@ +diff -Naur old/Makefile new/Makefile +--- old/Makefile 1969-12-31 21:00:01.000000000 -0300 ++++ new/Makefile 2021-09-06 00:10:26.972466947 -0300 +@@ -40,8 +40,8 @@ + rm -rf st-$(VERSION) + + install: st +- git submodule init +- git submodule update ++# git submodule init ++# git submodule update + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp -f st $(DESTDIR)$(PREFIX)/bin + cp -f st-copyout $(DESTDIR)$(PREFIX)/bin diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix new file mode 100644 index 000000000000..f285d0fc73b9 --- /dev/null +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, harfbuzz +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "lukesmithxyz-st"; + version = "0.0.0+unstable=2021-08-10"; + + src = fetchFromGitHub { + owner = "LukeSmithxyz"; + repo = "st"; + rev = "e053bd6036331cc7d14f155614aebc20f5371d3a"; + hash = "sha256-WwjuNxWoeR/ppJxJgqD20kzrn1kIfgDarkTOedX/W4k="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + harfbuzz + libX11 + libXext + libXft + ncurses + ]; + + patches = [ + # eliminate useless calls to git inside Makefile + ./0000-makefile-fix-install.diff + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/LukeSmithxyz/st"; + description = "Luke Smith's fork of st"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/nixpkgs/pkgs/applications/terminal-emulators/st/mcaimi-st.nix new file mode 100644 index 000000000000..847638f304f3 --- /dev/null +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/mcaimi-st.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "mcaimi-st"; + version = "0.0.0+unstable=2021-08-30"; + + src = fetchFromGitHub { + owner = "mcaimi"; + repo = "st"; + rev = "1a8cad03692ee6d32c03a136cdc76bdb169e15d8"; + hash = "sha256-xyVEvD8s1J9Wj9NB4Gg+0ldvde7M8IVpzCOTttC1IY0="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + libX11 + libXext + libXft + ncurses + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/gnotclub/xst"; + description = "Suckless Terminal fork"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/nixpkgs/pkgs/applications/terminal-emulators/st/siduck76-st.nix new file mode 100644 index 000000000000..55fcebff0e3d --- /dev/null +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/siduck76-st.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, harfbuzz +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "siduck76-st"; + version = "0.0.0+unstable=2021-08-20"; + + src = fetchFromGitHub { + owner = "siduck76"; + repo = "st"; + rev = "c9bda1de1f3f94ba507fa0eacc96d6a4f338637f"; + hash = "sha256-5n+QkSlVhhku7adtl7TuWhDl3zdwFaXc7Ot1RaIN54A="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + harfbuzz + libX11 + libXext + libXft + ncurses + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/siduck76/st"; + description = "A fork of st with many add-ons"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix b/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix index baa71a09b9eb..b8bceda50dcd 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: stdenv.mkDerivation rec { pname = "xst"; @@ -11,11 +20,23 @@ stdenv.mkDerivation rec { sha256 = "nOJcOghtzFkl7B/4XeXptn2TdrGQ4QTKBo+t+9npxOA="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + libX11 + libXext + libXft + ncurses + ]; installPhase = '' + runHook preInstall + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/version-management/blackbox/default.nix b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix index 5c802d8a300a..06a941de7b46 100644 --- a/nixpkgs/pkgs/applications/version-management/blackbox/default.nix +++ b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ gnupg ]; - doCheck = true; + # https://github.com/NixOS/nixpkgs/issues/134445 + doCheck = !stdenv.isDarwin && stdenv.isx86_64; checkInputs = [ expect diff --git a/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/nixpkgs/pkgs/applications/version-management/fossil/default.nix index 6b445446d5b5..ed2cf00291e2 100644 --- a/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -15,12 +15,11 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.15.1"; + version = "2.16"; src = fetchurl { - url = "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; - sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E="; + url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; + sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix new file mode 100644 index 000000000000..b0a5ca641a41 --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "git-cliff"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "git-cliff"; + rev = "v${version}"; + sha256 = "sha256-oQ23jvKR4HGIMnW56FVE0XlBpO4pnMBbRXVoc6OuiHo="; + }; + + cargoSha256 = "sha256-49RHGOhTaYrg+JKYZMWcgSL7dxe6H50G6n9tJyGaLMQ="; + + # attempts to run the program on .git in src which is not deterministic + doCheck = false; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A highly customizable Changelog Generator that follows Conventional Commit specifications"; + homepage = "https://github.com/orhun/git-cliff"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix index c67a575172cb..5d12c93b0b35 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, makeWrapper}: +{ lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, installShellFiles, makeWrapper, pandoc }: stdenv.mkDerivation rec { pname = "git-open"; @@ -11,13 +11,20 @@ stdenv.mkDerivation rec { sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper pandoc ]; - buildPhase = null; + buildPhase = '' + # marked-man is broken and severly outdated. + # pandoc with some extra metadata is good enough and produces a by man readable file. + cat <(echo echo '% git-open (1) Version ${version} | Git manual') git-open.1.md > tmp + mv tmp git-open.1.md + pandoc --standalone --to man git-open.1.md -o git-open.1 + ''; installPhase = '' mkdir -p $out/bin cp git-open $out/bin + installManPage git-open.1 wrapProgram $out/bin/git-open \ --prefix PATH : "${lib.makeBinPath [ git xdg-utils gnugrep ]}" ''; @@ -27,6 +34,6 @@ stdenv.mkDerivation rec { description = "Open the GitHub page or website for a repository in your browser"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.jlesquembre ]; + maintainers = with maintainers; [ jlesquembre SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 1ab6bfd1a2f3..d6f54497a33b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "sha256-MQG4thW73gDqY68bKP2FO8z5uc2R/tED+/X9qas/GOA="; + sha256 = "sha256-ZTpnT4kuntHdMWK7c/pHS6mJrAHF9T51DydXnWXj8Z0="; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitty/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitty/default.nix new file mode 100644 index 000000000000..45c0f2635a07 --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitty/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gitty"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "gitty"; + rev = "v${version}"; + sha256 = "1byjcvzimwn6nmhz0agicq7zq0xhkj4idi9apm1mgd3m2l509ivj"; + }; + + vendorSha256 = "1mbl585ja82kss5p8vli3hbykqxa00j8z63ypq6vi464qkh5x3py"; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + meta = with lib; { + homepage = "https://github.com/muesli/gitty/"; + description = "Contextual information about your git projects, right on the command-line"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 3623dbba6b8d..0cf131508b4e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.16"; + version = "2.16.7"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-F36MuqgVkKM2RCIGEGJmL3/KpZy3eDRZ7WWUE15mTfU="; + sha256 = "sha256-AJD+WV8JilclcMXc4RFv2xY9QZNUJtYX1dsb1q85qZ0="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 128b70c38e85..3780be96fd6f 100644 --- a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -13,26 +13,13 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.8"; + version = "5.9.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; + sha256 = "09wzyhyajy1dbp5kxkmvs9x8jk964wri19p5jgf83mv27i1zkvrj"; }; - patches = [ - # https://phab.mercurial-scm.org/D10638, needed for below patch to apply - (fetchpatch { - url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84"; - sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g"; - }) - # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 - (fetchpatch { - url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea"; - sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn"; - }) - ]; - format = "other"; passthru = { inherit python; }; # pass it so that the same version can be used in hg2git @@ -40,7 +27,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; + sha256 = "1f7q0kmp46rphw38rlzh1yvpn3rdjdnzzbxzjkrjks8n1gm8baca"; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix index 73d8f3aa5ec2..3e1b6e4cd8cb 100644 --- a/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix @@ -4,11 +4,11 @@ python3Packages.buildPythonApplication rec { pname = "tortoisehg"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; + sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a"; }; # Extension point for when thg's mercurial is lagging behind mainline. diff --git a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix index e272342fe95d..84716e760817 100644 --- a/nixpkgs/pkgs/applications/version-management/vcsh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/vcsh/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, which, git, ronn, perlPackages }: +{ lib, stdenv +, fetchurl +, makeWrapper +, pkg-config +, git +, perlPackages +}: -stdenv.mkDerivation { - version = "1.20170915"; # date of commit we're pulling +stdenv.mkDerivation rec { pname = "vcsh"; + version = "2.0.2"; - src = fetchFromGitHub { - owner = "RichiH"; - repo = "vcsh"; - rev = "eadb8df6aa71a76e5be36492edcadb118bd862ac"; - sha256 = "1wfzp8167lcq6akdpbi8fikjv0z3h1i5minh3423dljc04q0klm1"; + src = fetchurl { + url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "0qdd4f6rm5rhnym9f114pcj9vafhjjpg962c4g420rn78fxhpz1z"; }; - buildInputs = [ which git ronn ] - ++ (with perlPackages; [ perl ShellCommand TestMost TestDifferences TestDeep TestException TestWarn ]); + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; - installPhase = "make install PREFIX=$out"; + buildInputs = [ git ]; + + checkInputs = [] + ++ (with perlPackages; [ perl ShellCommand TestMost ]); + + outputs = [ "out" "doc" "man" ]; meta = with lib; { description = "Version Control System for $HOME"; homepage = "https://github.com/RichiH/vcsh"; + changelog = "https://github.com/RichiH/vcsh/blob/v${version}/changelog"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel alerque ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/verco/default.nix b/nixpkgs/pkgs/applications/version-management/verco/default.nix new file mode 100644 index 000000000000..13e6317491da --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/verco/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "verco"; + version = "6.4.0"; + + src = fetchFromGitHub { + owner = "vamolessa"; + repo = pname; + rev = "v${version}"; + sha256 = "09lkgqrv5wfpg7q5mqaiar93jp8gz8ys84hy7jhn1mvjml3zlbnx"; + }; + + cargoSha256 = "04ddhhyad5cd3mg1yzx7mhr0g5mqfnmx9y0li82yx9wnv9br5qn6"; + + meta = with lib; { + description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; + homepage = "https://vamolessa.github.io/verco"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/nixpkgs/pkgs/applications/version-management/yadm/default.nix index fc8bee5fcb78..e0e26b804f58 100644 --- a/nixpkgs/pkgs/applications/version-management/yadm/default.nix +++ b/nixpkgs/pkgs/applications/version-management/yadm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "yadm"; - version = "3.1.0"; + version = "3.1.1"; buildInputs = [ git gnupg ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0ga0p28nvqilswa07bzi93adk7wx6d5pgxlacr9wl9v1h6cds92s"; + sha256 = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/video/freetube/default.nix b/nixpkgs/pkgs/applications/video/freetube/default.nix index 5151f1f9e5ee..211112b4ee06 100644 --- a/nixpkgs/pkgs/applications/video/freetube/default.nix +++ b/nixpkgs/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.13.2"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256:0rzx66nshzcrvvd9ky0wamvv5wb0xxlf3zi25xrxmh6haimqbrpv"; + sha256 = "sha256:0qaghj70ffc90wck1i4217ky5d6cryrmgna2ipsc4v8dcvbyc1lh"; }; appimageContents = appimageTools.extractType2 { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "An Open Source YouTube app for privacy"; homepage = "https://freetubeapp.io/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ ryneeverett ]; + maintainers = with maintainers; [ ryneeverett alyaeanyx ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index fcf53e7a1694..7698e6619d91 100644 --- a/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.5+matrix.1"; + version = "0.5.8+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4"; + sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk="; }; passthru = { diff --git a/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix b/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix index 8e57adbfb1af..7c16aa606f24 100644 --- a/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.14+matrix.1"; + version = "6.8.17+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1a18whh3fisprwipwhxf26kc958sxhwpvs8pxwq2sq96vr7b4xq7"; + sha256 = "AuYoUyv0DDtHnxFiNl3AF5jrMjuNRXdlJvw7d7b+yh8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index c31eb244c52c..df4c0a6bf1d0 100644 --- a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -79,21 +79,21 @@ let libdvdcss = fetchFromGitHub { owner = "xbmc"; repo = "libdvdcss"; - rev = "1.4.2-${rel}-Beta-5"; + rev = "1.4.2-Leia-Beta-5"; sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; }; libdvdnav = fetchFromGitHub { owner = "xbmc"; repo = "libdvdnav"; - rev = "6.0.0-${rel}-Alpha-3"; + rev = "6.0.0-Leia-Alpha-3"; sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; }; libdvdread = fetchFromGitHub { owner = "xbmc"; repo = "libdvdread"; - rev = "6.0.0-${rel}-Alpha-3"; + rev = "6.0.0-Leia-Alpha-3"; sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; }; diff --git a/nixpkgs/pkgs/applications/video/mirakurun/default.nix b/nixpkgs/pkgs/applications/video/mirakurun/default.nix new file mode 100644 index 000000000000..3987e1252844 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/mirakurun/default.nix @@ -0,0 +1,95 @@ +# NOTE: Mirakurun is packaged outside of nodePackages because Node2nix can't +# handle one of its subdependencies. See below link for details. +# +# https://github.com/Chinachu/node-aribts/blob/af84dbbbd81ea80b946e538083b64b5b2dc7e8f2/package.json#L26 + +{ lib +, stdenvNoCC +, bash +, common-updater-scripts +, fetchFromGitHub +, genericUpdater +, jq +, makeWrapper +, mkYarnPackage +, which +, writers +, v4l-utils +, yarn +, yarn2nix +}: + +stdenvNoCC.mkDerivation rec { + pname = "mirakurun"; + version = "3.8.0"; + + src = fetchFromGitHub { + owner = "Chinachu"; + repo = "Mirakurun"; + rev = version; + sha256 = "1fmzi3jc3havvpc1kz5z16k52lnrsmc3b5yqyxc7i911gqyjsxzr"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + mirakurun = mkYarnPackage rec { + name = "${pname}-${version}"; + inherit version src; + + yarnNix = ./yarn.nix; + yarnLock = ./yarn.lock; + packageJSON = ./package.json; + + patches = [ + # NOTE: fixes for hardcoded paths and assumptions about filesystem + # permissions + ./nix-filesystem.patch + ]; + + buildPhase = '' + yarn --offline build + ''; + + distPhase = "true"; + }; + + installPhase = + let + runtimeDeps = [ bash which v4l-utils ]; + in + '' + mkdir -p $out/bin + + makeWrapper ${mirakurun}/bin/mirakurun-epgdump $out/bin/mirakurun-epgdump \ + --run "cd ${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + + # XXX: The original mirakurun command uses PM2 to manage the Mirakurun + # server. However, we invoke the server directly and let systemd + # manage it to avoid complication. This is okay since no features + # unique to PM2 is currently being used. + makeWrapper ${yarn}/bin/yarn $out/bin/mirakurun-start \ + --add-flags "start" \ + --run "cd ${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + ''; + + passthru.updateScript = import ./update.nix { + inherit lib; + inherit (src.meta) homepage; + inherit + pname + version + common-updater-scripts + genericUpdater + writers + jq + yarn + yarn2nix; + }; + + meta = { + inherit (mirakurun.meta) description platforms; + maintainers = with lib.maintainers; [ midchildan ]; + }; +} diff --git a/nixpkgs/pkgs/applications/video/mirakurun/nix-filesystem.patch b/nixpkgs/pkgs/applications/video/mirakurun/nix-filesystem.patch new file mode 100644 index 000000000000..f7f06e2a6dba --- /dev/null +++ b/nixpkgs/pkgs/applications/video/mirakurun/nix-filesystem.patch @@ -0,0 +1,46 @@ +diff --git a/processes.json b/processes.json +index b54d404..a40dfab 100644 +--- a/processes.json ++++ b/processes.json +@@ -4,10 +4,10 @@ + "name": "mirakurun-server", + "script": "lib/server.js", + "node_args" : "-r source-map-support/register", +- "error_file": "/usr/local/var/log/mirakurun.stderr.log", +- "out_file": "/usr/local/var/log/mirakurun.stdout.log", ++ "error_file": "/var/log/mirakurun.stderr.log", ++ "out_file": "/var/log/mirakurun.stdout.log", + "merge_logs": true, +- "pid_file": "/usr/local/var/run/mirakurun.pid", ++ "pid_file": "/var/run/mirakurun.pid", + "exec_mode": "fork", + "autorestart": true, + "env": { +diff --git a/src/Mirakurun/config.ts b/src/Mirakurun/config.ts +index 0b8a1a2..ff02fda 100644 +--- a/src/Mirakurun/config.ts ++++ b/src/Mirakurun/config.ts +@@ -146,6 +146,7 @@ export function loadServer(): Server { + fs.copyFileSync("config/server.win32.yml", path); + } else { + fs.copyFileSync("config/server.yml", path); ++ fs.chmodSync(path, 0o644); + } + } catch (e) { + log.fatal("failed to copy server config to `%s`", path); +@@ -300,6 +301,7 @@ export function loadTuners(): Tuner[] { + fs.copyFileSync("config/tuners.win32.yml", path); + } else { + fs.copyFileSync("config/tuners.yml", path); ++ fs.chmodSync(path, 0o644); + } + } catch (e) { + log.fatal("failed to copy tuners config to `%s`", path); +@@ -342,6 +344,7 @@ export function loadChannels(): Channel[] { + fs.copyFileSync("config/channels.win32.yml", path); + } else { + fs.copyFileSync("config/channels.yml", path); ++ fs.chmodSync(path, 0o644); + } + } catch (e) { + log.fatal("failed to copy channels config to `%s`", path); diff --git a/nixpkgs/pkgs/applications/video/mirakurun/package.json b/nixpkgs/pkgs/applications/video/mirakurun/package.json new file mode 100644 index 000000000000..5188a7559c5c --- /dev/null +++ b/nixpkgs/pkgs/applications/video/mirakurun/package.json @@ -0,0 +1,129 @@ +{ + "name": "mirakurun", + "preferGlobal": true, + "description": "Japanese DTV Tuner Server Service.", + "version": "3.8.0", + "homepage": "https://github.com/Chinachu/Mirakurun", + "keywords": [ + "mirakurun", + "chinachu", + "rivarun", + "arib", + "isdb", + "dvb", + "dvr", + "dtv", + "tv" + ], + "author": { + "name": "kanreisa", + "url": "https://github.com/kanreisa" + }, + "contributors": [ + "rndomhack" + ], + "repository": { + "type": "git", + "url": "https://github.com/Chinachu/Mirakurun.git" + }, + "bugs": { + "url": "https://github.com/Chinachu/Mirakurun/issues" + }, + "license": "Apache-2.0", + "bin": { + "mirakurun": "bin/cli.sh", + "mirakurun-epgdump": "bin/epgdump.js" + }, + "main": "lib/client.js", + "scripts": { + "start": "node -r source-map-support/register lib/server.js", + "debug": "node -r source-map-support/register --inspect=0.0.0.0:9229 lib/server.js", + "start.win32": "node.exe -r source-map-support/register bin/init.win32.js", + "debug.win32": "node.exe -r source-map-support/register --inspect bin/init.win32.js", + "build": "tslint --project . && tsc --declaration && webpack", + "watch": "tsc -w --declaration", + "watch-webpack": "webpack -w", + "test": "tslint --project . && mocha --exit test/*.spec.js", + "clean": "rimraf lib/*", + "prepublishOnly": "npm run clean && npm run build", + "preinstall": "node bin/preinstall.js", + "postinstall": "node bin/postinstall.js && opencollective-postinstall", + "preuninstall": "node bin/preuninstall.js", + "docker-build": "docker-compose -f docker/docker-compose.yml build", + "docker-run": "docker-compose -f docker/docker-compose.yml run --rm --service-ports mirakurun", + "docker-debug": "docker-compose -f docker/docker-compose.yml run --rm --service-ports -e DEBUG=true mirakurun" + }, + "directories": { + "doc": "doc", + "lib": "lib" + }, + "dependencies": { + "@fluentui/react": "8.27.0", + "aribts": "^1.3.5", + "colors": "^1.4.0", + "cors": "^2.8.5", + "dotenv": "^8.6.0", + "eventemitter3": "^4.0.7", + "express": "^4.17.1", + "express-openapi": "^8.0.0", + "glob": "^7.1.7", + "ip": "^1.1.4", + "js-yaml": "^4.1.0", + "latest-version": "^5.1.0", + "morgan": "^1.10.0", + "openapi-types": "^7.2.3", + "opencollective": "^1.0.3", + "opencollective-postinstall": "^2.0.3", + "promise-queue": "^2.2.3", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "semver": "^7.3.5", + "sift": "^7.0.1", + "source-map-support": "^0.5.19", + "stream-http": "^3.2.0", + "swagger-ui-dist": "3.51.2", + "tail": "^2.2.3" + }, + "devDependencies": { + "@types/cors": "^2.8.12", + "@types/express": "^4.17.13", + "@types/ip": "^1.1.0", + "@types/js-yaml": "^4.0.2", + "@types/morgan": "^1.9.3", + "@types/node": "^12.20.17", + "@types/promise-queue": "^2.2.0", + "@types/react": "^17.0.14", + "@types/react-dom": "^17.0.9", + "buffer": "^6.0.3", + "copy-webpack-plugin": "^9.0.1", + "css-loader": "5.2.7", + "mocha": "^8.4.0", + "process": "^0.11.10", + "rimraf": "^3.0.2", + "style-loader": "^2.0.0", + "ts-loader": "^9.2.3", + "tslint": "^6.1.3", + "tslint-config-prettier": "^1.18.0", + "typescript": "^4.3.5", + "url": "^0.11.0", + "webpack": "5.48.0", + "webpack-cli": "^4.7.2" + }, + "engines": { + "node": "^12 || ^14 || ^16" + }, + "engineStrict": true, + "os": [ + "linux", + "darwin", + "win32" + ], + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/Mirakurun" + }, + "collective": { + "type": "opencollective", + "url": "https://opencollective.com/Mirakurun" + } +} diff --git a/nixpkgs/pkgs/applications/video/mirakurun/update.nix b/nixpkgs/pkgs/applications/video/mirakurun/update.nix new file mode 100644 index 000000000000..ccea2279783b --- /dev/null +++ b/nixpkgs/pkgs/applications/video/mirakurun/update.nix @@ -0,0 +1,55 @@ +{ pname +, version +, homepage +, lib +, common-updater-scripts +, genericUpdater +, writers +, jq +, yarn +, yarn2nix +}: + +let + updater = genericUpdater { + inherit pname version; + attrPath = lib.toLower pname; + + # exclude prerelease versions + versionLister = writers.writeBash "list-mirakurun-versions" '' + ${common-updater-scripts}/bin/list-git-tags ${homepage} \ + | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' + ''; + }; + updateScript = builtins.elemAt updater 0; + updateArgs = map (lib.escapeShellArg) (builtins.tail updater); +in writers.writeBash "update-mirakurun" '' + set -euxo pipefail + + WORKDIR="$(mktemp -d)" + cleanup() { + rm -rf "$WORKDIR" + } + trap cleanup EXIT + + # bump the version + ${updateScript} ${lib.concatStringsSep " " updateArgs} + + # Get the path to the latest source. Note that we can't just pass the value + # of mirakurun.src directly because it'd be evaluated before we can run + # updateScript. + SRC="$(nix-build "${toString ../../../..}" --no-out-link -A mirakurun.src)" + if [[ "${version}" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then + echo "[INFO] Already using the latest version of ${pname}" >&2 + exit + fi + + cd "$WORKDIR" + + cp "$SRC/package.json" package.json + "${yarn}/bin/yarn" install --ignore-scripts + + "${yarn2nix}/bin/yarn2nix" > "${toString ./.}/yarn.nix" + cp yarn.lock "${toString ./.}/yarn.lock" + cp package.json "${toString ./.}/package.json" +'' diff --git a/nixpkgs/pkgs/applications/video/mirakurun/yarn.lock b/nixpkgs/pkgs/applications/video/mirakurun/yarn.lock new file mode 100644 index 000000000000..1ec1c4184451 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/mirakurun/yarn.lock @@ -0,0 +1,3232 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== + dependencies: + "@babel/highlight" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== + +"@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" + integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== + +"@fluentui/date-time-utilities@^8.2.2": + version "8.2.2" + resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz#535d5bb6ee7ccfa8cc774c790e31d3d5d4edbad6" + integrity sha512-djHrX/38ty+F93qLQjzmRzPzK598CW9g/RPhQH6GyrFBLPSWM1swYKB5TP6E7FrIf+fT4pVqrNUSYZhgi2rrOQ== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/dom-utilities@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz#a8eeaf906cc19f547ae40c662d2776cb2540ea11" + integrity sha512-+gsAnEjgoKB37o+tsMdSLtgqZ9z2PzpvnHx/2IqhRWjQQd7Xc7MbQsbZaQ5qfkioFHLnWGc/+WORpqKPy/sWrg== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/font-icons-mdl2@^8.1.8": + version "8.1.11" + resolved "https://registry.yarnpkg.com/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.11.tgz#ba974aa5e1fd219a96f3b664d3b9a18956d39bab" + integrity sha512-R9ZBsoacKe91VcB+5D3u+AG9Au1snJ9jUItbWjTVJ+fIYXSZ01XB4Rmj/P0H+giUwFxYVpjOy0ybF2JLA6MddA== + dependencies: + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/foundation-legacy@^8.1.8": + version "8.1.11" + resolved "https://registry.yarnpkg.com/@fluentui/foundation-legacy/-/foundation-legacy-8.1.11.tgz#a7c51037af8bb58894bc769db16663b991084f8b" + integrity sha512-1Yyvk9gk4SoVuhmYi4tjRnEK6edz6juNw1mVi9mTacPB460KrtCbRswcE+IhVQJZCYAljlv4GQcob7J3CwCoyA== + dependencies: + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.3.2" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/keyboard-key@^0.3.4": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz#27c95ea9d43d91cc9c64c318feb10986250584cd" + integrity sha512-pVY2m3IC5+LLmMzsaPApX9eKTzpOzdgQwrR3FNTE6mGx3N/+QWYM7fdF+T1ldZQt87dCRSeQnmAo5kqjtxeA/w== + dependencies: + tslib "^2.1.0" + +"@fluentui/merge-styles@^8.1.4", "@fluentui/merge-styles@^8.1.5": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@fluentui/merge-styles/-/merge-styles-8.1.5.tgz#f5d5c4bd547aa41311f970e652a512a1c5a5bfb3" + integrity sha512-hmEb5LnOxCTpM/6oJQJI0w5AlYzwrceozPgsMdOF5BuT5MkXPlXLK3L2auzXGNYHkoGiouH61ImsS/TSM0mV/g== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/react-focus@^8.1.10": + version "8.2.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-8.2.2.tgz#74231170eeb02ce1798ed8ceb72a0fcdcf89a337" + integrity sha512-cmWPphKuFFPqvxyjmhH4r1v5lw8D3HytSgn/LaMQEHhT6RGuLLnx17QDZBUYCrZ0vyBf3nGnO1lsw+EGGsc1SQ== + dependencies: + "@fluentui/keyboard-key" "^0.3.4" + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.3.2" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/react-hooks@^8.2.6": + version "8.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-hooks/-/react-hooks-8.3.2.tgz#fb6e900a0ecbada116f52cc2df8628e7c54a9fa9" + integrity sha512-mGmDCaUjavYj4Bv/IPoNix4HMXX2ZPnPMfyH5X0QjiFEeSuOFlIM6By0sV6Vf30dsjoHNdUUsU461axtFTRVsg== + dependencies: + "@fluentui/react-window-provider" "^2.1.4" + "@fluentui/set-version" "^8.1.4" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/react-window-provider@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz#2e8368fd85f9e10062c726b060b146ffc1f916b3" + integrity sha512-RztmJ7ol2eMDr3NCs2OcAA1cQjZdPPUEa4aurgh4Aq+JM/BiY0aK6S4SeFtVD7F8Q7PBOz/xwOG4HlnSMQtlsg== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/react@8.27.0": + version "8.27.0" + resolved "https://registry.yarnpkg.com/@fluentui/react/-/react-8.27.0.tgz#dc41d11eed9b217ff0d3ad5ace85e92281f855e3" + integrity sha512-5LSh5XVU3qy6nY949jxS3BwF7UZA6jGjcH9JOTosgtxuHZUIXkzfZlT7fyt5xp+27B1B5ro9K9u2pDjItDHVHg== + dependencies: + "@fluentui/date-time-utilities" "^8.2.2" + "@fluentui/font-icons-mdl2" "^8.1.8" + "@fluentui/foundation-legacy" "^8.1.8" + "@fluentui/merge-styles" "^8.1.4" + "@fluentui/react-focus" "^8.1.10" + "@fluentui/react-hooks" "^8.2.6" + "@fluentui/react-window-provider" "^2.1.4" + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.2.2" + "@fluentui/theme" "^2.2.1" + "@fluentui/utilities" "^8.2.2" + "@microsoft/load-themed-styles" "^1.10.26" + tslib "^2.1.0" + +"@fluentui/set-version@^8.1.4": + version "8.1.4" + resolved "https://registry.yarnpkg.com/@fluentui/set-version/-/set-version-8.1.4.tgz#89fa88223f421981427dfd5372d46210045354e8" + integrity sha512-2otMyJ+s+W+hjBD4BKjwYKKinJUDeIKYKz93qKrrJS0i3fKfftNroy9dHFlIblZ7n747L334plLi3bzQO1bnvA== + dependencies: + tslib "^2.1.0" + +"@fluentui/style-utilities@^8.2.2", "@fluentui/style-utilities@^8.3.2": + version "8.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/style-utilities/-/style-utilities-8.3.2.tgz#721a975e41996db24256064b02def921e201e323" + integrity sha512-AuP3IlnANCDfECAkcpP3bQaTaG8ZsS7yphPmA2zpLEyHHDS2QS1OWDyh2WvajwGkvjOCdWjo+eLEq6rE29JY6g== + dependencies: + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/theme" "^2.3.2" + "@fluentui/utilities" "^8.3.2" + "@microsoft/load-themed-styles" "^1.10.26" + tslib "^2.1.0" + +"@fluentui/theme@^2.2.1", "@fluentui/theme@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/theme/-/theme-2.3.2.tgz#9094fc8e52758c34a5f396be91a0219bb85111a7" + integrity sha512-ND6hOONR4wYNccdnvXre8i9cvd9ZZkfihIAGd7X+3+TobN6pMroFDfhygoU/ShaeX2Uy1BrKIpWHnIiokzuCBw== + dependencies: + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/utilities@^8.2.2", "@fluentui/utilities@^8.3.2": + version "8.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/utilities/-/utilities-8.3.2.tgz#3378c17523d1833d6ba829bcd5d091aab03f59e5" + integrity sha512-XP/NG3jg8LqLzU139SuNzO01nu7IAizlnC9KWNkYxrV5Hc9pGrW/seKloc7F7RVK36Vr5l4gl3DXX9lhUZUP/Q== + dependencies: + "@fluentui/dom-utilities" "^2.1.4" + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@microsoft/load-themed-styles@^1.10.26": + version "1.10.206" + resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.206.tgz#9b18bb4cb5bcfd92e07d4323889731574ba6eb06" + integrity sha512-Q+oO5n0bZqrfC4SFD3b4oAE9RIC9QEncBmLTbFB0saen3xfvMpCKfcPwcGYGh3/hT6035Nmryur7ONthqh83ag== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + +"@types/body-parser@*": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" + integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + dependencies: + "@types/node" "*" + +"@types/cors@^2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== + +"@types/eslint-scope@^3.7.0": + version "3.7.1" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" + integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "7.28.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" + integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.50": + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== + +"@types/express-serve-static-core@^4.17.18": + version "4.17.24" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" + integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@^4.17.13": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/ip@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@types/ip/-/ip-1.1.0.tgz#aec4f5bfd49e4a4c53b590d88c36eb078827a7c0" + integrity sha512-dwNe8gOoF70VdL6WJBwVHtQmAX4RMd62M+mAB9HQFjG1/qiCLM/meRy95Pd14FYBbEDwCq7jgJs89cHpLBu4HQ== + dependencies: + "@types/node" "*" + +"@types/js-yaml@^4.0.2": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz#9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200" + integrity sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg== + +"@types/json-schema@*", "@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + +"@types/morgan@^1.9.3": + version "1.9.3" + resolved "https://registry.yarnpkg.com/@types/morgan/-/morgan-1.9.3.tgz#ae04180dff02c437312bc0cfb1e2960086b2f540" + integrity sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q== + dependencies: + "@types/node" "*" + +"@types/node@*": + version "16.7.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc" + integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA== + +"@types/node@^12.20.17": + version "12.20.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.23.tgz#d0d5885bb885ee9b1ed114a04ea586540a1b2e2a" + integrity sha512-FW0q7NI8UnjbKrJK8NGr6QXY69ATw9IFe6ItIo5yozPwA9DU/xkhiPddctUVyrmFXvyFYerYgQak/qu200UBDw== + +"@types/promise-queue@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@types/promise-queue/-/promise-queue-2.2.0.tgz#cdba35f1b2c0bd8aa2bf925c2b1ed02958067a0a" + integrity sha512-9QLtid6GxEWqpF+QImxBRG6bSVOHtpAm2kXuIyEvZBbSOupLvqhhJv8uaHbS8kUL8FDjzH3RWcSyC/52WOVtGw== + +"@types/prop-types@*": + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + +"@types/qs@*": + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + +"@types/range-parser@*": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + +"@types/react-dom@^17.0.9": + version "17.0.9" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add" + integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg== + dependencies: + "@types/react" "*" + +"@types/react@*", "@types/react@^17.0.14": + version "17.0.20" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz#a4284b184d47975c71658cd69e759b6bd37c3b8c" + integrity sha512-wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + +"@types/serve-static@*": + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@ungap/promise-all-settled@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" + integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== + +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + +"@webassemblyjs/helper-buffer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + +"@webassemblyjs/helper-wasm-section@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + +"@webassemblyjs/wasm-edit@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-wasm-section" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-opt" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/wast-printer" "1.11.1" + +"@webassemblyjs/wasm-gen@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wasm-opt@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + +"@webassemblyjs/wasm-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wast-printer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa" + integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ== + +"@webpack-cli/info@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b" + integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w== + dependencies: + envinfo "^7.7.3" + +"@webpack-cli/serve@^1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" + integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn-import-assertions@^1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" + integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== + +acorn@^8.4.1: + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== + +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.12.5, ajv@^6.5.2, ajv@^6.5.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-escapes@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" + integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +aribts@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/aribts/-/aribts-1.3.5.tgz#f986ba5afb1a8ff202435101544299fc9397baf5" + integrity sha512-fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ== + dependencies: + crc "^3.4.0" + iconv-lite "^0.4.13" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +babel-polyfill@6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d" + integrity sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0= + dependencies: + babel-runtime "^6.22.0" + core-js "^2.4.0" + regenerator-runtime "^0.10.0" + +babel-runtime@^6.22.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +basic-auth@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.1, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== + +browserslist@^4.14.5: + version "4.17.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c" + integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g== + dependencies: + caniuse-lite "^1.0.30001254" + colorette "^1.3.0" + electron-to-chromium "^1.3.830" + escalade "^3.1.1" + node-releases "^1.1.75" + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + +builtin-modules@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +camelcase@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + +caniuse-lite@^1.0.30001254: + version "1.0.30001254" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001254.tgz#974d45e8b7f6e3b63d4b1435e97752717612d4b9" + integrity sha512-GxeHOvR0LFMYPmFGA+NiTOt9uwYDxB3h154tW2yBYwfz2EMX3i1IBgr6gmJGfU0K8KQsqPa5XqLD8zVdP5lUzA== + +chalk@1.1.3, chalk@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.3.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= + +chokidar@3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + dependencies: + restore-cursor "^2.0.0" + +cli-width@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== + +colors@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +commander@^2.12.1, commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@^1.0.4, content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +copy-webpack-plugin@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59" + integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw== + dependencies: + fast-glob "^3.2.5" + glob-parent "^6.0.0" + globby "^11.0.3" + normalize-path "^3.0.0" + p-limit "^3.1.0" + schema-utils "^3.0.0" + serialize-javascript "^6.0.0" + +core-js@^2.4.0: + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== + +cors@^2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + +crc@^3.4.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + +cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +css-loader@5.2.7: + version "5.2.7" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== + dependencies: + icss-utils "^5.1.0" + loader-utils "^2.0.0" + postcss "^8.2.15" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.0" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.1.0" + schema-utils "^3.0.0" + semver "^7.3.5" + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +csstype@^3.0.2: + version "3.0.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" + integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +decamelize@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" + integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +diff@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +difunc@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/difunc/-/difunc-0.0.4.tgz#09322073e67f82effd2f22881985e7d3e441b3ac" + integrity sha512-zBiL4ALDmviHdoLC0g0G6wVme5bwAow9WfhcZLLopXCAWgg3AEf7RYTs2xugszIGulRHzEVDF/SHl9oyQU07Pw== + dependencies: + esprima "^4.0.0" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dotenv@^8.6.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +electron-to-chromium@^1.3.830: + version "1.3.830" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz#40e3144204f8ca11b2cebec83cf14c20d3499236" + integrity sha512-gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +encoding@^0.1.11: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.0: + version "5.8.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" + integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +envinfo@^7.7.3: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + +es-module-lexer@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" + integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +eventemitter3@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +express-normalize-query-params-middleware@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/express-normalize-query-params-middleware/-/express-normalize-query-params-middleware-0.5.1.tgz#dbe1e8139aecb234fb6adb5c0059c75db9733d2a" + integrity sha1-2+HoE5rssjT7attcAFnHXblzPSo= + +express-openapi@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/express-openapi/-/express-openapi-8.0.0.tgz#ea35ca9afd3619d423f2336d4df2bdf70abb1d46" + integrity sha512-MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg== + dependencies: + express-normalize-query-params-middleware "^0.5.0" + openapi-framework "^8.0.0" + openapi-types "^8.0.0" + +express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +external-editor@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" + integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A== + dependencies: + chardet "^0.4.0" + iconv-lite "^0.4.17" + tmp "^0.0.33" + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.1.1, fast-glob@^3.2.5: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + +fastq@^1.6.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794" + integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg== + dependencies: + reusify "^1.0.4" + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +fs-routes@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/fs-routes/-/fs-routes-8.0.0.tgz#98100abe1810aa0374ca7c9f439b4c1dec8232e7" + integrity sha512-EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +glob-parent@^5.1.2, glob-parent@~5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-parent@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz#42054f685eb6a44e7a7d189a96efa40a54971aa7" + integrity sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog== + dependencies: + is-glob "^4.0.1" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@*, glob@^7.1.1, glob@^7.1.3, glob@^7.1.7: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globby@^11.0.3: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.2.4: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + +growl@1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.17: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== + +ieee754@^1.1.13, ieee754@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^5.1.4: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +inquirer@3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347" + integrity sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c= + dependencies: + ansi-escapes "^1.1.0" + chalk "^1.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^2.0.1" + figures "^2.0.0" + lodash "^4.3.0" + mute-stream "0.0.7" + run-async "^2.2.0" + rx "^4.1.0" + string-width "^2.0.0" + strip-ansi "^3.0.0" + through "^2.3.6" + +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== + +ip@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-core-module@^2.2.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" + integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== + dependencies: + has "^1.0.3" + +is-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-dir/-/is-dir-1.0.0.tgz#41d37f495fccacc05a4778d66e83024c292ba3ff" + integrity sha1-QdN/SV/MrMBaR3jWboMCTCkro/8= + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-obj@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-stream@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +jest-worker@^27.0.6: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.1.0.tgz#65f4a88e37148ed984ba8ca8492d6b376938c0aa" + integrity sha512-mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + +js-yaml@^3.10.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json5@^2.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +latest-version@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +loader-runner@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash.merge@^4.6.1: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash@^4.3.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" + integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== + dependencies: + chalk "^4.0.0" + +loose-envify@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^4.0.0, micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +mime-db@1.49.0: + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== + +mime-types@^2.1.27, mime-types@~2.1.24: + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== + dependencies: + mime-db "1.49.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +minimatch@3.0.4, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.3: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mocha@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff" + integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ== + dependencies: + "@ungap/promise-all-settled" "1.1.2" + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.1" + debug "4.3.1" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.1.6" + growl "1.10.5" + he "1.2.0" + js-yaml "4.0.0" + log-symbols "4.0.0" + minimatch "3.0.4" + ms "2.1.3" + nanoid "3.1.20" + serialize-javascript "5.0.1" + strip-json-comments "3.1.1" + supports-color "8.1.1" + which "2.0.2" + wide-align "1.1.3" + workerpool "6.1.0" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +morgan@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== + dependencies: + basic-auth "~2.0.1" + debug "2.6.9" + depd "~2.0.0" + on-finished "~2.3.0" + on-headers "~1.0.2" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + +nanoid@3.1.20: + version "3.1.20" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" + integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== + +nanoid@^3.1.23: + version "3.1.25" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" + integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +node-fetch@1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" + integrity sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ= + dependencies: + encoding "^0.1.11" + is-stream "^1.0.1" + +node-releases@^1.1.75: + version "1.1.75" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" + integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +openapi-default-setter@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz#17caf5c58f2c8d11609d270847952a3fc295f95b" + integrity sha512-Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA== + dependencies: + openapi-types "^8.0.0" + +openapi-framework@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-framework/-/openapi-framework-8.0.0.tgz#5bdaaca75cd1344ff71f622948a0f89d55b6a716" + integrity sha512-T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ== + dependencies: + difunc "0.0.4" + fs-routes "^8.0.0" + glob "*" + is-dir "^1.0.0" + js-yaml "^3.10.0" + openapi-default-setter "^8.0.0" + openapi-request-coercer "^8.0.0" + openapi-request-validator "^8.0.0" + openapi-response-validator "^8.0.0" + openapi-schema-validator "^8.0.0" + openapi-security-handler "^8.0.0" + openapi-types "^8.0.0" + ts-log "^2.1.4" + +openapi-jsonschema-parameters@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz#1aae51fe0c8312672ef3e20ef97f4456b3f33e59" + integrity sha512-yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA== + dependencies: + openapi-types "^8.0.0" + +openapi-request-coercer@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz#5767c12da1a40f509fa55147210b09d66a854ee0" + integrity sha512-CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw== + dependencies: + openapi-types "^8.0.0" + ts-log "^2.1.4" + +openapi-request-validator@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz#b22acecc73952ccc132fd3710e79e319eb8f20cc" + integrity sha512-7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ== + dependencies: + ajv "^6.5.4" + content-type "^1.0.4" + openapi-jsonschema-parameters "^8.0.0" + openapi-types "^8.0.0" + ts-log "^2.1.4" + +openapi-response-validator@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz#ea4f3a43bcf9e151c1e90046f8a2d10c98607368" + integrity sha512-h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA== + dependencies: + ajv "^6.5.4" + openapi-types "^8.0.0" + +openapi-schema-validator@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz#6a0eb06bec103e057ea1f1051883bb8c465684a4" + integrity sha512-cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA== + dependencies: + ajv "^6.5.2" + lodash.merge "^4.6.1" + openapi-types "^8.0.0" + swagger-schema-official "2.0.0-bab6bed" + +openapi-security-handler@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz#0b4c1a589f61c4cee7bec0b945d6d3f494fdf023" + integrity sha512-XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw== + dependencies: + openapi-types "^8.0.0" + +openapi-types@^7.2.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-7.2.3.tgz#83829911a3410a022f0e0cf2b0b2e67232ccf96e" + integrity sha512-olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA== + +openapi-types@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-8.0.0.tgz#7e1979538798d31a3c3bfed667e5e9295402f9bc" + integrity sha512-dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g== + +opencollective-postinstall@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== + +opencollective@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1" + integrity sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE= + dependencies: + babel-polyfill "6.23.0" + chalk "1.1.3" + inquirer "3.0.6" + minimist "1.2.0" + node-fetch "1.6.3" + opn "4.0.2" + +opn@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" + integrity sha1-erwi5kTf9jsKltWrfyeQwPAavJU= + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2, p-limit@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +postcss-modules-extract-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== + +postcss-modules-local-by-default@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== + dependencies: + icss-utils "^5.0.0" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== + dependencies: + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" + +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + +postcss@^8.2.15: + version "8.3.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" + integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.23" + source-map-js "^0.6.2" + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + +promise-queue@^2.2.3: + version "2.2.5" + resolved "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz#2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4" + integrity sha1-L29ffA9tCBCelnZZx5uIqe1ek7Q= + +proxy-addr@~2.0.5: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.2" + +react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + +rechoir@^0.7.0: + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== + dependencies: + resolve "^1.9.0" + +regenerator-runtime@^0.10.0: + version "0.10.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" + integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + +registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve@^1.3.2, resolve@^1.9.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-async@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +rx@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" + integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= + +safe-buffer@5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +semver@^5.3.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.3.4, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serialize-javascript@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" + integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== + dependencies: + randombytes "^2.1.0" + +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +sift@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz#47d62c50b159d316f1372f8b53f9c10cd21a4b08" + integrity sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g== + +signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== + +source-map-support@^0.5.19, source-map-support@~0.5.19: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0, source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@~0.7.2: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-http@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" + integrity sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A== + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.4" + readable-stream "^3.6.0" + xtend "^4.0.2" + +"string-width@^1.0.2 || 2", string-width@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +style-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c" + integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + +supports-color@8.1.1, supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +swagger-schema-official@2.0.0-bab6bed: + version "2.0.0-bab6bed" + resolved "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz#70070468d6d2977ca5237b2e519ca7d06a2ea3fd" + integrity sha1-cAcEaNbSl3ylI3suUZyn0Gouo/0= + +swagger-ui-dist@3.51.2: + version "3.51.2" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.51.2.tgz#b0f377edf91a7fd1f4026f4ccc75c072ea610b7b" + integrity sha512-7aDfpvGrya61WQN4Eb6x5TELvYb5+7SRJQNYySkKUDGiRIwj1A8B2PNsXs4xMD0/5t8uNi4zW58KSofutcBdhw== + +tail@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.3.tgz#3e6bf65963bb868913e4e3b770cc1584c9d8091c" + integrity sha512-XbBmVsJZ636kncPew2Y+pOxOsb9GsNFZ1bcAGCDn23ME/JPJ+TImZYjnqBnMLdw+K11Hql5ZgiUQmRvDHaFc6w== + +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" + integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== + +terser-webpack-plugin@^5.1.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.3.tgz#4852c91f709a4ea2bcf324cf48e7e88124cda0cc" + integrity sha512-eDbuaDlXhVaaoKuLD3DTNTozKqln6xOG6Us0SzlKG5tNlazG+/cdl8pm9qiF1Di89iWScTI0HcO+CDcf2dkXiw== + dependencies: + jest-worker "^27.0.6" + p-limit "^3.1.0" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" + source-map "^0.6.1" + terser "^5.7.2" + +terser@^5.7.2: + version "5.7.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.2.tgz#d4d95ed4f8bf735cb933e802f2a1829abf545e3f" + integrity sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.19" + +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +ts-loader@^9.2.3: + version "9.2.5" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.5.tgz#127733a5e9243bf6dafcb8aa3b8a266d8041dca9" + integrity sha512-al/ATFEffybdRMUIr5zMEWQdVnCGMUA9d3fXJ8dBVvBlzytPvIszoG9kZoR+94k6/i293RnVOXwMaWbXhNy9pQ== + dependencies: + chalk "^4.1.0" + enhanced-resolve "^5.0.0" + micromatch "^4.0.0" + semver "^7.3.4" + +ts-log@^2.1.4: + version "2.2.3" + resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz#4da5640fe25a9fb52642cd32391c886721318efb" + integrity sha512-XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w== + +tslib@^1.13.0, tslib@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + +tslint-config-prettier@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" + integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg== + +tslint@^6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" + integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== + dependencies: + "@babel/code-frame" "^7.0.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^4.0.1" + glob "^7.1.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + mkdirp "^0.5.3" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.13.0" + tsutils "^2.29.0" + +tsutils@^2.29.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" + integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== + dependencies: + tslib "^1.8.1" + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typescript@^4.3.5: + version "4.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86" + integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + +url@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +util-deprecate@^1.0.1, util-deprecate@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +v8-compile-cache@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +vary@^1, vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +watchpack@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" + integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +webpack-cli@^4.7.2: + version "4.8.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz#5fc3c8b9401d3c8a43e2afceacfa8261962338d1" + integrity sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.0.4" + "@webpack-cli/info" "^1.3.0" + "@webpack-cli/serve" "^1.5.2" + colorette "^1.2.1" + commander "^7.0.0" + execa "^5.0.0" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^2.2.0" + rechoir "^0.7.0" + v8-compile-cache "^2.2.0" + webpack-merge "^5.7.3" + +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + +webpack-sources@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" + integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== + +webpack@5.48.0: + version "5.48.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.48.0.tgz#06180fef9767a6fd066889559a4c4d49bee19b83" + integrity sha512-CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A== + dependencies: + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.50" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/wasm-edit" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + acorn "^8.4.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.8.0" + es-module-lexer "^0.7.1" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.1.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.3" + watchpack "^2.2.0" + webpack-sources "^3.2.0" + +which@2.0.2, which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + +workerpool@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" + integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +xtend@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs-unparser@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" + integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== + dependencies: + camelcase "^6.0.0" + decamelize "^4.0.0" + flat "^5.0.2" + is-plain-obj "^2.1.0" + +yargs@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/nixpkgs/pkgs/applications/video/mirakurun/yarn.nix b/nixpkgs/pkgs/applications/video/mirakurun/yarn.nix new file mode 100644 index 000000000000..5fcafbe637a5 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/mirakurun/yarn.nix @@ -0,0 +1,3765 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha1 = "6654d171b2024f6d8ee151bf2509699919131d48"; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + path = fetchurl { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; + sha1 = "90420f9f9c6d3987f176a19a7d8e764271a2f55d"; + }; + } + { + name = "_fluentui_date_time_utilities___date_time_utilities_8.2.2.tgz"; + path = fetchurl { + name = "_fluentui_date_time_utilities___date_time_utilities_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz"; + sha1 = "535d5bb6ee7ccfa8cc774c790e31d3d5d4edbad6"; + }; + } + { + name = "_fluentui_dom_utilities___dom_utilities_2.1.4.tgz"; + path = fetchurl { + name = "_fluentui_dom_utilities___dom_utilities_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz"; + sha1 = "a8eeaf906cc19f547ae40c662d2776cb2540ea11"; + }; + } + { + name = "_fluentui_font_icons_mdl2___font_icons_mdl2_8.1.11.tgz"; + path = fetchurl { + name = "_fluentui_font_icons_mdl2___font_icons_mdl2_8.1.11.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.11.tgz"; + sha1 = "ba974aa5e1fd219a96f3b664d3b9a18956d39bab"; + }; + } + { + name = "_fluentui_foundation_legacy___foundation_legacy_8.1.11.tgz"; + path = fetchurl { + name = "_fluentui_foundation_legacy___foundation_legacy_8.1.11.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/foundation-legacy/-/foundation-legacy-8.1.11.tgz"; + sha1 = "a7c51037af8bb58894bc769db16663b991084f8b"; + }; + } + { + name = "_fluentui_keyboard_key___keyboard_key_0.3.4.tgz"; + path = fetchurl { + name = "_fluentui_keyboard_key___keyboard_key_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz"; + sha1 = "27c95ea9d43d91cc9c64c318feb10986250584cd"; + }; + } + { + name = "_fluentui_merge_styles___merge_styles_8.1.5.tgz"; + path = fetchurl { + name = "_fluentui_merge_styles___merge_styles_8.1.5.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/merge-styles/-/merge-styles-8.1.5.tgz"; + sha1 = "f5d5c4bd547aa41311f970e652a512a1c5a5bfb3"; + }; + } + { + name = "_fluentui_react_focus___react_focus_8.2.2.tgz"; + path = fetchurl { + name = "_fluentui_react_focus___react_focus_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-8.2.2.tgz"; + sha1 = "74231170eeb02ce1798ed8ceb72a0fcdcf89a337"; + }; + } + { + name = "_fluentui_react_hooks___react_hooks_8.3.2.tgz"; + path = fetchurl { + name = "_fluentui_react_hooks___react_hooks_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react-hooks/-/react-hooks-8.3.2.tgz"; + sha1 = "fb6e900a0ecbada116f52cc2df8628e7c54a9fa9"; + }; + } + { + name = "_fluentui_react_window_provider___react_window_provider_2.1.4.tgz"; + path = fetchurl { + name = "_fluentui_react_window_provider___react_window_provider_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz"; + sha1 = "2e8368fd85f9e10062c726b060b146ffc1f916b3"; + }; + } + { + name = "_fluentui_react___react_8.27.0.tgz"; + path = fetchurl { + name = "_fluentui_react___react_8.27.0.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react/-/react-8.27.0.tgz"; + sha1 = "dc41d11eed9b217ff0d3ad5ace85e92281f855e3"; + }; + } + { + name = "_fluentui_set_version___set_version_8.1.4.tgz"; + path = fetchurl { + name = "_fluentui_set_version___set_version_8.1.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/set-version/-/set-version-8.1.4.tgz"; + sha1 = "89fa88223f421981427dfd5372d46210045354e8"; + }; + } + { + name = "_fluentui_style_utilities___style_utilities_8.3.2.tgz"; + path = fetchurl { + name = "_fluentui_style_utilities___style_utilities_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/style-utilities/-/style-utilities-8.3.2.tgz"; + sha1 = "721a975e41996db24256064b02def921e201e323"; + }; + } + { + name = "_fluentui_theme___theme_2.3.2.tgz"; + path = fetchurl { + name = "_fluentui_theme___theme_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/theme/-/theme-2.3.2.tgz"; + sha1 = "9094fc8e52758c34a5f396be91a0219bb85111a7"; + }; + } + { + name = "_fluentui_utilities___utilities_8.3.2.tgz"; + path = fetchurl { + name = "_fluentui_utilities___utilities_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/utilities/-/utilities-8.3.2.tgz"; + sha1 = "3378c17523d1833d6ba829bcd5d091aab03f59e5"; + }; + } + { + name = "_microsoft_load_themed_styles___load_themed_styles_1.10.206.tgz"; + path = fetchurl { + name = "_microsoft_load_themed_styles___load_themed_styles_1.10.206.tgz"; + url = "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.206.tgz"; + sha1 = "9b18bb4cb5bcfd92e07d4323889731574ba6eb06"; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; + }; + } + { + 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_body_parser___body_parser_1.19.1.tgz"; + path = fetchurl { + name = "_types_body_parser___body_parser_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha1 = "0c0174c42a7d017b818303d4b5d969cb0b75929c"; + }; + } + { + name = "_types_connect___connect_3.4.35.tgz"; + path = fetchurl { + name = "_types_connect___connect_3.4.35.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; + sha1 = "5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"; + }; + } + { + name = "_types_cors___cors_2.8.12.tgz"; + path = fetchurl { + name = "_types_cors___cors_2.8.12.tgz"; + url = "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz"; + sha1 = "6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"; + }; + } + { + name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + path = fetchurl { + name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "8dc390a7b4f9dd9f1284629efce982e41612116e"; + }; + } + { + name = "_types_eslint___eslint_7.28.0.tgz"; + path = fetchurl { + name = "_types_eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz"; + sha1 = "7e41f2481d301c68e14f483fe10b017753ce8d5a"; + }; + } + { + name = "_types_estree___estree_0.0.50.tgz"; + path = fetchurl { + name = "_types_estree___estree_0.0.50.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz"; + sha1 = "1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"; + }; + } + { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + path = fetchurl { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha1 = "ea41f93bf7e0d59cd5a76665068ed6aab6815c07"; + }; + } + { + name = "_types_express___express_4.17.13.tgz"; + path = fetchurl { + name = "_types_express___express_4.17.13.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; + sha1 = "a76e2995728999bab51a33fabce1d705a3709034"; + }; + } + { + name = "_types_ip___ip_1.1.0.tgz"; + path = fetchurl { + name = "_types_ip___ip_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/ip/-/ip-1.1.0.tgz"; + sha1 = "aec4f5bfd49e4a4c53b590d88c36eb078827a7c0"; + }; + } + { + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; + path = fetchurl { + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz"; + sha1 = "9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200"; + }; + } + { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; + }; + } + { + name = "_types_mime___mime_1.3.2.tgz"; + path = fetchurl { + name = "_types_mime___mime_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; + sha1 = "93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"; + }; + } + { + name = "_types_morgan___morgan_1.9.3.tgz"; + path = fetchurl { + name = "_types_morgan___morgan_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/@types/morgan/-/morgan-1.9.3.tgz"; + sha1 = "ae04180dff02c437312bc0cfb1e2960086b2f540"; + }; + } + { + name = "_types_node___node_16.7.10.tgz"; + path = fetchurl { + name = "_types_node___node_16.7.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz"; + sha1 = "7aa732cc47341c12a16b7d562f519c2383b6d4fc"; + }; + } + { + name = "_types_node___node_12.20.23.tgz"; + path = fetchurl { + name = "_types_node___node_12.20.23.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.23.tgz"; + sha1 = "d0d5885bb885ee9b1ed114a04ea586540a1b2e2a"; + }; + } + { + name = "_types_promise_queue___promise_queue_2.2.0.tgz"; + path = fetchurl { + name = "_types_promise_queue___promise_queue_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/promise-queue/-/promise-queue-2.2.0.tgz"; + sha1 = "cdba35f1b2c0bd8aa2bf925c2b1ed02958067a0a"; + }; + } + { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha1 = "fcf7205c25dff795ee79af1e30da2c9790808f11"; + }; + } + { + name = "_types_qs___qs_6.9.7.tgz"; + path = fetchurl { + name = "_types_qs___qs_6.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; + sha1 = "63bb7d067db107cc1e457c303bc25d511febf6cb"; + }; + } + { + name = "_types_range_parser___range_parser_1.2.4.tgz"; + path = fetchurl { + name = "_types_range_parser___range_parser_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha1 = "cd667bcfdd025213aafb7ca5915a932590acdcdc"; + }; + } + { + name = "_types_react_dom___react_dom_17.0.9.tgz"; + path = fetchurl { + name = "_types_react_dom___react_dom_17.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz"; + sha1 = "441a981da9d7be117042e1a6fd3dac4b30f55add"; + }; + } + { + name = "_types_react___react_17.0.20.tgz"; + path = fetchurl { + name = "_types_react___react_17.0.20.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz"; + sha1 = "a4284b184d47975c71658cd69e759b6bd37c3b8c"; + }; + } + { + name = "_types_scheduler___scheduler_0.16.2.tgz"; + path = fetchurl { + name = "_types_scheduler___scheduler_0.16.2.tgz"; + url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz"; + sha1 = "1a62f89525723dde24ba1b01b092bf5df8ad4d39"; + }; + } + { + name = "_types_serve_static___serve_static_1.13.10.tgz"; + path = fetchurl { + name = "_types_serve_static___serve_static_1.13.10.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha1 = "f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"; + }; + } + { + name = "_ungap_promise_all_settled___promise_all_settled_1.1.2.tgz"; + path = fetchurl { + name = "_ungap_promise_all_settled___promise_all_settled_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha1 = "aa58042711d6e3275dd37dc597e5d31e8c290a44"; + }; + } + { + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz"; + sha1 = "2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; + sha1 = "f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; + sha1 = "1a63192d8788e5c012800ba6a7a46c705288fd16"; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; + sha1 = "832a900eb444884cde9a7cad467f81500f5e5ab5"; + }; + } + { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; + sha1 = "64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; + sha1 = "f328241e41e7b199d0b20c18e88429c4433295e1"; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; + sha1 = "21ee065a7b635f319e738f0dd73bfbda281c097a"; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; + sha1 = "963929e9bbd05709e7e12243a099180812992614"; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; + sha1 = "ce814b45574e93d76bae1fb2644ab9cdd9527aa5"; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; + sha1 = "d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; + sha1 = "ad206ebf4bf95a058ce9880a8c092c5dec8193d6"; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; + sha1 = "86c5ea304849759b7d88c47a32f4f039ae3c8f76"; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; + sha1 = "657b4c2202f4cf3b345f8a4c6461c8c2418985f2"; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; + sha1 = "86ca734534f417e9bd3c67c7a1c75d8be41fb199"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; + sha1 = "d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"; + }; + } + { + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; + sha1 = "f03ce6311c0883a83d04569e2c03c6238316d2aa"; + }; + } + { + name = "_webpack_cli_info___info_1.3.0.tgz"; + path = fetchurl { + name = "_webpack_cli_info___info_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz"; + sha1 = "9d78a31101a960997a4acd41ffd9b9300627fe2b"; + }; + } + { + name = "_webpack_cli_serve___serve_1.5.2.tgz"; + path = fetchurl { + name = "_webpack_cli_serve___serve_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz"; + sha1 = "ea584b637ff63c5a477f6f21604b5a205b72c9ec"; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acorn_import_assertions___acorn_import_assertions_1.7.6.tgz"; + path = fetchurl { + name = "acorn_import_assertions___acorn_import_assertions_1.7.6.tgz"; + url = "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz"; + sha1 = "580e3ffcae6770eebeec76c3b9723201e9d01f78"; + }; + } + { + name = "acorn___acorn_8.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + } + { + 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_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_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + 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.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + }; + } + { + 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 = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + }; + } + { + name = "aribts___aribts_1.3.5.tgz"; + path = fetchurl { + name = "aribts___aribts_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/aribts/-/aribts-1.3.5.tgz"; + sha1 = "f986ba5afb1a8ff202435101544299fc9397baf5"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } + { + name = "babel_polyfill___babel_polyfill_6.23.0.tgz"; + path = fetchurl { + name = "babel_polyfill___babel_polyfill_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz"; + sha1 = "8364ca62df8eafb830499f699177466c3b03499d"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + }; + } + { + name = "basic_auth___basic_auth_2.0.1.tgz"; + path = fetchurl { + name = "basic_auth___basic_auth_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz"; + sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a"; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + }; + } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + 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 = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "browser_stdout___browser_stdout_1.3.1.tgz"; + path = fetchurl { + name = "browser_stdout___browser_stdout_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha1 = "baa559ee14ced73452229bad7326467c61fabd60"; + }; + } + { + name = "browserslist___browserslist_4.17.0.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.17.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz"; + sha1 = "1fcd81ec75b41d6d4994fb0831b92ac18c01649c"; + }; + } + { + name = "buffer_from___buffer_from_1.1.2.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + }; + } + { + name = "buffer___buffer_6.0.3.tgz"; + path = fetchurl { + name = "buffer___buffer_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz"; + sha1 = "2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"; + }; + } + { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + path = fetchurl { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + 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 = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001254.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001254.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001254.tgz"; + sha1 = "974d45e8b7f6e3b63d4b1435e97752717612d4b9"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_4.1.2.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + }; + } + { + name = "chardet___chardet_0.4.2.tgz"; + path = fetchurl { + name = "chardet___chardet_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + }; + } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha1 = "1015eced4741e15d06664a957dbbf50d041e26ac"; + }; + } + { + 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_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; + }; + } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; + path = fetchurl { + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; + }; + } + { + 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 = "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 = "colorette___colorette_1.3.0.tgz"; + path = fetchurl { + name = "colorette___colorette_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz"; + sha1 = "ff45d2f0edb244069d3b772adeb04fed38d0a0af"; + }; + } + { + 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 = "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 = "commander___commander_7.2.0.tgz"; + path = fetchurl { + name = "commander___commander_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz"; + sha1 = "a36cb57d0b501ce108e4d20559a150a391d97ab7"; + }; + } + { + 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 = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + 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 = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + path = fetchurl { + name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz"; + sha1 = "b71d21991599f61a4ee00ba79087b8ba279bbb59"; + }; + } + { + name = "core_js___core_js_2.6.12.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; + }; + } + { + name = "cors___cors_2.8.5.tgz"; + path = fetchurl { + name = "cors___cors_2.8.5.tgz"; + url = "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz"; + sha1 = "eac11da51592dd86b9f06f6e7ac293b3df875d29"; + }; + } + { + 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 = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "css_loader___css_loader_5.2.7.tgz"; + path = fetchurl { + name = "css_loader___css_loader_5.2.7.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz"; + sha1 = "9b9f111edf6fb2be5dc62525644cbc9c232064ae"; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } + { + name = "csstype___csstype_3.0.8.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz"; + sha1 = "d2266a792729fb227cd216fb572f43728e1ad340"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "decamelize___decamelize_4.0.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz"; + sha1 = "aa472d7bf660eb15f3494efd531cab7f2a709837"; + }; + } + { + 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_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 = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "diff___diff_5.0.0.tgz"; + path = fetchurl { + name = "diff___diff_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz"; + sha1 = "7ed6ad76d859d030787ec35855f5b1daf31d852b"; + }; + } + { + name = "diff___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; + }; + } + { + name = "difunc___difunc_0.0.4.tgz"; + path = fetchurl { + name = "difunc___difunc_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/difunc/-/difunc-0.0.4.tgz"; + sha1 = "09322073e67f82effd2f22881985e7d3e441b3ac"; + }; + } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } + { + name = "dotenv___dotenv_8.6.0.tgz"; + path = fetchurl { + name = "dotenv___dotenv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz"; + sha1 = "061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"; + }; + } + { + 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 = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.830.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.830.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz"; + sha1 = "40e3144204f8ca11b2cebec83cf14c20d3499236"; + }; + } + { + 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 = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "encoding___encoding_0.1.13.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha1 = "56574afdd791f54a8e9b2785c0582a2d26210fa9"; + }; + } + { + 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 = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz"; + sha1 = "15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"; + }; + } + { + name = "envinfo___envinfo_7.8.1.tgz"; + path = fetchurl { + name = "envinfo___envinfo_7.8.1.tgz"; + url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; + sha1 = "06377e3e5f4d379fea7ac592d5ad8927e0c4d475"; + }; + } + { + name = "es_module_lexer___es_module_lexer_0.7.1.tgz"; + path = fetchurl { + name = "es_module_lexer___es_module_lexer_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz"; + sha1 = "c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + 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_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + 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 = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + 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 = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; + }; + } + { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; + }; + } + { + name = "execa___execa_5.1.1.tgz"; + path = fetchurl { + name = "execa___execa_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; + sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; + }; + } + { + name = "express_normalize_query_params_middleware___express_normalize_query_params_middleware_0.5.1.tgz"; + path = fetchurl { + name = "express_normalize_query_params_middleware___express_normalize_query_params_middleware_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/express-normalize-query-params-middleware/-/express-normalize-query-params-middleware-0.5.1.tgz"; + sha1 = "dbe1e8139aecb234fb6adb5c0059c75db9733d2a"; + }; + } + { + name = "express_openapi___express_openapi_8.0.0.tgz"; + path = fetchurl { + name = "express_openapi___express_openapi_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/express-openapi/-/express-openapi-8.0.0.tgz"; + sha1 = "ea35ca9afd3619d423f2336d4df2bdf70abb1d46"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "external_editor___external_editor_2.2.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz"; + sha1 = "045511cfd8d133f3846673d1047c154e214ad3d5"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_glob___fast_glob_3.2.7.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha1 = "9990f7d3a88cc5a9ffd1f1745745251700d497e2"; + }; + } + { + name = "fastq___fastq_1.12.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz"; + sha1 = "ed7b6ab5d62393fb2cc591c853652a5c318bf794"; + }; + } + { + 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 = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_up___find_up_5.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; + sha1 = "4c92819ecb7083561e4f4a240a86be5198f536fc"; + }; + } + { + 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___flat_5.0.2.tgz"; + path = fetchurl { + name = "flat___flat_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz"; + sha1 = "8ca6fe332069ffa9d324c327198c598259ceb241"; + }; + } + { + name = "forwarded___forwarded_0.2.0.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; + sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "fs_routes___fs_routes_8.0.0.tgz"; + path = fetchurl { + name = "fs_routes___fs_routes_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-routes/-/fs-routes-8.0.0.tgz"; + sha1 = "98100abe1810aa0374ca7c9f439b4c1dec8232e7"; + }; + } + { + 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 = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + 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_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.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + }; + } + { + name = "get_stream___get_stream_6.0.1.tgz"; + path = fetchurl { + name = "get_stream___get_stream_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; + sha1 = "a262d8eef67aced57c2852ad6167526a43cbf7b7"; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } + { + name = "glob_parent___glob_parent_6.0.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz"; + sha1 = "42054f685eb6a44e7a7d189a96efa40a54971aa7"; + }; + } + { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + path = fetchurl { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha1 = "c75297087c851b9a578bd217dd59a92f59fe546e"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + 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 = "globby___globby_11.0.4.tgz"; + path = fetchurl { + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + }; + } + { + 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.8.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + }; + } + { + name = "growl___growl_1.10.5.tgz"; + path = fetchurl { + name = "growl___growl_1.10.5.tgz"; + url = "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz"; + sha1 = "f2735dc2283674fa67478b10181059355c369e5e"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + 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___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "he___he_1.2.0.tgz"; + path = fetchurl { + name = "he___he_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; + sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "human_signals___human_signals_2.1.0.tgz"; + path = fetchurl { + name = "human_signals___human_signals_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; + sha1 = "dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"; + }; + } + { + 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.6.3.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + }; + } + { + name = "icss_utils___icss_utils_5.1.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; + sha1 = "c6be6858abd013d768e98366ae47e25d5887b1ae"; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + }; + } + { + name = "import_local___import_local_3.0.2.tgz"; + path = fetchurl { + name = "import_local___import_local_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; + sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + }; + } + { + 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 = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "inquirer___inquirer_3.0.6.tgz"; + path = fetchurl { + name = "inquirer___inquirer_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz"; + sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; + }; + } + { + name = "interpret___interpret_2.2.0.tgz"; + path = fetchurl { + name = "interpret___interpret_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz"; + sha1 = "1a78a0b5965c40a5416d007ad6f50ad27c417df9"; + }; + } + { + 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 = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + name = "is_core_module___is_core_module_2.6.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz"; + sha1 = "d7553b2526fe59b92ba3e40c8df757ec8a709e19"; + }; + } + { + name = "is_dir___is_dir_1.0.0.tgz"; + path = fetchurl { + name = "is_dir___is_dir_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-dir/-/is-dir-1.0.0.tgz"; + sha1 = "41d37f495fccacc05a4778d66e83024c292ba3ff"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + 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_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha1 = "45e42e37fccf1f40da8e5f76ee21515840c09287"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + 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_stream___is_stream_2.0.1.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; + }; + } + { + 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 = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "jest_worker___jest_worker_27.1.0.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_27.1.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.1.0.tgz"; + sha1 = "65f4a88e37148ed984ba8ca8492d6b376938c0aa"; + }; + } + { + 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_4.0.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; + sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "js_yaml___js_yaml_4.1.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; + sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + }; + } + { + 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 { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + }; + } + { + 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 = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + 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 = "loader_runner___loader_runner_4.2.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz"; + sha1 = "d7022380d66d14c5fb1d496b89864ebcfd478384"; + }; + } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } + { + 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 = "locate_path___locate_path_6.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; + sha1 = "55321eb309febbc59c4801d931a72452a681d286"; + }; + } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { + name = "log_symbols___log_symbols_4.0.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz"; + sha1 = "69b3cc46d20f448eccdb75ea1fa733d9e821c920"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + 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_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "merge2___merge2_1.4.1.tgz"; + path = fetchurl { + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + }; + } + { + name = "mime_db___mime_db_1.49.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; + sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; + }; + } + { + name = "mime_types___mime_types_2.1.32.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.32.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; + sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + 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 = "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_1.2.0.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mocha___mocha_8.4.0.tgz"; + path = fetchurl { + name = "mocha___mocha_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz"; + sha1 = "677be88bf15980a3cae03a73e10a0fc3997f0cff"; + }; + } + { + name = "morgan___morgan_1.10.0.tgz"; + path = fetchurl { + name = "morgan___morgan_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz"; + sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7"; + }; + } + { + 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.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + 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 = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + 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 = "nanoid___nanoid_3.1.20.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.20.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz"; + sha1 = "badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"; + }; + } + { + name = "nanoid___nanoid_3.1.25.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.25.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz"; + sha1 = "09ca32747c0e543f0e1814b7d3793477f9c8e152"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "node_fetch___node_fetch_1.6.3.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz"; + sha1 = "dc234edd6489982d58e8f0db4f695029abcd8c04"; + }; + } + { + name = "node_releases___node_releases_1.1.75.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.75.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz"; + sha1 = "6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"; + }; + } + { + 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.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; + sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + }; + } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + 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 = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.2.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + }; + } + { + 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 = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + }; + } + { + name = "openapi_default_setter___openapi_default_setter_8.0.0.tgz"; + path = fetchurl { + name = "openapi_default_setter___openapi_default_setter_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha1 = "17caf5c58f2c8d11609d270847952a3fc295f95b"; + }; + } + { + name = "openapi_framework___openapi_framework_8.0.0.tgz"; + path = fetchurl { + name = "openapi_framework___openapi_framework_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha1 = "5bdaaca75cd1344ff71f622948a0f89d55b6a716"; + }; + } + { + name = "openapi_jsonschema_parameters___openapi_jsonschema_parameters_8.0.0.tgz"; + path = fetchurl { + name = "openapi_jsonschema_parameters___openapi_jsonschema_parameters_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha1 = "1aae51fe0c8312672ef3e20ef97f4456b3f33e59"; + }; + } + { + name = "openapi_request_coercer___openapi_request_coercer_8.0.0.tgz"; + path = fetchurl { + name = "openapi_request_coercer___openapi_request_coercer_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha1 = "5767c12da1a40f509fa55147210b09d66a854ee0"; + }; + } + { + name = "openapi_request_validator___openapi_request_validator_8.0.0.tgz"; + path = fetchurl { + name = "openapi_request_validator___openapi_request_validator_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha1 = "b22acecc73952ccc132fd3710e79e319eb8f20cc"; + }; + } + { + name = "openapi_response_validator___openapi_response_validator_8.0.0.tgz"; + path = fetchurl { + name = "openapi_response_validator___openapi_response_validator_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha1 = "ea4f3a43bcf9e151c1e90046f8a2d10c98607368"; + }; + } + { + name = "openapi_schema_validator___openapi_schema_validator_8.0.0.tgz"; + path = fetchurl { + name = "openapi_schema_validator___openapi_schema_validator_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha1 = "6a0eb06bec103e057ea1f1051883bb8c465684a4"; + }; + } + { + name = "openapi_security_handler___openapi_security_handler_8.0.0.tgz"; + path = fetchurl { + name = "openapi_security_handler___openapi_security_handler_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha1 = "0b4c1a589f61c4cee7bec0b945d6d3f494fdf023"; + }; + } + { + name = "openapi_types___openapi_types_7.2.3.tgz"; + path = fetchurl { + name = "openapi_types___openapi_types_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/openapi-types/-/openapi-types-7.2.3.tgz"; + sha1 = "83829911a3410a022f0e0cf2b0b2e67232ccf96e"; + }; + } + { + name = "openapi_types___openapi_types_8.0.0.tgz"; + path = fetchurl { + name = "openapi_types___openapi_types_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-types/-/openapi-types-8.0.0.tgz"; + sha1 = "7e1979538798d31a3c3bfed667e5e9295402f9bc"; + }; + } + { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + path = fetchurl { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; + sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + }; + } + { + name = "opencollective___opencollective_1.0.3.tgz"; + path = fetchurl { + name = "opencollective___opencollective_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz"; + sha1 = "aee6372bc28144583690c3ca8daecfc120dd0ef1"; + }; + } + { + name = "opn___opn_4.0.2.tgz"; + path = fetchurl { + name = "opn___opn_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz"; + sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; + }; + } + { + 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 = "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_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; + }; + } + { + 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_locate___p_locate_5.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; + sha1 = "83c8315c6785005e3bd021839411c9e110e6d834"; + }; + } + { + 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_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 = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + 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 { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + }; + } + { + name = "postcss___postcss_8.3.6.tgz"; + path = fetchurl { + name = "postcss___postcss_8.3.6.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz"; + sha1 = "2730dd76a97969f37f53b9a6096197be311cc4ea"; + }; + } + { + 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___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + } + { + name = "promise_queue___promise_queue_2.2.5.tgz"; + path = fetchurl { + name = "promise_queue___promise_queue_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz"; + sha1 = "2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; + }; + } + { + 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 = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + 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 = "react_dom___react_dom_17.0.2.tgz"; + path = fetchurl { + name = "react_dom___react_dom_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz"; + sha1 = "ecffb6845e3ad8dbfcdc498f0d0a939736502c23"; + }; + } + { + name = "react___react_17.0.2.tgz"; + path = fetchurl { + name = "react___react_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz"; + sha1 = "d0b5cc516d29eb3eee383f75b62864cfb6800037"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + }; + } + { + name = "rechoir___rechoir_0.7.1.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz"; + sha1 = "9478a96a1ca135b5e88fc027f03ee92d6c645686"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + }; + } + { + 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 = "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 = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + 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 = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } + { + 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.4.1.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; + }; + } + { + name = "run_parallel___run_parallel_1.2.0.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; + }; + } + { + name = "rx___rx_4.1.0.tgz"; + path = fetchurl { + name = "rx___rx_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "scheduler___scheduler_0.20.2.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz"; + sha1 = "4baee39436e34aa93b4874bddcbf0fe8b8b50e91"; + }; + } + { + name = "schema_utils___schema_utils_3.1.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; + sha1 = "bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"; + }; + } + { + 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.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + }; + } + { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha1 = "efae5d88f45d7924141da8b5c3a7a7e663fefeb8"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "sift___sift_7.0.1.tgz"; + path = fetchurl { + name = "sift___sift_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz"; + sha1 = "47d62c50b159d316f1372f8b53f9c10cd21a4b08"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "source_map_js___source_map_js_0.6.2.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; + sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + 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 = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + 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 = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stream_http___stream_http_3.2.0.tgz"; + path = fetchurl { + name = "stream_http___stream_http_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz"; + sha1 = "1872dfcf24cb15752677e40e5c3f9cc1926028b5"; + }; + } + { + 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_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } + { + 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 = "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_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_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + 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 = "style_loader___style_loader_2.0.0.tgz"; + path = fetchurl { + name = "style_loader___style_loader_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz"; + sha1 = "9669602fd4690740eaaec137799a03addbbc393c"; + }; + } + { + name = "supports_color___supports_color_8.1.1.tgz"; + path = fetchurl { + name = "supports_color___supports_color_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; + sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + 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.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "swagger_schema_official___swagger_schema_official_2.0.0_bab6bed.tgz"; + path = fetchurl { + name = "swagger_schema_official___swagger_schema_official_2.0.0_bab6bed.tgz"; + url = "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz"; + sha1 = "70070468d6d2977ca5237b2e519ca7d06a2ea3fd"; + }; + } + { + name = "swagger_ui_dist___swagger_ui_dist_3.51.2.tgz"; + path = fetchurl { + name = "swagger_ui_dist___swagger_ui_dist_3.51.2.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.51.2.tgz"; + sha1 = "b0f377edf91a7fd1f4026f4ccc75c072ea610b7b"; + }; + } + { + name = "tail___tail_2.2.3.tgz"; + path = fetchurl { + name = "tail___tail_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/tail/-/tail-2.2.3.tgz"; + sha1 = "3e6bf65963bb868913e4e3b770cc1584c9d8091c"; + }; + } + { + name = "tapable___tapable_2.2.0.tgz"; + path = fetchurl { + name = "tapable___tapable_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz"; + sha1 = "5c373d281d9c672848213d0e037d1c4165ab426b"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_5.2.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.3.tgz"; + sha1 = "4852c91f709a4ea2bcf324cf48e7e88124cda0cc"; + }; + } + { + name = "terser___terser_5.7.2.tgz"; + path = fetchurl { + name = "terser___terser_5.7.2.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.7.2.tgz"; + sha1 = "d4d95ed4f8bf735cb933e802f2a1829abf545e3f"; + }; + } + { + 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 = "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 = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "ts_loader___ts_loader_9.2.5.tgz"; + path = fetchurl { + name = "ts_loader___ts_loader_9.2.5.tgz"; + url = "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.5.tgz"; + sha1 = "127733a5e9243bf6dafcb8aa3b8a266d8041dca9"; + }; + } + { + name = "ts_log___ts_log_2.2.3.tgz"; + path = fetchurl { + name = "ts_log___ts_log_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz"; + sha1 = "4da5640fe25a9fb52642cd32391c886721318efb"; + }; + } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; + }; + } + { + name = "tslib___tslib_2.3.1.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha1 = "e8a335add5ceae51aa261d32a490158ef042ef01"; + }; + } + { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + path = fetchurl { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"; + sha1 = "75f140bde947d35d8f0d238e0ebf809d64592c37"; + }; + } + { + name = "tslint___tslint_6.1.3.tgz"; + path = fetchurl { + name = "tslint___tslint_6.1.3.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz"; + sha1 = "5c23b2eccc32487d5523bd3a470e9aa31789d904"; + }; + } + { + name = "tsutils___tsutils_2.29.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_2.29.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; + sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "typescript___typescript_4.4.2.tgz"; + path = fetchurl { + name = "typescript___typescript_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz"; + sha1 = "6d618640d430e3569a1dfb44f7d7e600ced3ee86"; + }; + } + { + 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 = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + }; + } + { + 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___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + 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 = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "watchpack___watchpack_2.2.0.tgz"; + path = fetchurl { + name = "watchpack___watchpack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz"; + sha1 = "47d78f5415fe550ecd740f99fe2882323a58b1ce"; + }; + } + { + name = "webpack_cli___webpack_cli_4.8.0.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha1 = "5fc3c8b9401d3c8a43e2afceacfa8261962338d1"; + }; + } + { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha1 = "2b39dbf22af87776ad744c390223731d30a68f61"; + }; + } + { + name = "webpack_sources___webpack_sources_3.2.0.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha1 = "b16973bcf844ebcdb3afde32eda1c04d0b90f89d"; + }; + } + { + name = "webpack___webpack_5.48.0.tgz"; + path = fetchurl { + name = "webpack___webpack_5.48.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-5.48.0.tgz"; + sha1 = "06180fef9767a6fd066889559a4c4d49bee19b83"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + 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 = "wildcard___wildcard_2.0.0.tgz"; + path = fetchurl { + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha1 = "a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"; + }; + } + { + name = "workerpool___workerpool_6.1.0.tgz"; + path = fetchurl { + name = "workerpool___workerpool_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz"; + sha1 = "a8e038b4c94569596852de7a8ea4228eefdeb37b"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + 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 = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_5.0.8.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + }; + } + { + 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_20.2.4.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + }; + } + { + name = "yargs_unparser___yargs_unparser_2.0.0.tgz"; + path = fetchurl { + name = "yargs_unparser___yargs_unparser_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha1 = "f131f9226911ae5d9ad38c432fe809366c2325eb"; + }; + } + { + name = "yargs___yargs_16.2.0.tgz"; + path = fetchurl { + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + }; + } + ]; +} diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 0f271dd889e8..ebf5de4e00b1 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "60.0.0"; + version = "61.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-WtEC/EH0G1Tm6OK6hmVRzloLkO8mxxOYYZY7k/Wi2zE="; + sha256 = "04f18jr0a5m1sah8163m28b82w1ikjzmahqy67pbbpzg0mc6rqr4"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 82040203c4f3..1d226ec8fe26 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -46,13 +46,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.0.0"; + version = "27.0.1"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "1n71705b9lbdff3svkmgwmbhlhhxvi8ajxqb74lm07v56a5bvi6p"; + sha256 = "04fzsr9yizmxy0r7z2706crvnsnybpnv5kgfn77znknxxjacfhkn"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/video/xine-ui/default.nix b/nixpkgs/pkgs/applications/video/xine-ui/default.nix index ed60fad56c3b..87b975e80fb7 100644 --- a/nixpkgs/pkgs/applications/video/xine-ui/default.nix +++ b/nixpkgs/pkgs/applications/video/xine-ui/default.nix @@ -51,6 +51,11 @@ stdenv.mkDerivation rec { LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; + postInstall = '' + substituteInPlace $out/share/applications/xine.desktop \ + --replace "MimeType=;" "MimeType=" + ''; + meta = with lib; { homepage = "http://xinehq.de/"; description = "Xlib-based frontend for Xine video player"; diff --git a/nixpkgs/pkgs/applications/virtualization/bochs/default.nix b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix index 5f3b31870dc1..41ab5ef2c990 100644 --- a/nixpkgs/pkgs/applications/virtualization/bochs/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation rec { "--enable-sb16" "--enable-show-ips" "--enable-smp" + "--enable-vmx=2" "--enable-svm" "--enable-trace-linking" "--enable-usb" diff --git a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 3bcb27898cc3..05e468a73228 100644 --- a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "17.0"; + version = "18.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "1m4v12sjifd5mf1wzjwkndvxg53n7kwd35k6ql45hdpiz3f5ipig"; + sha256 = "0k9gclkba2bhmyqhyigjgfgcnqpg16v3yczhh08ljxmbrsbs02ig"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "11qspv061y75cyln60727x15gdn9rndi697zr9fmihnwn3dx4hvh"; + cargoSha256 = "086ldzb1rbbrzjbklay4nvhc18ipyxi9gnp56f06393zvfbhc5dl"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index a38b0675af2d..5a4532fc6c7f 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.36.2"; + version = "1.36.4"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-Q8M8+krPC6WRDCxe88gzX5bDG8x6sJ8TduTKjA85WFA="; + sha256 = "0hgiigai5jpczjll4s4r4jzbq272s3p8f0r6mj4r3mjjs89hkqz1"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; @@ -38,7 +38,7 @@ buildGoPackage rec { meta = with lib; { description = "Minify and secure Docker containers"; homepage = "https://dockersl.im/"; - changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/docker-slim/docker-slim/raw/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index 242d6b37d764..89afc45ba4a9 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-X/oTL/CfMunGcS3HDoH/g1gZcJWnVU93OkcGC36KuA4="; + sha256 = "sha256-UKIT3PfybuQjKxxFbRQSCA8G3R2xIySWEDUKg27u5Rk="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix b/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix index dd16fb4d25a7..c7743bf44fc0 100644 --- a/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.3.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "0rr6ngkzqgw250nilv36fz7fhsqxcgl4nhld2hnr0sr4ngirqcjp"; + sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i \ - -e 's/^REVISION :=.*/REVISION = ${src.rev}/' \ + -e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \ -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk diff --git a/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/nixpkgs/pkgs/applications/virtualization/lima/default.nix index c201ad8805b1..adff564a3c9a 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kSJbSJ85cM6N+V67z+trNNuEO4O2KNs62JTy3Mz8Bi4="; + sha256 = "sha256-3Bc8F8L4ac0YoUp2zoQYPsj7hcXKf8SVkE7q6q0MNSs="; }; - vendorSha256 = "sha256-PeIEIUX/PwwnbZfXnK3IsENO+zRYLhljBRe910aZgKs="; + vendorSha256 = "sha256-vYeHv6sSiO6fY+oXR8bFFs/NAhivtnkc15pXEu+reZQ="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix index 43eb1639b43e..71621d6cd942 100644 --- a/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -25,21 +25,20 @@ let in buildGoPackage rec { pname = "nvidia-container-runtime"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; + sha256 = "sha256-+LZjsN/tKqsPJamoI8xo9LFv14c3e9vVlSP4NJhElcs="; }; - goPackagePath = "github.com/${pname}/src"; + goPackagePath = "github.com/nvidia/nvidia-container-runtime"; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - mv $out/bin/{src,nvidia-container-runtime} mkdir -p $out/etc/nvidia-container-runtime # nvidia-container-runtime invokes docker-runc or runc if that isn't diff --git a/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 8cb470d2fa4c..febd5e4cb1a8 100644 --- a/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "nvidia-container-toolkit"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; + sha256 = "sha256-YvwqnwYOrlSE6PmNNZ5xjEaEcXdHKcakIwua+tOvIJ0="; }; vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index e1f1583d0365..37fad321cada 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.1"; + version = "3.8.3"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-Jkg2b7x+j8up0y+PGH6hSTVsX5CDpXgm1kE1n6hBXZo="; + sha256 = "sha256-LiLrnuG3P91RuHgxSfDk2DwNLYoMHt9gNBV9UO7vuDU="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 1d5044cd213d..73972deb2c8f 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -59,6 +59,7 @@ python3Packages.buildPythonApplication rec { "tests/test_cli.py" "tests/test_disk.py" "tests/test_checkprops.py" + "tests/test_storage.py" ]; # Error logs: https://gist.github.com/superherointj/fee040872beaafaaa19b8bf8f3ff0be5 preCheck = '' diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index c693fa8fdcf1..f54f9d84546b 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -200,6 +200,11 @@ in stdenv.mkDerivation { done ''} + # https://github.com/NixOS/nixpkgs/issues/137104 + ${optionalString (enableHardening || headless) '' + rm $libexec/components/VBoxREM.so + ''} + cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; diff --git a/nixpkgs/pkgs/applications/window-managers/awesome/default.nix b/nixpkgs/pkgs/applications/window-managers/awesome/default.nix index a526636063e9..90b559e7d44c 100644 --- a/nixpkgs/pkgs/applications/window-managers/awesome/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobject-introspection , which, dbus, nettools, git, doxygen @@ -12,10 +12,11 @@ # needed for beautiful.gtk to work assert gtk3Support -> gtk3 != null; +let + luaEnv = lua.withPackages(ps: [ ps.lgi ps.ldoc ]); +in + stdenv.mkDerivation rec { - lgi = luaPackages.lgi; - lua = luaPackages.lua; - ldoc = luaPackages.ldoc; pname = "awesome"; version = "4.3"; @@ -35,7 +36,6 @@ stdenv.mkDerivation rec { xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor - ldoc ]; outputs = [ "out" "doc" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection - git lgi libpthreadstubs libstartup_notification + git luaEnv libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms @@ -55,14 +55,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ #"-DGENERATE_MANPAGES=ON" "-DOVERRIDE_VERSION=${version}" - ] ++ lib.optional luaPackages.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" + ] ++ lib.optional lua.pkgs.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so" ; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags # below for how awesome finds the libraries it needs at runtime. - LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; - LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; + LUA_CPATH = "${luaEnv}/lib/lua/${lua.luaversion}/?.so"; + LUA_PATH = "${luaEnv}/share/lua/${lua.luaversion}/?.lua;;"; postInstall = '' # Don't use wrapProgram or the wrapper will duplicate the --search @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { mv "$out/bin/awesome" "$out/bin/.awesome-wrapped" makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ - --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ + --add-flags '--search ${luaEnv}/lib/lua/${lua.luaversion}' \ + --add-flags '--search ${luaEnv}/share/lua/${lua.luaversion}' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" wrapProgram $out/bin/awesome-client \ diff --git a/nixpkgs/pkgs/build-support/coq/default.nix b/nixpkgs/pkgs/build-support/coq/default.nix index 5f2b5e646b0b..05f6e7762a07 100644 --- a/nixpkgs/pkgs/build-support/coq/default.nix +++ b/nixpkgs/pkgs/build-support/coq/default.nix @@ -57,7 +57,8 @@ let ] "") + optionalString (v == null) "-broken"; append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; - var-coqlib-install = (optionalString (versions.isGe "8.7" coq.coq-version) "COQMF_") + "COQLIB"; + var-coqlib-install = + (optionalString (versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev") "COQMF_") + "COQLIB"; useDune2 = args.useDune2 or (useDune2ifVersion fetched.version); in diff --git a/nixpkgs/pkgs/build-support/mkshell/default.nix b/nixpkgs/pkgs/build-support/mkshell/default.nix index 7ca4cc23c1d5..27ee7e322624 100644 --- a/nixpkgs/pkgs/build-support/mkshell/default.nix +++ b/nixpkgs/pkgs/build-support/mkshell/default.nix @@ -14,8 +14,9 @@ , ... }@attrs: let - mergeInputs = name: lib.concatLists (lib.catAttrs name - ([ attrs ] ++ inputsFrom)); + mergeInputs = name: + (attrs.${name} or []) ++ + (lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom))); rest = builtins.removeAttrs attrs [ "packages" diff --git a/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix b/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix index 3b36554e7075..2e8830b47574 100644 --- a/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix @@ -36,9 +36,9 @@ in stdenv.mkDerivation ({ name = "${name}-vendor.tar.gz"; nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ]; - phases = "unpackPhase patchPhase buildPhase installPhase"; - buildPhase = '' + runHook preBuild + # Ensure deterministic Cargo vendor builds export SOURCE_DATE_EPOCH=1 @@ -69,6 +69,8 @@ in stdenv.mkDerivation ({ # Packages with git dependencies generate non-default cargo configs, so # always install it rather than trying to write a standard default template. install -D $CARGO_CONFIG $name/.cargo/config; + + runHook postBuild ''; # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ diff --git a/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix b/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix index 83f4e0df4f2d..3973aff398ab 100644 --- a/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix +++ b/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix @@ -12,14 +12,15 @@ let # Parse a git source into different components. parseGit = src: let - parts = builtins.match ''git\+([^?]+)(\?rev=(.*))?#(.*)?'' src; - rev = builtins.elemAt parts 2; + parts = builtins.match ''git\+([^?]+)(\?(rev|tag|branch)=(.*))?#(.*)'' src; + type = builtins.elemAt parts 2; # rev, tag or branch + value = builtins.elemAt parts 3; in if parts == null then null else { url = builtins.elemAt parts 0; - sha = builtins.elemAt parts 3; - } // lib.optionalAttrs (rev != null) { inherit rev; }; + sha = builtins.elemAt parts 4; + } // lib.optionalAttrs (type != null) { inherit type value; }; packages = (builtins.fromTOML (builtins.readFile lockFile)).package; @@ -137,7 +138,7 @@ let cat > $out/.cargo-config <<EOF [source."${gitParts.url}"] git = "${gitParts.url}" - ${lib.optionalString (gitParts ? rev) "rev = \"${gitParts.rev}\""} + ${lib.optionalString (gitParts ? type) "${gitParts.type} = \"${gitParts.value}\""} replace-with = "vendored-sources" EOF '' diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix index 2dd525a8ac3f..95f1711d2da7 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -1,8 +1,12 @@ { callPackage }: +# Build like this from nixpkgs root: +# $ nix-build -A tests.importCargoLock { basic = callPackage ./basic { }; gitDependency = callPackage ./git-dependency { }; - gitDependencyNoRev = callPackage ./git-dependency-no-rev { }; + gitDependencyRev = callPackage ./git-dependency-rev { }; + gitDependencyTag = callPackage ./git-dependency-tag { }; + gitDependencyBranch = callPackage ./git-dependency-branch { }; maturin = callPackage ./maturin { }; } diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock new file mode 100644 index 000000000000..e832b2e5ba4f --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock @@ -0,0 +1,72 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "git-dependency-branch" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.4" +source = "git+https://github.com/rust-random/rand.git?branch=master#fcc5baf31565a94f63dce41c2e739e6f182475f4" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "git+https://github.com/rust-random/rand.git?branch=master#fcc5baf31565a94f63dce41c2e739e6f182475f4" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "git+https://github.com/rust-random/rand.git?branch=master#fcc5baf31565a94f63dce41c2e739e6f182475f4" +dependencies = [ + "getrandom", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml new file mode 100644 index 000000000000..0702c5ad8a07 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "git-dependency-branch" +version = "0.1.0" +authors = ["Daniël de Kok <me@danieldk.eu>"] +edition = "2018" + +[dependencies] +rand = { git = "https://github.com/rust-random/rand.git", branch = "master" } diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix index fc36edc40772..f274d86c52b8 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix @@ -1,7 +1,7 @@ { rustPlatform }: rustPlatform.buildRustPackage { - pname = "git-dependency-no-rev"; + pname = "git-dependency-branch"; version = "0.1.0"; src = ./.; @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; + "rand-0.8.4" = "1ilk9wvfw3mdm57g199ys8f5nrgdrh0n3a4c8b7nz6lgnqvfrv6z"; }; }; doInstallCheck = true; installCheckPhase = '' - $out/bin/git-dependency-no-rev + $out/bin/git-dependency-branch ''; } diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs index 50b4ed799e43..50b4ed799e43 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock index 54b9c7c5739d..684d9419479d 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "cfg-if" version = "1.0.0" @@ -18,7 +20,7 @@ dependencies = [ ] [[package]] -name = "git-dependency-no-rev" +name = "git-dependency-rev" version = "0.1.0" dependencies = [ "rand", @@ -39,7 +41,7 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "rand" version = "0.8.3" -source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" dependencies = [ "libc", "rand_chacha", @@ -50,7 +52,7 @@ dependencies = [ [[package]] name = "rand_chacha" version = "0.3.0" -source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" dependencies = [ "ppv-lite86", "rand_core", @@ -58,8 +60,8 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" -source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +version = "0.6.1" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" dependencies = [ "getrandom", ] @@ -67,7 +69,7 @@ dependencies = [ [[package]] name = "rand_hc" version = "0.3.0" -source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" +source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" dependencies = [ "rand_core", ] diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml index 770dfb86f523..3500325ae579 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "git-dependency-no-rev" +name = "git-dependency-rev" version = "0.1.0" authors = ["Daniël de Kok <me@danieldk.eu>"] edition = "2018" [dependencies] -rand = { git = "https://github.com/rust-random/rand.git" } +rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" } diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix new file mode 100644 index 000000000000..40487d6829a2 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix @@ -0,0 +1,21 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "git-dependency-rev"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; + }; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/git-dependency-rev + ''; +} diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock new file mode 100644 index 000000000000..9f8ec19a366a --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock @@ -0,0 +1,81 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "git-dependency-tag" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.3" +source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.1" +source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml new file mode 100644 index 000000000000..1bda7336c263 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "git-dependency-tag" +version = "0.1.0" +authors = ["Daniël de Kok <me@danieldk.eu>"] +edition = "2018" + +[dependencies] +rand = { git = "https://github.com/rust-random/rand.git", tag = "0.8.3" } diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix new file mode 100644 index 000000000000..2a2f860ac8a1 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix @@ -0,0 +1,21 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "git-dependency-tag"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; + }; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/git-dependency-tag + ''; +} diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock index 50600ef4caa5..fa71865b3e5f 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "cfg-if" version = "1.0.0" @@ -39,7 +41,7 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "rand" version = "0.8.3" -source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" dependencies = [ "libc", "rand_chacha", @@ -50,7 +52,7 @@ dependencies = [ [[package]] name = "rand_chacha" version = "0.3.0" -source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" dependencies = [ "ppv-lite86", "rand_core", @@ -58,8 +60,8 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" -source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +version = "0.6.2" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" dependencies = [ "getrandom", ] @@ -67,7 +69,7 @@ dependencies = [ [[package]] name = "rand_hc" version = "0.3.0" -source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7" +source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef" dependencies = [ "rand_core", ] diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml index 11ee8b1763e6..a902dea9fcd0 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml @@ -5,4 +5,4 @@ authors = ["Daniël de Kok <me@danieldk.eu>"] edition = "2018" [dependencies] -rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" } +rand = { git = "https://github.com/rust-random/rand.git" } diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix index 17276c5f5c3c..944de9b45cb5 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; + "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; }; }; diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix index af0de596b387..f8deb4f657e0 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix @@ -38,6 +38,6 @@ python3.pkgs.buildPythonPackage rec { description = "PyO3 word count example"; homepage = "https://github.com/PyO3/pyo3"; license = licenses.asl20; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/build-support/substitute/substitute.nix b/nixpkgs/pkgs/build-support/substitute/substitute.nix new file mode 100644 index 000000000000..7f0332334585 --- /dev/null +++ b/nixpkgs/pkgs/build-support/substitute/substitute.nix @@ -0,0 +1,14 @@ +{ stdenvNoCC }: + +args: + +# This is a wrapper around `substitute` in the stdenv. +# The `replacements` attribute should be a list of list of arguments +# to `substitute`, such as `[ "--replace" "sourcetext" "replacementtext" ]` +stdenvNoCC.mkDerivation ({ + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = ./substitute.sh; + inherit (args) src; + preferLocalBuild = true; + allowSubstitutes = false; +} // args // { replacements = args.replacements; }) diff --git a/nixpkgs/pkgs/build-support/substitute/substitute.sh b/nixpkgs/pkgs/build-support/substitute/substitute.sh new file mode 100644 index 000000000000..dbac275a80ed --- /dev/null +++ b/nixpkgs/pkgs/build-support/substitute/substitute.sh @@ -0,0 +1,18 @@ +source $stdenv/setup + +args= + +target=$out +if test -n "$dir"; then + target=$out/$dir/$name + mkdir -p $out/$dir +fi + +substitute $src $target $replacements + +if test -n "$isExecutable"; then + chmod +x $target +fi + +eval "$postInstall" + diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index cd12033b505f..ced17e2cc8e0 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -3,7 +3,8 @@ }: let - name = "iosevka" + lib.optionalString (variant != "") "-" + variant; + name = if lib.hasPrefix "sgr" variant then variant + else "iosevka" + lib.optionalString (variant != "") "-" + variant; variantHashes = import ./variants.nix; validVariants = map (lib.removePrefix "iosevka-") diff --git a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 88f9683e34f2..5e1cd786534d 100644 --- a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.041"; + version = "0.042"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-OjguPR2MFjbY72/PF0R43/g6i95uAPVPbXk+HS0B360="; + sha256 = "sha256-oXODkeLDT5GXO4+r1fGaRrRS/SSBhzro5XE0GOwl4mQ="; postFetch = '' mkdir -p $out/share/fonts/truetype @@ -25,7 +25,7 @@ fetchzip { ''; maintainers = with maintainers; [ suhr ]; platforms = with platforms; all; - homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/"; + homepage = "https://juliamono.netlify.app/"; license = licenses.ofl; }; } diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index b970faf9104b..dec7d7b31599 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -142,6 +142,14 @@ in # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile + # Remove check for missing zopfli, it doesn't + # work and we guarantee its presence already. + sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile + sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile + + sed -i '/ZOPFLIPNG = zopflipng/d' Makefile + echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile + # Make the build verbose so it won't get culled by Hydra thinking that # it somehow got stuck doing nothing. sed -i 's;\t@;\t;' Makefile diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json index 26b38582e992..2acb95488227 100644 --- a/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "193a13be44c51ebfc8e991b7bb53a4065129ff4d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/193a13be44c51ebfc8e991b7bb53a4065129ff4d.tar.gz", - "sha256": "08j6qx3jqcw7ydwnpjr132l2mlpq6dqvwqgm3gq0ym4kjzrbdwsd", - "msg": "Update from Hackage at 2021-08-23T13:50:03Z" + "commit": "332975af73ba6dc258ab7e103f00619e9bebeea2", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/332975af73ba6dc258ab7e103f00619e9bebeea2.tar.gz", + "sha256": "1fkc19vqylyjbhqa414mnz5ny235vp1f0wz70a2lbf5cwzg6185f", + "msg": "Update from Hackage at 2021-09-06T23:06:06Z" } diff --git a/nixpkgs/pkgs/data/themes/canta/default.nix b/nixpkgs/pkgs/data/themes/canta/default.nix index f0a2339b3e63..5666eded73f0 100644 --- a/nixpkgs/pkgs/data/themes/canta/default.nix +++ b/nixpkgs/pkgs/data/themes/canta/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , librsvg @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "canta-theme"; - version = "2021-07-06"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-dz78h9Qq25+/i6fmw/zGlPq3DVQB3ADYwehgaWReMQ8="; + sha256 = "05h42nrggb6znzjcbh4lqqfcm41h4r85n3vwimp3l4lq5p90igr2"; }; nativeBuildInputs = [ @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/numix-solarized/default.nix b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix index 532275e5f749..efc8236c4514 100644 --- a/nixpkgs/pkgs/data/themes/numix-solarized/default.nix +++ b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-solarized-gtk-theme"; - version = "20210522"; + version = "20210831"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = version; - sha256 = "0hin73fmfir4w1z0j87k5hahhf2blhcq4r7gf89gz4slnl18cvjh"; + sha256 = "1q8qhpw0hfv625sm626zp4vbz2106b0g5m11ygk87s6kbxrfg6lr"; }; nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - for theme in *.colors; do + for theme in colors/*.colors; do + theme="''${theme##*/}" make THEME="''${theme/.colors/}" install done runHook postInstall diff --git a/nixpkgs/pkgs/data/themes/solarc/default.nix b/nixpkgs/pkgs/data/themes/solarc/default.nix index 3f6932e40a0c..a6ae8ce2e914 100644 --- a/nixpkgs/pkgs/data/themes/solarc/default.nix +++ b/nixpkgs/pkgs/data/themes/solarc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Solarized version of the Arc theme"; homepage = "https://github.com/schemar/solarc-theme"; license = licenses.gpl3; - maintainers = [ maintainers.bricewge ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/arcan/arcan.nix b/nixpkgs/pkgs/desktops/arcan/arcan.nix index 6cd31001fa76..a0d037725ed0 100644 --- a/nixpkgs/pkgs/desktops/arcan/arcan.nix +++ b/nixpkgs/pkgs/desktops/arcan/arcan.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-07-30"; + version = "0.6.1pre1+unstable=2021-09-05"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "885b2f0c9e031fd157af21302af2027ecbe3fe1f"; - hash = "sha256-tj5kPa5OWCGt7LTzo4ZYV1UjBpOrjQHER/K+ZfL3h+8="; + rev = "525521177e4458199d7a57f8e6d37d41c04a988d"; + hash = "sha256-RsvTHPIvF9TeOfjPGcArptIiF9g42BfZkVMCbjJcXnE="; }; postUnpack = '' diff --git a/nixpkgs/pkgs/desktops/arcan/default.nix b/nixpkgs/pkgs/desktops/arcan/default.nix index 874035c4801e..39d3e489c592 100644 --- a/nixpkgs/pkgs/desktops/arcan/default.nix +++ b/nixpkgs/pkgs/desktops/arcan/default.nix @@ -35,8 +35,8 @@ rec { # One Expression to SymlinkJoin Them All - everyone-wrapped = callPackage ./wrapper.nix { - name = "everyone-wrapped"; + all-wrapped = callPackage ./wrapper.nix { + name = "all-wrapped"; appls = [ durden pipeworld ]; }; } diff --git a/nixpkgs/pkgs/desktops/arcan/pipeworld.nix b/nixpkgs/pkgs/desktops/arcan/pipeworld.nix index a48ce5044ca0..78af4ee049ee 100644 --- a/nixpkgs/pkgs/desktops/arcan/pipeworld.nix +++ b/nixpkgs/pkgs/desktops/arcan/pipeworld.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.0.0+unstable=2021-05-27"; + version = "0.0.0+unstable=2021-08-01"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "c26df9ca0225ce2fd4f89e7ec59d4ab1f94a4c2e"; - hash = "sha256-RkDAbM1q4o61RGPLPLXHLvbvClp+bfjodlWgUGoODzA="; + rev = "311cc91946be63faab3b1578bc1d40668dd30f8c"; + hash = "sha256-iqcdVzEp4ST/f93+9fGSwvJMj7BznNtoEx4F3oMPCYk="; }; installPhase = '' diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 529596cd6e17..510da6c83d94 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -50,6 +50,7 @@ , vte , glib-networking , qemu-utils +, qemu }: stdenv.mkDerivation rec { @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils qemu ]}") ''; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 39c10e82a1c2..17e98bb2a569 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a"; + sha256 = "PREUTEeXxG0gaMPd9c4rwDD8oPJyzwPyGMT0baO3PE0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix b/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix index e67a623069b1..bffcb8b74c23 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kITimZMftX3ih+V9vS7i0pf7Z0DA1TW52o1fGWqP0ZU="; + sha256 = "sha256-KKo7BwgdlWV1RvcIlJR/qIZjGix/lV5Wz4DbcxrjsjU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix index 1a7887fc35da..df8096b90eec 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "40.3"; + version = "40.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U9ZGlEbXoJsCaTZ2nllTUv3zvlYy80a7Af5XyLUWLOs="; + sha256 = "sha256-iK6W9YXg0IcJQbuj113fPsQDSOHFrnQTIcpIL6ydRe8="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 8013e101913e..94b29e8b4dee 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.3"; + version = "40.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nfh/qVNSAf68o9UI/b97rQFxz3ony2ZN1OPB+WxO0Es="; + sha256 = "9R1MQsIru9AxLKcY9Hz0Vp/FikbvQAdDrk0cx9kKzXk="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix b/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix index f3ccdbce98cb..1f92e49c4f66 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf"; + sha256 = "tx7y/gfl7qiaK7HlvTCUe9GIc7+zD3nL8X7fvU0g9g0="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix b/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix index 46491cffc5f6..6be6c77f7c27 100644 --- a/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd"; + sha256 = "PorZPoSEtEgjyuR0ov2dziLtbs0lZVWSzq17G2gya7s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/unite/default.nix b/nixpkgs/pkgs/desktops/gnome/extensions/unite/default.nix index 776139b36867..e73e43dd392e 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/unite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "54"; + version = "55"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8="; + sha256 = "0bav4vzky3p7np2gphxc6bw38c697kalmaibaar9vi0ip3xkkavk"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix b/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix index c3724ef51058..956f9f842d3d 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "quadrapassel"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1d59sxmmmhi611hvr5jmsm276j9w20hc5yq4rk0s4d3svadyap79"; + sha256 = "C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index e28c169b26e4..64fc7db4dbcc 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util +{ mkXfceDerivation, glib, gtk3, libnotify, libxfce4ui, libxfce4util , xfce4-panel, xfconf }: mkXfceDerivation { @@ -8,7 +8,11 @@ mkXfceDerivation { sha256 = "sha256-Gomehef68+mOgGFDaH48jG51nbaV4ruN925h71w7FuE="; - buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + + configureFlags = [ + "--enable-dbus-start-daemon" + ]; meta = { description = "Simple notification daemon for Xfce"; diff --git a/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix index 9f7d434193a4..cad68e6f302a 100644 --- a/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.18.0"; + version = "0.19.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow="; + sha256 = "sha256-WesGgLoVR435lNXnsCFYcUoKXDMuL7hWImDluori+dc="; rev = version; }; releaseType = "escript"; diff --git a/nixpkgs/pkgs/development/compilers/as31/0000-getline-break.patch b/nixpkgs/pkgs/development/compilers/as31/0000-getline-break.patch new file mode 100644 index 000000000000..c53f6587f8ad --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/as31/0000-getline-break.patch @@ -0,0 +1,24 @@ +diff --git old/as31/run.c new/as31/run.c +index 28c5317..9e5263b 100644 +--- old/as31/run.c ++++ new/as31/run.c +@@ -113,7 +113,8 @@ int run_as31(const char *infile, int lst, int use_stdout, + } + + while (!feof(finPre)) { +- getline(&lineBuffer,&sizeBuf,finPre); ++ if (getline(&lineBuffer,&sizeBuf,finPre) == -1) ++ break; + if ((includePtr=strstr(lineBuffer,INC_CMD))) { + includePtr=includePtr+strlen(INC_CMD); + while ((*includePtr==' ')|| //move includePtr to filename +@@ -138,7 +139,8 @@ int run_as31(const char *infile, int lst, int use_stdout, + mesg_f("Cannot open include file: %s\n",includePtr); + } else { + while (!feof(includeFile)) { +- getline(&incLineBuffer,&incSizeBuf,includeFile); ++ if (getline(&incLineBuffer,&incSizeBuf,includeFile) == -1) ++ break; + fprintf(fin,"%s",incLineBuffer); + if (strlen(incLineBuffer)) { + incLineCount++; diff --git a/nixpkgs/pkgs/development/compilers/as31/default.nix b/nixpkgs/pkgs/development/compilers/as31/default.nix new file mode 100644 index 000000000000..c76b8a03312e --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/as31/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +, bison +}: + +stdenv.mkDerivation rec { + pname = "as31"; + version = "2.3.1"; + + src = fetchurl { + url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:${pname}-${version}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + hash = "sha256-zSEyWHFon5nyq717Mpmdv1XZ5Hz0e8ZABqsP8M83c1U="; + }; + + patches = [ + # Check return value of getline in run.c + ./0000-getline-break.patch + ]; + + postPatch = '' + # parser.c is generated from parser.y; it is better to generate it via bison + # instead of using the prebuilt one, especially in x86_64 + rm -f as31/parser.c + ''; + + preConfigure = '' + chmod +x configure + ''; + + nativeBuildInputs = [ + bison + ]; + + meta = with lib; { + homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31"; + description = "An 8031/8051 assembler"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/atasm/0000-file-not-found.diff b/nixpkgs/pkgs/development/compilers/atasm/0000-file-not-found.diff new file mode 100644 index 000000000000..39caaf304174 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/atasm/0000-file-not-found.diff @@ -0,0 +1,16 @@ +diff -Naur atasm109-old/src/Makefile atasm109-new/src/Makefile +--- atasm109-old/src/Makefile 2021-09-08 09:53:25.581598063 -0300 ++++ atasm109-new/src/Makefile 2021-09-08 09:55:20.366131338 -0300 +@@ -55,9 +55,9 @@ + chown root.root $(DESTDIR)/atasm || true + chmod 711 $(DESTDIR)/atasm + mkdir $(DOCDIR) >/dev/null 2>&1 || echo $(DOCDIR) already exists +- cp ../atasm.txt $(DOCDIR) +- chown root.root $(DOCDIR)/atasm.txt || true +- chmod 644 $(DOCDIR)/atasm.txt ++ # cp ../atasm.txt $(DOCDIR) ++ # chown root.root $(DOCDIR)/atasm.txt || true ++ # chmod 644 $(DOCDIR)/atasm.txt + sed -e 's,%%DOCDIR%%,$(DOCDIR),g' < atasm.1.in > atasm.1 + cp atasm.1 $(MANDIR) + chown root.root $(MANDIR)/atasm.1 || true diff --git a/nixpkgs/pkgs/development/compilers/atasm/0001-select-flags.diff b/nixpkgs/pkgs/development/compilers/atasm/0001-select-flags.diff new file mode 100644 index 000000000000..b8fce38fcf28 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/atasm/0001-select-flags.diff @@ -0,0 +1,14 @@ +diff -Naur atasm109-old/src/Makefile atasm109-new/src/Makefile +--- atasm109-old/src/Makefile 2021-09-08 09:53:25.581598063 -0300 ++++ atasm109-new/src/Makefile 2021-09-08 09:55:20.366131338 -0300 +@@ -16,8 +16,8 @@ + UNIX = -DUNIX + + # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use: +-#CFLAGS = -g -Wall $(USEZ) $(DOS) $(UNIX) $(ARCH) +-CFLAGS = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer $(ARCH) ++CFLAGS = -g -Wall $(USEZ) $(DOS) $(UNIX) $(ARCH) ++#CFLAGS = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer $(ARCH) + + L = $(ZLIB) + CC = gcc diff --git a/nixpkgs/pkgs/development/compilers/atasm/default.nix b/nixpkgs/pkgs/development/compilers/atasm/default.nix new file mode 100644 index 000000000000..74f54d8d03cf --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/atasm/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, unzip +, zlib +}: + +stdenv.mkDerivation rec { + pname = "atasm"; + version = "1.09"; + + src = fetchurl { + url = "https://atari.miribilist.com/${pname}/${pname}${builtins.replaceStrings ["."] [""] version}.zip"; + hash = "sha256-26shhw2r30GZIPz6S1rf6dOLKRpgpLwrqCRZX3+8PvA="; + }; + + patches = [ + # make install fails because atasm.txt was moved; report to upstream + ./0000-file-not-found.diff + # select flags for compilation + ./0001-select-flags.diff + ]; + + dontConfigure = true; + + nativeBuildInputs = [ + unzip + ]; + + buildInputs = [ + zlib + ]; + + preBuild = '' + makeFlagsArray+=( + -C ./src + CC=cc + USEZ="-DZLIB_CAPABLE -I${zlib}/include" + ZLIB="-L${zlib}/lib -lz" + UNIX="-DUNIX" + ) + ''; + + preInstall = '' + install -d $out/share/doc/${pname} $out/man/man1 + installFlagsArray+=( + DESTDIR=$out + DOCDIR=$out/share/doc/${pname} + MANDIR=$out/man/man1 + ) + ''; + + postInstall = '' + mv docs/* $out/share/doc/${pname} + ''; + + meta = with lib; { + homepage = "https://atari.miribilist.com/atasm/"; + description = "A commandline 6502 assembler compatible with Mac/65"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/fstar/default.nix b/nixpkgs/pkgs/development/compilers/fstar/default.nix index 0ef2e89f123a..dac50fc781bb 100644 --- a/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "fstar"; - version = "2021.08.27"; + version = "2021.09.11"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "1bf5hrv2nv0ljvdf6jhk59lw1ds3j5qkkcylgxwakylw30g8rxqb"; + sha256 = "1aqk6fx77zcb7mcm78dk4l4zzd323qiv7yc7hvc38494yf6gk8a0"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 58a4dfbe36e1..a1598d3d3f07 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) ''; diff --git a/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 15d935618712..7b7f542de0cf 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -152,6 +152,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) ''; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix index 824794774cec..c21096b5920e 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -374,6 +374,8 @@ stdenv.mkDerivation rec { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; - maintainers = with lib.maintainers; [ lostnet guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; }; } diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix index 34643dd2f87c..ad106f2f2a54 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -386,6 +386,9 @@ stdenv.mkDerivation rec { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; - maintainers = with lib.maintainers; [ lostnet ]; + maintainers = with lib.maintainers; [ + prusnak + domenkozar + ] ++ lib.teams.haskell.members; }; } diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix index f1078a0ad340..c0f791389c83 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix @@ -106,6 +106,12 @@ let GhcRtsHcOpts += -fPIC '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 + '' + # While split sections are now enabled by default in ghc 8.8 for windows, + # they seem to lead to `too many sections` errors when building base for + # profiling. + + lib.optionalString targetPlatform.isWindows '' + SplitSections = NO ''; # Splicer will pull out correct variations @@ -123,7 +129,7 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl && !targetPlatform.isWindows); runtimeDeps = [ targetPackages.stdenv.cc.bintools @@ -156,6 +162,13 @@ stdenv.mkDerivation (rec { # upstream patch. Don't forget to check backport status of the upstream patch # when adding new GHC releases in nixpkgs. ./respect-ar-path.patch + + # cabal passes incorrect --host= when cross-compiling + # https://github.com/haskell/cabal/issues/5887 + (fetchpatch { + url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch"; + sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1"; + }) ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { @@ -313,7 +326,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix index c2fac6faf774..d30275dee124 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -192,6 +192,8 @@ stdenv.mkDerivation rec { hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms; # build segfaults, use ghc8102Binary which has proper musl support instead broken = stdenv.hostPlatform.isMusl; - maintainers = with lib.maintainers; [ guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; }; } diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index 66862fca7318..1f207059756b 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx , bash , libiconv ? null, ncurses @@ -114,6 +114,12 @@ let GhcRtsHcOpts += -fPIC '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' EXTRA_CC_OPTS += -std=gnu99 + '' + # While split sections are now enabled by default in ghc 8.8 for windows, + # they seem to lead to `too many sections` errors when building base for + # profiling. + + lib.optionalString targetPlatform.isWindows '' + SplitSections = NO ''; # Splicer will pull out correct variations @@ -131,7 +137,7 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl && !targetPlatform.isWindows); runtimeDeps = [ targetPackages.stdenv.cc.bintools @@ -167,6 +173,18 @@ stdenv.mkDerivation (rec { # Fix documentation configuration which causes a syntax error with sphinx 4.* # See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962 ./sphinx-4-configuration.patch + # cabal passes incorrect --host= when cross-compiling + # https://github.com/haskell/cabal/issues/5887 + (fetchpatch { + url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch"; + sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1"; + }) + + # error: 'VirtualAllocExNuma' redeclared as different kind of symbol + # name conflict between rts/win32/OSMem.c and winbase.h from the mingw-w64 runtime package + # Renamed to match ghc8.8: + # https://gitlab.haskell.org/ghc/ghc/-/commit/4b431f334018eaef2cf36de3316025c68c922915#20d64c0bdc272817149d1d5cf20a73a8b5fd637f + ./rename-numa-api-call.patch ]; postPatch = "patchShebangs ."; @@ -316,7 +334,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index c2cc1358e821..d1b64e2ae5f5 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -297,7 +297,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix b/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix index 4664ed834f57..b565870addb2 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.2.1.nix @@ -301,7 +301,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; @@ -311,6 +313,7 @@ stdenv.mkDerivation (rec { # https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726 broken = (enableIntegerSimple && hostPlatform.isMusl) || stdenv.hostPlatform.isDarwin; + hydraPlatforms = lib.remove "x86_64-darwin" ghc.meta.platforms; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix index d39adcaab540..a7f7c9db4814 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -318,7 +318,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; # ghcHEAD times out on aarch64-linux on Hydra. diff --git a/nixpkgs/pkgs/development/compilers/ghc/rename-numa-api-call.patch b/nixpkgs/pkgs/development/compilers/ghc/rename-numa-api-call.patch new file mode 100644 index 000000000000..747d7a81a11e --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghc/rename-numa-api-call.patch @@ -0,0 +1,32 @@ +diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c +--- a/rts/win32/OSMem.c ++++ b/rts/win32/OSMem.c +@@ -41,7 +41,7 @@ static block_rec* free_blocks = NULL; + typedef LPVOID(WINAPI *VirtualAllocExNumaProc)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD); + + /* Cache NUMA API call. */ +-VirtualAllocExNumaProc VirtualAllocExNuma; ++VirtualAllocExNumaProc _VirtualAllocExNuma; + + void + osMemInit(void) +@@ -52,8 +52,8 @@ osMemInit(void) + /* Resolve and cache VirtualAllocExNuma. */ + if (osNumaAvailable() && RtsFlags.GcFlags.numa) + { +- VirtualAllocExNuma = (VirtualAllocExNumaProc)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); +- if (!VirtualAllocExNuma) ++ _VirtualAllocExNuma = (VirtualAllocExNumaProc)(void*)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma"); ++ if (!_VirtualAllocExNuma) + { + sysErrorBelch( + "osBindMBlocksToNode: VirtualAllocExNuma does not exist. How did you get this far?"); +@@ -569,7 +569,7 @@ void osBindMBlocksToNode( + On windows also -xb is broken, it does nothing so that can't + be used to tweak it (see #12577). So for now, just let the OS decide. + */ +- temp = VirtualAllocExNuma( ++ temp = _VirtualAllocExNuma( + GetCurrentProcess(), + NULL, // addr? See base memory + size, diff --git a/nixpkgs/pkgs/development/compilers/go/1.16.nix b/nixpkgs/pkgs/development/compilers/go/1.16.nix index a97aa4fe80d6..f8cdf7198eef 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.16.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.7"; + version = "1.16.8"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-Gp8olNPYeHKfcEUHLzC+zr4kNSTPL85OCnskix4GVKw="; + sha256 = "sha256-jyqMJLeTN1syQ9+C/bDIOHSG3MioksocmRqpms4Ia5g="; }; # perl is used for testing go vet diff --git a/nixpkgs/pkgs/development/compilers/go/1.17.nix b/nixpkgs/pkgs/development/compilers/go/1.17.nix new file mode 100644 index 000000000000..84bb70a4cf35 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/1.17.nix @@ -0,0 +1,280 @@ +{ lib +, stdenv +, fetchurl +, tzdata +, iana-etc +, runCommand +, perl +, which +, pkg-config +, patch +, procps +, pcre +, cacert +, Security +, Foundation +, xcbuild +, mailcap +, runtimeShell +, buildPackages +, pkgsBuildTarget +, callPackage +}: + +let + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + + goBootstrap = runCommand "go-bootstrap" { } '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.17.1"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "sha256-SdwIM5dwrNVhMxLbjBQer2F3mZVXe4nZO1Qe+DBn5bE="; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkg-config patch procps ]; + buildInputs = [ cacert pcre ] + ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; + + depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + lib.optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + lib.optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.16.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.16.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ./go_no_vendor_checks-1.16.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = + if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = + if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with lib; { + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.linux ++ platforms.darwin; + # requires >=10.13 stdenv on x86_64-darwin + badPlatforms = [ "x86_64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/hip/default.nix b/nixpkgs/pkgs/development/compilers/hip/default.nix new file mode 100644 index 000000000000..6a1e6383958d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/hip/default.nix @@ -0,0 +1,182 @@ +{ stdenv +, binutils-unwrapped +, clang +, clang-unwrapped +, cmake +, compiler-rt +, fetchFromGitHub +, fetchpatch +, file +, lib +, lld +, llvm +, makeWrapper +, perl +, python +, rocclr +, rocm-comgr +, rocm-device-libs +, rocm-opencl-runtime +, rocm-runtime +, rocm-thunk +, rocminfo +, writeScript +, writeText +}: + +stdenv.mkDerivation rec { + name = "hip"; + version = "4.3.1"; + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "HIP"; + rev = "rocm-${version}"; + sha256 = "sha256-dUdP32H0u6kVItS+VUE549vvxkV1mSN84HvyfeK2hEE="; + }; + + # FIXME: https://github.com/ROCm-Developer-Tools/HIP/issues/2317 + postPatch = '' + cp ${rocm-opencl-runtime.src}/amdocl/cl_vk_amd.hpp amdocl/ + ''; + + nativeBuildInputs = [ cmake python makeWrapper ]; + propagatedBuildInputs = [ + clang + compiler-rt + lld + llvm + rocclr + rocm-comgr + rocm-device-libs + rocm-runtime + rocm-thunk + rocminfo + ]; + + preConfigure = '' + export HIP_CLANG_PATH=${clang}/bin + export DEVICE_LIB_PATH=${rocm-device-libs}/lib + ''; + + # The patch version is the last two digits of year + week number + + # day in the week: date -d "2021-07-25" +%y%U%w + workweek = "21300"; + + cmakeFlags = [ + "-DHSA_PATH=${rocm-runtime}" + "-DHIP_COMPILER=clang" + "-DHIP_PLATFORM=amd" + "-DHIP_VERSION_GITDATE=${workweek}" + "-DCMAKE_C_COMPILER=${clang}/bin/clang" + "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" + "-DLLVM_ENABLE_RTTI=ON" + "-DLIBROCclr_STATIC_DIR=${rocclr}/lib/cmake" + "-DROCclr_DIR=${rocclr}" + "-DHIP_CLANG_ROOT=${clang-unwrapped}" + ]; + + patches = [ + (fetchpatch { + name = "no-git-during-build"; + url = "https://github.com/acowley/HIP/commit/310b7e972cfb23216250c0240ba6134741679aee.patch"; + sha256 = "08ky7v1yvajabn9m5x3afzrnz38gnrgc7vgqlbyr7s801c383ha1"; + }) + (fetchpatch { + name = "use-PATH-when-compiling-pch"; + url = "https://github.com/acowley/HIP/commit/bfb4dd1eafa9714a2c05a98229cc35ffa3429b37.patch"; + sha256 = "1wp0m32df7pf4rhx3k5n750fd7kz10zr60z0wllb0mw6h00w6xpz"; + }) + ]; + + # - fix bash paths + # - fix path to rocm_agent_enumerator + # - fix hcc path + # - fix hcc version parsing + # - add linker flags for libhsa-runtime64 and hc_am since libhip_hcc + # refers to them. + prePatch = '' + for f in $(find bin -type f); do + sed -e 's,#!/usr/bin/perl,#!${perl}/bin/perl,' \ + -e 's,#!/bin/bash,#!${stdenv.shell},' \ + -i "$f" + done + + for f in $(find . -regex '.*\.cpp\|.*\.h\(pp\)?'); do + if grep -q __hcc_workweek__ "$f" ; then + substituteInPlace "$f" --replace '__hcc_workweek__' '${workweek}' + fi + done + + sed 's,#!/usr/bin/python,#!${python}/bin/python,' -i hip_prof_gen.py + + sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ + -e "s,^\($HIP_LIB_PATH=\).*$,\1\"$out/lib\";," \ + -e 's,^\($HIP_CLANG_PATH=\).*$,\1"${clang}/bin";,' \ + -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \ + -e 's,^\($HIP_COMPILER=\).*$,\1"clang";,' \ + -e 's,^\($HIP_RUNTIME=\).*$,\1"ROCclr";,' \ + -e 's,^\([[:space:]]*$HSA_PATH=\).*$,\1"${rocm-runtime}";,'g \ + -e 's,\([[:space:]]*$HOST_OSNAME=\).*,\1"nixos";,' \ + -e 's,\([[:space:]]*$HOST_OSVER=\).*,\1"${lib.versions.majorMinor lib.version}";,' \ + -e 's,^\([[:space:]]*\)$HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");,\1$HIP_CLANG_INCLUDE_PATH = "${clang-unwrapped}/lib/clang/$HIP_CLANG_VERSION/include";,' \ + -e 's,^\([[:space:]]*$HIPCXXFLAGS .= " -isystem $HIP_CLANG_INCLUDE_PATH\)";,\1 -isystem ${rocm-runtime}/include";,' \ + -e 's,\($HIPCXXFLAGS .= " -isystem \\"$HIP_INCLUDE_PATH\\"\)" ;,\1 --rocm-path=${rocclr}";,' \ + -e "s,\$HIP_PATH/\(bin\|lib\),$out/\1,g" \ + -e "s,^\$HIP_LIB_PATH=\$ENV{'HIP_LIB_PATH'};,\$HIP_LIB_PATH=\"$out/lib\";," \ + -e 's,`file,`${file}/bin/file,g' \ + -e 's,`readelf,`${binutils-unwrapped}/bin/readelf,' \ + -e 's, ar , ${binutils-unwrapped}/bin/ar ,g' \ + -i bin/hipcc + + sed -e 's,^\($HSA_PATH=\).*$,\1"${rocm-runtime}";,' \ + -e 's,^\($HIP_CLANG_PATH=\).*$,\1"${clang}/bin";,' \ + -e 's,^\($HIP_PLATFORM=\).*$,\1"amd";,' \ + -e 's,$HIP_CLANG_PATH/llc,${llvm}/bin/llc,' \ + -e 's, abs_path, Cwd::abs_path,' \ + -i bin/hipconfig + + sed -e 's, abs_path, Cwd::abs_path,' -i bin/hipvars.pm + + sed -e 's|_IMPORT_PREFIX}/../include|_IMPORT_PREFIX}/include|g' \ + -e 's|''${HIP_CLANG_ROOT}/lib/clang/\*/include|${clang-unwrapped}/lib/clang/*/include|' \ + -i hip-config.cmake.in + ''; + + preInstall = '' + mkdir -p $out/lib/cmake + ''; + + # The upstream ROCclr setup wants everything built into the same + # ROCclr output directory. We copy things into the HIP output + # directory, since it is downstream of ROCclr in terms of dependency + # direction. Thus we have device-libs and rocclr pieces in the HIP + # output directory. + postInstall = '' + mkdir -p $out/share + mv $out/lib/cmake $out/share/ + mv $out/cmake/* $out/share/cmake/hip + mkdir -p $out/lib + ln -s ${rocm-device-libs}/lib $out/lib/bitcode + mkdir -p $out/include + ln -s ${clang-unwrapped}/lib/clang/11.0.0/include $out/include/clang + ln -s ${rocclr}/lib/*.* $out/lib + ln -s ${rocclr}/include/* $out/include + wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${lld}/bin --set NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt} 1 --prefix NIX_LDFLAGS ' ' -L${compiler-rt}/lib --prefix NIX_LDFLAGS_FOR_TARGET ' ' -L${compiler-rt}/lib + wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin + ''; + + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version hip "$version" + ''; + + meta = with lib; { + description = "C++ Heterogeneous-Compute Interface for Portability"; + homepage = "https://github.com/ROCm-Developer-Tools/HIP"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix index 7ac5031c36bb..30a1a7a16df8 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -54,7 +54,8 @@ in stdenv.mkDerivation (rec { buildInputs = [ libxml2 libffi ] ++ optional enablePFM libpfm; # exegesis - propagatedBuildInputs = [ ncurses zlib ]; + propagatedBuildInputs = optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ ncurses ] + ++ [ zlib ]; patches = [ ./gnu-install-dirs.patch diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix index d6bfd07d444e..2fac661b58a1 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , cmake , python3 @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; homepage = "https://llvm.org/"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ acowley lovesegfault ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch b/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch new file mode 100644 index 000000000000..3cc12b94b200 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch @@ -0,0 +1,33 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff7..b64eb4246 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $<TARGET_FILE:${libname}> +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + install(TARGETS ${libname} + ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} +2.14.1 + diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix new file mode 100644 index 000000000000..cd277f5149d9 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix @@ -0,0 +1,65 @@ +{ stdenv, lib, version, src, cmake, python3, llvm, libcxxabi }: +stdenv.mkDerivation rec { + pname = "compiler-rt"; + inherit version src; + + nativeBuildInputs = [ cmake python3 llvm ]; + + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCMAKE_C_FLAGS=-nodefaultlibs" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ]; + + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + ''; + + # Hack around weird upsream RPATH bug + postInstall = '' + ln -s "$out/lib"/*/* "$out/lib" + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "ROCm fork of the LLVM Compiler runtime libraries"; + homepage = "https://github.com/RadeonOpenCompute/llvm-project"; + license = licenses.ncsa; + maintainers = with maintainers; [ acowley lovesegfault ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 581d05746718..3497f910d6dc 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ -{ lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith }: +{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-DlId/dF5r0ULl2omYPCyu1Ic3XKlLL7ndiCA0RaF264="; + hash = "sha256-7XVtHcrTpw+NYUvuKQFWWFE0FlOTt8EnfZpvepQqE1c="; }; in rec { clang = wrapCCWith rec { @@ -15,8 +15,25 @@ in rec { clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${lib.getLib cc}/lib/clang/$clang_version/include" "$rsrc" + ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" + ln -s "${compiler-rt}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags + echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + rm $out/nix-support/add-hardening.sh + touch $out/nix-support/add-hardening.sh + ''; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = clang-unwrapped; + extraBuildCommands = '' + clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags rm $out/nix-support/add-hardening.sh touch $out/nix-support/add-hardening.sh @@ -28,10 +45,15 @@ in rec { src = "${src}/clang"; }; - lld = callPackage ./lld { + compiler-rt = callPackage ./compiler-rt { + inherit version llvm; + src = "${src}/compiler-rt"; + stdenv = overrideCC stdenv clangNoCompilerRt; + }; + + lld = callPackage ./lld.nix { inherit llvm version; src = "${src}/lld"; - buildLlvmTools = buildPackages.llvmPackages_rocm; }; llvm = callPackage ./llvm { diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix index c8ca83f76c12..2e3e1ca13d43 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix @@ -1,5 +1,5 @@ -{ lib, stdenv -, buildLlvmTools +{ stdenv +, lib , cmake , libxml2 , llvm @@ -14,18 +14,13 @@ stdenv.mkDerivation rec { pname = "lld"; nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 llvm ]; - - cmakeFlags = [ - "-DLLVM_MAIN_SRC_DIR=${llvm.src}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DLLVM_CONFIG_PATH=${llvm.dev}/bin/llvm-config-native" - ]; + buildInputs = [ libxml2 llvm ]; outputs = [ "out" "dev" ]; + cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ]; + postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" @@ -39,7 +34,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the LLVM Linker"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = licenses.ncsa; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ acowley lovesegfault ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix index 6d1ff664972d..129cc69bf6dc 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, writeScript , cmake , python3 , libxml2 @@ -87,11 +89,28 @@ in stdenv.mkDerivation rec { passthru.src = src; + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github + + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)" + if [[ "$version" != "$current_version" ]]; then + tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")" + tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" + sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \ + -e 's,version = "\(.*\)",version = "'"$version"'",' \ + -e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",' + else + echo rocm-llvm already up-to-date + fi + ''; + meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ acowley lovesegfault ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/compilers/miranda/default.nix b/nixpkgs/pkgs/development/compilers/miranda/default.nix index 5de16633ed7d..7b29699f151d 100644 --- a/nixpkgs/pkgs/development/compilers/miranda/default.nix +++ b/nixpkgs/pkgs/development/compilers/miranda/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ siraben ]; platforms = platforms.all; + mainProgram = "mira"; }; } diff --git a/nixpkgs/pkgs/development/compilers/sbcl/2.1.8.nix b/nixpkgs/pkgs/development/compilers/sbcl/2.1.8.nix new file mode 100644 index 000000000000..3c450f1ba196 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/sbcl/2.1.8.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "2.1.8"; + sha256 = "0ijmw8adyf6fgaq4ixdj9v5lfg3cs9wyxhb96wxhfld0rjpppsm3"; +} diff --git a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index cb4cf580a0e9..d53d1426a94b 100644 --- a/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -34,7 +34,7 @@ }: let - version = "8.3.9"; + version = "8.3.29"; packInstall = swiplPath: pack: ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." ''; @@ -47,7 +47,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl-devel"; rev = "V${version}"; - sha256 = "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz"; + sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU="; fetchSubmodules = true; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation { homepage = "https://www.swi-prolog.org"; description = "A Prolog compiler and interpreter"; license = lib.licenses.bsd2; - + mainProgram = "swipl"; platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin; maintainers = [ lib.maintainers.meditans ]; }; diff --git a/nixpkgs/pkgs/development/compilers/zig/default.nix b/nixpkgs/pkgs/development/compilers/zig/default.nix index 60ca574f1ccb..385b68a79291 100644 --- a/nixpkgs/pkgs/development/compilers/zig/default.nix +++ b/nixpkgs/pkgs/development/compilers/zig/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "zig"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - hash = "sha256-bILjcKX8jPl2n1HRYvYRb7jJkobwqmSJ+hHXSn9n2ag="; + hash = "sha256-zMSOH8ZWcvzHRwOgGIbLO9Q6jf1P5QL5KCMD+frp+JA="; }; nativeBuildInputs = [ @@ -51,8 +51,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ andrewrk AndersonTorres ]; platforms = platforms.unix; - # See https://github.com/NixOS/nixpkgs/issues/86299 - broken = stdenv.isDarwin; + broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299 }; } diff --git a/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/nixpkgs/pkgs/development/coq-modules/corn/default.nix index 6a3ea81ca0d5..ee4a39dbd5e5 100644 --- a/nixpkgs/pkgs/development/coq-modules/corn/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/corn/default.nix @@ -5,13 +5,12 @@ with lib; mkCoqDerivation rec { inherit version; defaultVersion = switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } - { case = (versions.range "8.7" "8.12"); out = "8.12.0"; } - { case = (versions.range "8.13" "8.13"); out = "c366d3f01ec1812b145117a4da940518b092d3a6"; } + { case = (versions.range "8.7" "8.13"); out = "8.13.0"; } ] null; release = { "8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; "8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi"; - "c366d3f01ec1812b145117a4da940518b092d3a6".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b"; + "8.13.0".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b"; }; preConfigure = "patchShebangs ./configure.sh"; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix index b06f057f82e4..76a5a84cc233 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -8,6 +8,7 @@ let mca = mkCoqDerivation { pname = "analysis"; owner = "math-comp"; + release."0.3.10".sha256 = "sha256-FBH2c8QRibq5Ycw/ieB8mZl0fDiPrYdIzZ6W/A3pIhI="; release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4="; release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c"; @@ -17,7 +18,7 @@ let mca = mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.9"; } + { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.10"; } { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } diff --git a/nixpkgs/pkgs/development/haskell-modules/HACKING.md b/nixpkgs/pkgs/development/haskell-modules/HACKING.md index 9024a90a09da..b53fa3d73e06 100644 --- a/nixpkgs/pkgs/development/haskell-modules/HACKING.md +++ b/nixpkgs/pkgs/development/haskell-modules/HACKING.md @@ -75,7 +75,7 @@ The short version is this: --- -This is the follow-up to #TODO. +This is the follow-up to #TODO. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions. ``` Make sure to replace all TODO with the actual values. diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 069b90f04372..44a958295a13 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0kcsb5kqyx256fp1bj3y0x6k3286j4cykrx0yr4k3vvb3maakf7k"; + sha256 = "1022ff2x9jvi2a0820lbgmmh54cxh1vbn0qfdwr50w7ggvjp88i6"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -1112,34 +1112,13 @@ self: super: { # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; - # Jailbreak due to bounds on multiple dependencies, - # bound on pandoc needs to be patched since it is conditional - hakyll = doJailbreak (overrideCabal super.hakyll (drv: { - patches = [ - # Remove when Hakyll > 4.14.0.0 - (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246.patch"; - sha256 = "sha256-YyRz3bAmIBODTEeS5kGl2J2x31SjiPoLzUZUlo3nHvQ="; - }) - # Remove when Hakyll > 4.14.0.0 - (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch"; - sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44="; - }) - # Remove when Hakyll > 4.14.0.0 - (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/commit/e0c63558a82ac4347181d5d77dce7f763a1db410.patch"; - sha256 = "sha256-wYlxJmq56YQ29vpVsQhO+JdL0GBezCAfkdhIdFnLYsc="; - }) - ]; - })); - # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; + cabal-install-parsers_0_4_2 = dontCheck super.cabal-install-parsers_0_4_2; # 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage. gitit = doJailbreak super.gitit; @@ -1785,8 +1764,11 @@ self: super: { # 2021-05-09 haskell-ci pins ShellCheck 0.7.1 # https://github.com/haskell-CI/haskell-ci/issues/507 + # 2021-09-05 haskell-ci needs Cabal 3.4, + # cabal-install-parsers uses Cabal 3.6 since 0.4.3 haskell-ci = super.haskell-ci.override { ShellCheck = self.ShellCheck_0_7_1; + cabal-install-parsers = self.cabal-install-parsers_0_4_2; }; Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: { @@ -1944,18 +1926,12 @@ EOT Cabal = self.Cabal_3_6_0_0; }; - # ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6 - ghc-api-compat = doJailbreak super.ghc-api-compat; - # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; - distribution-nixpkgs = assert super.distribution-nixpkgs.version == "1.6.0"; - overrideCabal super.distribution-nixpkgs { - version = "1.6.1"; - revision = null; - sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm"; - editedCabalFile = null; - }; + # 2021-09-06: hadolint depends on language-docker >= 10.1 + hadolint = super.hadolint.override { + language-docker = self.language-docker_10_1_1; + }; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5ef659349b38..6a7ad8a0492a 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -48,8 +48,13 @@ self: super: { base16-bytestring = self.base16-bytestring_0_1_1_7; }); - # cabal-install-parsers is written for Cabal 3.4 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; }; + # cabal-install-parsers is written for Cabal 3.6 + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; }; + + # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 + cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { + Cabal = self.Cabal_3_4_0_0; + }; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 08431ee0dd39..bb8a1ce29711 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -99,7 +99,7 @@ self: super: { darcs = dontDistribute super.darcs; # The package needs the latest Cabal version. - cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_0_0; }); # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; @@ -129,5 +129,5 @@ self: super: { # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers vector = dontCheck super.vector; - ghc-api-compat = super.ghc-api-compat_8_6; + ghc-api-compat = doDistribute super.ghc-api-compat_8_6; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 20c64dbbccf9..38926d352874 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -106,10 +106,13 @@ self: super: { retry = dontCheck super.retry; # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage - hlint = super.hlint_3_3_1.overrideScope (self: super: { + hlint = super.hlint_3_3_4.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { doHaddock = false; }; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; }); + + # pick right version for compiler + ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index f549dfbce1ad..4ae21181e8ca 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -43,6 +43,9 @@ self: super: { unix = null; xhtml = null; + # 0.12.0 introduces support for 9.2 + base-compat = self.base-compat_0_12_0; + # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; @@ -106,7 +109,7 @@ self: super: { retry = dontCheck super.retry; # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage - hlint = super.hlint_3_3_1.overrideScope (self: super: { + hlint = super.hlint_3_3_4.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { doHaddock = false; }; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 8a13571f0a17..12832210fa81 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1105,6 +1105,7 @@ broken-packages: - docvim - dominion - domplate + - dormouse-uri - do-spaces - dotfs - dot-linker @@ -1586,6 +1587,7 @@ broken-packages: - getflag - GGg - ggtsTC + - ghc-bignum-orphans - ghc-clippy-plugin - ghc-core-smallstep - ghc-datasize @@ -2536,7 +2538,6 @@ broken-packages: - IsNull - iso8601-duration - isobmff - - isocline - isotope - itcli - itemfield @@ -2656,6 +2657,7 @@ broken-packages: - KSP - ktx - ktx-codec + - kubernetes-client - kuifje - kure - kure-your-boilerplate @@ -2664,7 +2666,6 @@ broken-packages: - lagrangian - lambda2js - lambdaBase - - lambdabot-social-plugins - lambdabot-utils - lambda-bridge - lambda-canvas @@ -2718,6 +2719,7 @@ broken-packages: - layers - layout - layout-bootstrap + - lazify - lazyarray - lazyboy - lazy-priority-queue @@ -3110,6 +3112,7 @@ broken-packages: - monopati - months - monus + - monus-weighted-search - monzo - morfette - morfeusz @@ -3196,6 +3199,7 @@ broken-packages: - nanomsg-haskell - nanoparsec - NanoProlog + - nanovg-simple - nanq - naperian - naqsha @@ -3588,9 +3592,11 @@ broken-packages: - phoityne - phone-numbers - phone-push + - phonetic-languages-plus - phonetic-languages-properties - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double + - phonetic-languages-ukrainian-array - phraskell - Phsu - phybin @@ -3800,6 +3806,7 @@ broken-packages: - provenience - proxy-kindness - proxy-mapping + - prune-juice - pseudo-trie - PTQ - publicsuffixlistcreate @@ -4194,6 +4201,7 @@ broken-packages: - servant-auth-hmac - servant-auth-token-api - servant-avro + - servant-benchmark - servant-client-js - servant-db - servant-dhall @@ -5038,7 +5046,6 @@ broken-packages: - urldecode - url-decoders - urldisp-happstack - - urlencoded - url-generic - urn - urn-random @@ -5212,6 +5219,7 @@ broken-packages: - weighted-regexp - welshy - werewolf + - wgpu-hs - Wheb - while-lang-parser - whim diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7637972c07fd..022e8f74f233 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -92,6 +92,10 @@ default-package-overrides: - streamly-process # dhall-nix is not part of stackage, remove if dhall >= 1.40 - dhall-nix < 1.1.22 + # reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0 + - reflex-dom-pandoc < 1.0.0.0 + # 2021-09-07: pin to our current GHC version + - ghc-api-compat == 8.10.7 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -119,7 +123,8 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - - ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5 + - cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6 + - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 package-maintainers: abbradar: @@ -240,6 +245,8 @@ package-maintainers: - streamly - taskwarrior - witch + ncfavier: + - lambdabot pacien: - ldgallery-compiler peti: diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index cb8c927bad33..a39665e2d6a0 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.7 +# Stackage LTS 18.9 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -140,7 +140,7 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.22.0 - - amqp-utils ==0.6.1.1 + - amqp-utils ==0.6.2.2 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.11 - ansi-wl-pprint ==0.6.9 @@ -224,7 +224,7 @@ default-package-overrides: - base-compat ==0.11.2 - base-compat-batteries ==0.11.2 - basement ==0.0.12 - - base-orphans ==0.8.4 + - base-orphans ==0.8.5 - base-prelude ==1.4 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 @@ -276,7 +276,7 @@ default-package-overrides: - blaze-html ==0.9.1.2 - blaze-markup ==0.8.2.8 - blaze-svg ==0.3.6.1 - - blaze-textual ==0.2.1.0 + - blaze-textual ==0.2.2.1 - bmp ==1.2.6.3 - BNFC ==2.9.2 - BNFC-meta ==0.6.1 @@ -480,8 +480,8 @@ default-package-overrides: - convertible ==1.1.1.0 - cookie ==0.4.5 - core-data ==0.2.1.9 - - core-program ==0.2.7.1 - - core-text ==0.3.0.0 + - core-program ==0.2.9.1 + - core-text ==0.3.2.0 - countable ==1.0 - country ==0.2.1 - cpphs ==1.20.9.1 @@ -491,7 +491,7 @@ default-package-overrides: - crackNum ==3.1 - crc32c ==0.0.0 - credential-store ==0.1.2 - - criterion ==1.5.9.0 + - criterion ==1.5.10.0 - criterion-measurement ==0.1.3.0 - cron ==0.7.0 - crypto-api ==0.13.3 @@ -596,7 +596,7 @@ default-package-overrides: - dhall ==1.39.0 - dhall-bash ==1.0.37 - dhall-json ==1.7.7 - - dhall-lsp-server ==1.0.15 + - dhall-lsp-server ==1.0.16 - dhall-yaml ==1.2.7 - diagrams-solve ==0.1.3 - dialogflow-fulfillment ==0.1.1.4 @@ -615,7 +615,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.9 + - dl-fedora ==0.9.1 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -705,7 +705,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.2.1 + - esqueleto ==3.5.2.2 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -757,7 +757,7 @@ default-package-overrides: - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 - fgl ==5.7.0.3 - - file-embed ==0.0.14.0 + - file-embed ==0.0.15.0 - file-embed-lzma ==0 - filelock ==0.1.1.5 - filemanip ==0.3.6.3 @@ -841,7 +841,7 @@ default-package-overrides: - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.0 - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.14 + - generic-deriving ==1.14.1 - generic-functor ==0.2.0.0 - generic-lens ==2.1.0.0 - generic-lens-core ==2.1.0.0 @@ -885,20 +885,20 @@ default-package-overrides: - geojson ==4.0.2 - getopt-generics ==0.13.0.4 - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.5 + - ghc-check ==0.5.0.6 - ghc-core ==0.5.6 - ghc-events ==0.17.0 - ghc-exactprint ==0.6.4 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.6.20210814 - - ghc-lib-parser ==8.10.6.20210814 - - ghc-lib-parser-ex ==8.10.0.22 + - ghc-lib ==8.10.7.20210828 + - ghc-lib-parser ==8.10.7.20210828 + - ghc-lib-parser-ex ==8.10.0.23 - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.9 - - ghc-source-gen ==0.4.1.0 + - ghc-source-gen ==0.4.2.0 - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4.2 - ghc-trace-events ==0.1.2.3 @@ -1040,7 +1040,7 @@ default-package-overrides: - hgeometry-combinatorial ==0.12.0.3 - hgrev ==0.2.6 - hidapi ==0.1.7 - - hie-bios ==0.7.5 + - hie-bios ==0.7.6 - hi-file-parser ==0.1.2.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 @@ -1071,7 +1071,7 @@ default-package-overrides: - hmpfr ==0.4.4 - hnock ==0.4.0 - hoauth2 ==1.16.0 - - hoogle ==5.0.18.1 + - hoogle ==5.0.18.2 - hOpenPGP ==2.9.5 - hopenpgp-tools ==0.23.6 - hopenssl ==2.2.4 @@ -1135,7 +1135,7 @@ default-package-overrides: - hspec-wai-json ==0.11.0 - hs-php-session ==0.0.9.3 - hsshellscript ==3.5.0 - - hs-tags ==0.1.5 + - hs-tags ==0.1.5.1 - HStringTemplate ==0.8.8 - HSvm ==0.1.1.3.22 - HsYAML ==0.2.1.0 @@ -1155,7 +1155,7 @@ default-package-overrides: - http-client-openssl ==0.3.2.0 - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.5.3 - - http-common ==0.8.2.1 + - http-common ==0.8.3.4 - http-conduit ==2.3.8 - http-date ==0.0.11 - http-directory ==0.1.8 @@ -1165,7 +1165,7 @@ default-package-overrides: - http-media ==0.8.0.0 - http-query ==0.1.0.1 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.8.1 + - http-streams ==0.8.9.4 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 @@ -1248,11 +1248,11 @@ default-package-overrides: - inliterate ==0.1.0 - input-parsers ==0.2.3 - insert-ordered-containers ==0.2.5 - - inspection-testing ==0.4.5.0 + - inspection-testing ==0.4.6.0 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3.1 - - integer-roots ==1.0 + - integer-roots ==1.0.0.1 - integration ==0.2.1 - intern ==0.9.4 - interpolate ==0.2.1 @@ -1404,7 +1404,7 @@ default-package-overrides: - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 - - ListLike ==4.7.4 + - ListLike ==4.7.6 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==1.0.0.5 @@ -1639,7 +1639,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.1 + - nonempty-containers ==0.3.4.3 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 @@ -1701,7 +1701,7 @@ default-package-overrides: - optional-args ==1.0.2 - options ==1.2.1.1 - optparse-applicative ==0.16.1.0 - - optparse-generic ==1.4.4 + - optparse-generic ==1.4.5 - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 @@ -1762,9 +1762,9 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.13.1.1 + - persistent ==2.13.1.2 - persistent-mtl ==0.2.2.0 - - persistent-mysql ==2.13.0.1 + - persistent-mysql ==2.13.0.2 - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.13.0.3 - persistent-qq ==2.12.0.1 @@ -1818,7 +1818,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4 + - postgresql-binary ==0.12.4.1 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-orm ==0.5.1 @@ -1865,7 +1865,7 @@ default-package-overrides: - project-template ==0.2.1.0 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - - prometheus-metrics-ghc ==1.0.1.1 + - prometheus-metrics-ghc ==1.0.1.2 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 @@ -1950,7 +1950,7 @@ default-package-overrides: - reanimate ==1.1.4.0 - reanimate-svg ==0.13.0.1 - rebase ==1.13.0.1 - - record-dot-preprocessor ==0.2.11 + - record-dot-preprocessor ==0.2.12 - record-hasfield ==1.0 - records-sop ==0.1.1.0 - record-wrangler ==0.1.1.0 @@ -2035,7 +2035,7 @@ default-package-overrides: - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - safe-json ==1.1.1.1 - - safe-money ==0.9 + - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - safe-tensor ==0.2.1.1 - saltine ==0.1.1.1 @@ -2077,7 +2077,7 @@ default-package-overrides: - semialign-optics ==1.1 - semigroupoid-extras ==5 - semigroupoids ==5.3.5 - - semigroups ==0.19.1 + - semigroups ==0.19.2 - semirings ==0.6 - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 @@ -2237,7 +2237,7 @@ default-package-overrides: - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - stm-lifted ==2.5.0.0 - - STMonadTrans ==0.4.5 + - STMonadTrans ==0.4.6 - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 @@ -2318,7 +2318,7 @@ default-package-overrides: - tar ==0.5.1.1 - tar-conduit ==0.3.2 - tardis ==0.4.3.0 - - tasty ==1.4.1 + - tasty ==1.4.2 - tasty-ant-xml ==1.1.8 - tasty-bench ==0.2.5 - tasty-dejafu ==2.0.0.8 @@ -2373,20 +2373,20 @@ default-package-overrides: - text-ldap ==0.1.1.13 - textlocal ==0.1.0.5 - text-manipulate ==0.3.0.0 - - text-metrics ==0.3.0 + - text-metrics ==0.3.1 - text-postgresql ==0.0.3.1 - text-printer ==0.5.0.1 - text-regex-replace ==0.1.1.4 - text-region ==0.3.1.0 - text-short ==0.1.3 - - text-show ==3.9 + - text-show ==3.9.2 - text-show-instances ==3.8.4 - text-zipper ==0.11 - tfp ==1.0.2 - tf-random ==0.5 - - th-abstraction ==0.4.2.0 + - th-abstraction ==0.4.3.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1.2 + - th-compat ==0.1.3 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 @@ -2400,7 +2400,7 @@ default-package-overrides: - th-lift ==0.8.2 - th-lift-instances ==0.1.18 - th-nowq ==0.1.0.5 - - th-orphans ==0.13.11 + - th-orphans ==0.13.12 - th-printf ==0.7 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 @@ -2459,7 +2459,7 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.1.0.1 + - ttc ==1.1.0.2 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 @@ -2527,7 +2527,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.19 + - unliftio ==0.2.20 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2602,7 +2602,7 @@ default-package-overrides: - wai-middleware-auth ==0.2.5.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 - - wai-middleware-prometheus ==1.0.0 + - wai-middleware-prometheus ==1.0.0.1 - wai-middleware-static ==0.9.0 - wai-rate-limit ==0.1.0.0 - wai-rate-limit-redis ==0.1.0.0 @@ -2630,7 +2630,6 @@ default-package-overrides: - wikicfp-scraper ==0.1.0.12 - wild-bind ==0.1.2.7 - wild-bind-x11 ==0.2.0.13 - - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.3.4.0 diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d44ef0dafcc8..fe7d2b7663d6 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -966,10 +966,10 @@ dont-distribute-packages: - dmenu-pmount - dmenu-search - doc-review - - doi - domain - domain-core - domain-optics + - dormouse-client - dow - download-media-content - dph-examples @@ -979,6 +979,7 @@ dont-distribute-packages: - dph-prim-interface - dph-prim-par - dph-prim-seq + - dprox - dropbox-sdk - dropsolve - dsh-sql @@ -1123,6 +1124,7 @@ dont-distribute-packages: - formlets-hsp - forth-hll - fortran-src-extras + - fortran-vars - foscam-directory - foscam-sort - fp-ieee @@ -1232,6 +1234,7 @@ dont-distribute-packages: - gnss-converters - gnuidn - goal-geometry + - goal-graphical - goal-probability - goal-simulation - goat @@ -1698,6 +1701,7 @@ dont-distribute-packages: - ideas-math - ideas-math-types - ideas-statistics + - if-instance - ige-mac-integration - ihaskell-inline-r - ihaskell-rlangqq @@ -1865,8 +1869,6 @@ dont-distribute-packages: - lambda-options - lambdaFeed - lambdaLit - - lambdabot - - lambdabot-xmpp - lambdabot-zulip - lambdacms-media - lambdacube @@ -1905,6 +1907,7 @@ dont-distribute-packages: - layouting - lazy-hash - lazy-hash-cache + - ldap-scim-bridge - ldapply - leaky - lean @@ -2302,6 +2305,10 @@ dont-distribute-packages: - peyotls-codec - pgsql-simple - phonetic-languages-examples + - phonetic-languages-general + - phonetic-languages-simplified-examples-array + - phonetic-languages-simplified-examples-common + - phonetic-languages-simplified-generalized-examples-array - phonetic-languages-simplified-lists-examples - phooey - photoname @@ -3190,7 +3197,6 @@ dont-distribute-packages: - wheb-strapped - whitespace - wikipedia4epub - - windowslive - winio - wl-pprint-ansiterm - wl-pprint-terminfo diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 3553b4fe6a13..1f15b4cdda7c 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -950,4 +950,8 @@ self: super: builtins.intersectAttrs super { }) ) ); + + # Test suite is just the default example executable which doesn't work if not + # executed by Setup.hs, but works if started on a proper TTY + isocline = dontCheck super.isocline; } diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 22c4b4143c89..ca8c0c141687 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -11590,8 +11590,8 @@ self: { }: mkDerivation { pname = "Jikka"; - version = "5.3.0.0"; - sha256 = "0njy5mgzbpvqdqp343a7bh69sdrmvfd57skr3qwma7dya5m12v2r"; + version = "5.5.0.0"; + sha256 = "0z1000arwm0m6kl4nhwwq0iy1xwk1aml5q1lxrdsrhqq840q3x65"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -11795,8 +11795,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "6"; - editedCabalFile = "0np8wqf0s0pwqnjfhs8zw9h133p2x173xbv984c4dn5a1xhn0azq"; + revision = "7"; + editedCabalFile = "12ylqc5xi7jhgdsq8dbxm4v6llbi1km78zam962052b5s81d00qw"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -12715,8 +12715,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.4"; - sha256 = "170yrz008ya4haj0i8z1c7ydjg8hcw3i9cqs6abainh8zxvc1lqi"; + version = "4.7.6"; + sha256 = "08jip0q2f9qc95wcqka2lrqpf8r7sswsi5104w73kyrbmfirqnrd"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -17765,22 +17765,6 @@ self: { }: mkDerivation { pname = "STMonadTrans"; - version = "0.4.5"; - sha256 = "0kly2zjizk8m84jzmkd93h6qpqgb03i4cjhm9q7rzr284qn5x09m"; - libraryHaskellDepends = [ array base mtl ]; - testHaskellDepends = [ - array base tasty tasty-hunit tasty-quickcheck transformers - ]; - description = "A monad transformer version of the ST monad"; - license = lib.licenses.bsd3; - }) {}; - - "STMonadTrans_0_4_6" = callPackage - ({ mkDerivation, array, base, mtl, tasty, tasty-hunit - , tasty-quickcheck, transformers - }: - mkDerivation { - pname = "STMonadTrans"; version = "0.4.6"; sha256 = "0rvhh0hhwz601ibpzisry7xf3j61r5sxfgp47imaa37i5bvrlynb"; libraryHaskellDepends = [ array base mtl ]; @@ -17789,7 +17773,6 @@ self: { ]; description = "A monad transformer version of the ST monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "SVD2HS" = callPackage @@ -21182,19 +21165,6 @@ self: { ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.6.1.0"; - sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; - revision = "1"; - editedCabalFile = "1ia6dk2fvxg3gzqdmcypdka6fcnnrza23hq1rhslj53jy3qzs3kn"; - description = "A binding to part of the Win32 library"; - license = lib.licenses.bsd3; - platforms = lib.platforms.none; - }) {}; - - "Win32_2_12_0_1" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "Win32"; version = "2.12.0.1"; sha256 = "1nivdwjp9x9i64xg8gf3xj8khm9dfq6n5m8kvvlhz7i7ypl4mv72"; description = "A binding to Windows Win32 API"; @@ -24408,8 +24378,8 @@ self: { pname = "aeson"; version = "1.5.6.0"; sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; - revision = "1"; - editedCabalFile = "1y7ddmghsjblsxaj1wyif66wrw0vvp2dca5i7v9rqk33z1r6iryk"; + revision = "2"; + editedCabalFile = "1zxkarvmbgc2cpcc9sx1rlqm7nfh473052898ypiwk8azawp1hbj"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -24564,8 +24534,8 @@ self: { pname = "aeson-compat"; version = "0.3.9"; sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0"; - revision = "6"; - editedCabalFile = "18ni5j2zvn7qfdama9j1s84kz9ylsnjmi5ynbq68mpri5wimm448"; + revision = "7"; + editedCabalFile = "15aflmqs5y0yg2p4042yvnhxyp11ndlihs1dxj21bxfdzd1bbkrn"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -24691,8 +24661,8 @@ self: { pname = "aeson-extra"; version = "0.5"; sha256 = "0nlp6bwb8zynfncfzr05fi9acfs8n2fkz4anm2c0g97dk2ziq213"; - revision = "1"; - editedCabalFile = "1x1fh0zgb0y3w7wf94zznbmdmbxs0b5n7prfw324g3kzhi428s3d"; + revision = "2"; + editedCabalFile = "02c6rjwm8dyijfcj2wvhx1s9pd3d37g9yqgih4x80na533naps31"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions hashable parsec @@ -24961,8 +24931,8 @@ self: { pname = "aeson-optics"; version = "1.1.0.1"; sha256 = "1pfi84cl7w5bp7dwdhcyi8kchvbfjybqcp0sifqrn70dj2b50mf7"; - revision = "5"; - editedCabalFile = "102mdf74ka25qnw45282j7c4ds3v4mppa3g1mp1hr0hf0f2ya3bk"; + revision = "6"; + editedCabalFile = "1id12jhwlgx1gckxjzap4rm3n495fm57ja47gas5r8v2j5ky8lic"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring optics-core optics-extra scientific text unordered-containers vector @@ -29823,19 +29793,19 @@ self: { "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, directory, hinotify, magic, network, process - , text, time, tls, unix, utf8-string, x509-system + , data-default-class, directory, filepath, hinotify, magic, network + , process, text, time, tls, unix, utf8-string, x509-system }: mkDerivation { pname = "amqp-utils"; - version = "0.6.1.1"; - sha256 = "1lffc76ybvk73k57qn5m6788m2nkfsqavs7mfs1kaqw38pya940c"; + version = "0.6.2.2"; + sha256 = "03hc962z1q9gpaa7955y71wyzh1gaazrfcpw8wzacll3p28fdnpx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ amqp base bytestring connection containers data-default-class - directory hinotify magic network process text time tls unix - utf8-string x509-system + directory filepath hinotify magic network process text time tls + unix utf8-string x509-system ]; description = "AMQP toolset for the command line"; license = lib.licenses.gpl3Only; @@ -32940,6 +32910,8 @@ self: { pname = "arithmetic-circuits"; version = "0.2.0"; sha256 = "09fqcg8302dklzlr3fqlac09zzfws3li45nri4cd886cx8b1vzzq"; + revision = "2"; + editedCabalFile = "0386y15pncrafpvm5k10ipxhx09vbkjl3yj9z3895j5n1bpdn7f4"; libraryHaskellDepends = [ aeson base bulletproofs containers elliptic-curve filepath galois-fft galois-field MonadRandom poly process-extras protolude @@ -32974,6 +32946,8 @@ self: { pname = "arithmoi"; version = "0.12.0.0"; sha256 = "1lghgr4z2vhafj8d8971pdghih6r5qq5xlc0b87jmazyhzz95w3f"; + revision = "1"; + editedCabalFile = "1b08p18k41sm298rn1z5ljs1l6s74nddm4fpdgix3npl8wsmmxgq"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -32994,6 +32968,37 @@ self: { license = lib.licenses.mit; }) {}; + "arithmoi_0_12_0_1" = callPackage + ({ mkDerivation, array, base, chimera, constraints, containers + , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots + , mod, QuickCheck, quickcheck-classes, random, semirings + , smallcheck, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , tasty-rerun, tasty-smallcheck, transformers, vector + }: + mkDerivation { + pname = "arithmoi"; + version = "0.12.0.1"; + sha256 = "1dsa0fw6z6b6gcsw23j08qayqyh2icya7gmb4v4r0adszr2p7ziz"; + configureFlags = [ "-f-llvm" ]; + libraryHaskellDepends = [ + array base chimera constraints containers deepseq exact-pi + integer-gmp integer-logarithms integer-roots mod random semirings + transformers vector + ]; + testHaskellDepends = [ + base containers exact-pi integer-gmp integer-roots mod QuickCheck + quickcheck-classes random semirings smallcheck tasty tasty-hunit + tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector + ]; + benchmarkHaskellDepends = [ + array base constraints containers deepseq integer-logarithms mod + random semirings tasty-bench vector + ]; + description = "Efficient basic number-theoretic functions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "arity-generic-liftA" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -35065,6 +35070,19 @@ self: { broken = true; }) {}; + "attenuation" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "attenuation"; + version = "0.1.0.0"; + sha256 = "0swiqnh34654rljydbd91nbkpgi1x816b7y3f57i4qnync29nsd0"; + revision = "1"; + editedCabalFile = "1bh0ydj5fywx8zcgvfb40092jb09njj2kk09kg7gfvq2fvpz5whr"; + libraryHaskellDepends = [ base profunctors ]; + description = "Representational subtyping relations and variance roles"; + license = lib.licenses.asl20; + }) {}; + "attic-schedule" = callPackage ({ mkDerivation, attoparsec, base, control-bool, doctest, foldl , protolude, system-filepath, text, time, turtle @@ -35319,8 +35337,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.0.2.0"; sha256 = "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582"; - revision = "1"; - editedCabalFile = "1c43ynmjfljp3nsp67521nrnb0d4vzwr33dfqf15xh02gifcf9ma"; + revision = "2"; + editedCabalFile = "18557xy5gvkhj0sb35wwxmhqirkiqrkwm0y0pqygsr0aimccs5zm"; libraryHaskellDepends = [ attoparsec base base-compat-batteries text time time-compat ]; @@ -38216,6 +38234,18 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat_0_12_0" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.12.0"; + sha256 = "1fb8lszh8bc4158bc3lyhzakjsjx5l7sa3598zg0zzcrnzb75axp"; + libraryHaskellDepends = [ base unix ]; + description = "A compatibility layer for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-batteries" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover , QuickCheck @@ -38231,6 +38261,24 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat-batteries_0_12_0" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.12.0"; + sha256 = "02j5v1xcj383nfjg1r3y0py4ahy8mhigkkabqvij5a5lfdbalkfs"; + revision = "1"; + editedCabalFile = "17wd527f6ssylwg81f51s45mpp2k3b3zb0j5a6xd6z682x2pj97b"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -38321,8 +38369,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.8.4"; - sha256 = "1cxvjcyy0vsg21n85gxal03gfprw75vjd1h9sni00d60as9vbcip"; + version = "0.8.5"; + sha256 = "1lw1jhrrsdq7x9wr2bwkxq9mscidcad0n30kh9gfk8kgifl5xh9k"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -38688,8 +38736,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "8"; - editedCabalFile = "196m1ylkl9d03iymld08fhfnfcdydzd824v7ffl67ijmfxcvzcyn"; + revision = "9"; + editedCabalFile = "003vi0psr8s5whjy1qw43swiw1g1l1mxa962xqz9fdpxbmvlanfy"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -39649,8 +39697,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.1.2"; - sha256 = "0jqb1jn6jdrg6pm80zhd86rwsa05rxn0675lxv0m8c2z07g5601c"; + version = "0.13.1.3"; + sha256 = "1qycifi7gnfky4pxy3dr7az0iv2s2xykjy4mccy8gki05fsy0lg5"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; @@ -39973,8 +40021,8 @@ self: { }: mkDerivation { pname = "bencoding"; - version = "0.4.5.2"; - sha256 = "1q0v56jj5vdhd5qgs8kwnbnb4wz84bn7ghnki8c36k6hsm1f56kq"; + version = "0.4.5.3"; + sha256 = "0sj69g4a68bv43vgmqdgp2nzi30gzp4lgz78hg1rdhind8lxrvp9"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty text @@ -42508,8 +42556,8 @@ self: { }: mkDerivation { pname = "bisc"; - version = "0.3.0.0"; - sha256 = "097b25pp6pi7rq4xhk19g1i5v7v9hyx7ldyq0y3aj1cm50s2356m"; + version = "0.3.1.0"; + sha256 = "0d0n3dmdfh4dxnxa8pdvdh4fhlhpdal4fixbjk2ignmf6ghm54qk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42602,33 +42650,32 @@ self: { }) {}; "bishbosh" = callPackage - ({ mkDerivation, array, base, Cabal, containers, data-default - , deepseq, directory, extra, factory, filepath, HUnit, hxt - , hxt-relaxng, mtl, parallel, polyparse, QuickCheck, random, time - , toolshed, unix + ({ mkDerivation, array, base, containers, data-default, deepseq + , directory, extra, factory, filepath, HUnit, hxt, hxt-relaxng, mtl + , parallel, polyparse, process, QuickCheck, random, time, toolshed + , unix }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.8"; - sha256 = "0mk0mki02m8nvk667wbrk954qnb6qxdfzyz10bfcyvfbz1afg702"; + version = "0.1.0.0"; + sha256 = "0hri2bkydcffs2d9xjsr1gc16rl75g4vymjvgd8gr35p01zdc9mq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base Cabal containers data-default deepseq extra factory - filepath hxt mtl parallel polyparse random time toolshed + array base containers data-default deepseq extra factory filepath + hxt mtl parallel polyparse process random time toolshed ]; executableHaskellDepends = [ - array base Cabal containers data-default deepseq directory extra - factory filepath hxt hxt-relaxng mtl parallel polyparse random time - toolshed unix + array base containers data-default deepseq directory extra factory + filepath hxt hxt-relaxng mtl process random time toolshed unix ]; testHaskellDepends = [ - array base Cabal containers data-default extra filepath HUnit hxt + array base containers data-default deepseq extra filepath HUnit hxt mtl polyparse QuickCheck random toolshed ]; description = "Plays chess"; - license = "GPL"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43696,8 +43743,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "2"; - editedCabalFile = "00nv87d38agrnqp1bhlk5id78r23k2fk7pqnar1lzg2wr39b1mvi"; + revision = "3"; + editedCabalFile = "0bdl3xbxj2dpg5gv1h0561hhjjs6pp3bkgrg18gpl3pbksmr9q8j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -44078,8 +44125,8 @@ self: { }: mkDerivation { pname = "blaze-textual"; - version = "0.2.1.0"; - sha256 = "0bbcykkrlgdb6jaz72njriq9if6bzsx52jn26k093f5sn1d7jhhh"; + version = "0.2.2.1"; + sha256 = "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs"; libraryHaskellDepends = [ base blaze-builder bytestring ghc-prim integer-gmp old-locale text time vector @@ -44242,6 +44289,17 @@ self: { broken = true; }) {}; + "blizzard-html" = callPackage + ({ mkDerivation, base, blaze-html, clay, text }: + mkDerivation { + pname = "blizzard-html"; + version = "0.1.0.0"; + sha256 = "0q77g1apkjy6vfks1734cx6y11v5l7qksfs1g2axp2lmsymkd28v"; + libraryHaskellDepends = [ base blaze-html clay text ]; + description = "An HTML and CSS renderer for Haskell"; + license = lib.licenses.mit; + }) {}; + "blockchain" = callPackage ({ mkDerivation, aeson, async, base, byteable, bytestring , cryptonite, deepseq, either, errors, hashable, hspec, memory, mtl @@ -45512,8 +45570,8 @@ self: { pname = "bound"; version = "2.0.3"; sha256 = "0rhpcz99sax81zh2k1ww7g2xgfcna56ppj9xc1l4gfnsrrlb27yg"; - revision = "1"; - editedCabalFile = "16hy32ccjrch3zw45282m630p5hk1hziapmmk8a5nis2mlkq6z2h"; + revision = "2"; + editedCabalFile = "1s2vmmmj9gshhisj7fplm146p69bd4js4w0x4zk3qcb9qxl707i2"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -45954,6 +46012,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_64" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.64"; + sha256 = "06l6vqxl2hd788pf465h7d4xicnd8zj6h1n73dg7s3mnhx177n2n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -47759,6 +47844,8 @@ self: { pname = "bytesmith"; version = "0.3.7.0"; sha256 = "13dc4cwiga63wmnw9hl332d8gvqjl4yl0p09z2pkmwl81br7ybrc"; + revision = "1"; + editedCabalFile = "0jwax6jdzfcy007dqwdza1r4q8s12ly2gpzpaqy8gi52ap6xc05x"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -49275,7 +49362,7 @@ self: { broken = true; }) {}; - "cabal-install-parsers" = callPackage + "cabal-install-parsers_0_4_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal, containers , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko @@ -49301,6 +49388,35 @@ self: { ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "cabal-install-parsers" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , binary, binary-instances, bytestring, Cabal, containers + , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko + , network-uri, parsec, pretty, tar, tasty, tasty-golden + , tasty-hunit, text, time, transformers, tree-diff + }: + mkDerivation { + pname = "cabal-install-parsers"; + version = "0.4.3"; + sha256 = "0gpnfv80rhrws12b1klyi5fkqvn8pgnl2hxh5fbnfp8fbrwklfjq"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary binary-instances bytestring + Cabal containers cryptohash-sha256 deepseq directory filepath lukko + network-uri parsec pretty tar text time transformers + ]; + testHaskellDepends = [ + ansi-terminal base base16-bytestring bytestring Cabal containers + directory filepath pretty tar tasty tasty-golden tasty-hunit + tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal containers criterion directory filepath + ]; + description = "Utilities to work with cabal-install files"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; "cabal-lenses" = callPackage @@ -52619,6 +52735,8 @@ self: { pname = "cborg"; version = "0.2.5.0"; sha256 = "08da498bpbnl5c919m45mjm7sr78nn6qs7xyl0smfgd06wwm65xf"; + revision = "1"; + editedCabalFile = "0fnyjafbq9lzgr06ladraxfgzk6dj5gns17ihn7lc1ya49yv83wr"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim half integer-gmp primitive text @@ -58155,8 +58273,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.4.2"; - sha256 = "1y8pg8siz4myia38bbyzaibargkjbsls57i9n79w0z63kqij6wn4"; + version = "0.4.4"; + sha256 = "155jkrdklwh65aqvg138yhysjpxcj9d6l77h54z2q338iak9fbvs"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -58646,28 +58764,39 @@ self: { , bytestring, containers, cryptonite, exceptions, HsOpenSSL , http-api-data, http-client, http-client-tls, http-streams , http-types, io-streams, memory, network, servant, servant-client - , servant-client-core, text, time, transformers, unagi-streams - , unordered-containers, uuid, vector, websockets, wuss + , servant-client-core, tasty, tasty-hunit, text, time, transformers + , unagi-streams, unordered-containers, uuid, vector, websockets + , wuss }: mkDerivation { pname = "coinbase-pro"; - version = "0.9.2.2"; - sha256 = "1jfmzzwjk81w5bm9v4zfan2w7qi2sl2a1py9nxisz1wq8vxdyvxn"; + version = "0.9.3.0"; + sha256 = "0974snfkil4xmrkw38d81d85n5w78ld3jd0kbsn3s22jd36dzjlm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing async base binary bytestring containers cryptonite exceptions HsOpenSSL http-api-data http-client http-client-tls http-streams http-types io-streams memory network - servant servant-client servant-client-core text time transformers - unagi-streams unordered-containers uuid vector websockets wuss + servant servant-client servant-client-core tasty tasty-hunit text + time transformers unagi-streams unordered-containers uuid vector + websockets wuss ]; executableHaskellDepends = [ aeson aeson-casing async base binary bytestring containers cryptonite exceptions HsOpenSSL http-api-data http-client http-client-tls http-streams http-types io-streams memory network - servant servant-client servant-client-core text time transformers - unagi-streams unordered-containers uuid vector websockets wuss + servant servant-client servant-client-core tasty tasty-hunit text + time transformers unagi-streams unordered-containers uuid vector + websockets wuss + ]; + testHaskellDepends = [ + aeson aeson-casing async base binary bytestring containers + cryptonite exceptions HsOpenSSL http-api-data http-client + http-client-tls http-streams http-types io-streams memory network + servant servant-client servant-client-core tasty tasty-hunit text + time transformers unagi-streams unordered-containers uuid vector + websockets wuss ]; description = "Client for Coinbase Pro"; license = lib.licenses.mit; @@ -60547,6 +60676,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-cassava" = callPackage + ({ mkDerivation, base, bytestring, cassava, composite-base, tasty + , tasty-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "composite-cassava"; + version = "0.0.3.1"; + sha256 = "138yg758qq9a0zyqjw3xaa0jdp9h09gfnxwp2lrkibgqvhinnxxa"; + libraryHaskellDepends = [ + base cassava composite-base text unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring cassava composite-base tasty tasty-hunit text + unordered-containers vector + ]; + description = "Csv parsing functionality for composite"; + license = lib.licenses.mit; + }) {}; + "composite-dhall" = callPackage ({ mkDerivation, base, composite-base, dhall, tasty, tasty-hunit , text @@ -63628,8 +63776,8 @@ self: { }: mkDerivation { pname = "contiguous"; - version = "0.5.2"; - sha256 = "04ylz0mld2yj0mdj88k38jw9330p88h0ga46p4wzlmazsy0p5s67"; + version = "0.6.0"; + sha256 = "0wlm8y732v0l7my67vlm0r7dpmp0ah8b4zqnjhksmabmrb7vfbak"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted run-st ]; @@ -64573,8 +64721,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.7.1"; - sha256 = "1bm75bdmcrjizmrspl52qqs4vq9hlyh7fjv5y5lfpkmqrs45045b"; + version = "0.2.9.1"; + sha256 = "1r604zbr0ds2g29rp1470x2m25yv8j2iw1jglf3ppf7j30dsv8qj"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -64582,7 +64730,7 @@ self: { transformers unix ]; description = "Opinionated Haskell Interoperability"; - license = lib.licenses.bsd3; + license = lib.licenses.mit; }) {}; "core-text" = callPackage @@ -64592,14 +64740,14 @@ self: { }: mkDerivation { pname = "core-text"; - version = "0.3.0.0"; - sha256 = "103fd1bbhkh1l9di0f88yxl9mdaxjh31pgg49bk6yhx9cmdhgn1x"; + version = "0.3.2.0"; + sha256 = "1dxxw75xdb1r9vcxfg52z7fg7a1050n8a9c8ndakgxqh5c9j6xqq"; libraryHaskellDepends = [ ansi-terminal base bytestring colour deepseq fingertree hashable prettyprinter template-haskell text text-short ]; description = "A rope type based on a finger tree over UTF-8 fragments"; - license = lib.licenses.bsd3; + license = lib.licenses.mit; }) {}; "corebot-bliki" = callPackage @@ -66025,47 +66173,10 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.5.9.0"; - sha256 = "0qhlylhra1d3vzk6miqv0gdrn10gw03bdwv8b4bfmdzgpf0zgqr1"; - revision = "1"; - editedCabalFile = "140444pqw65vsqpa168c13cljb66rdgvq41mxnvds296wxq2yz7i"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary - binary-orphans bytestring cassava code-page containers - criterion-measurement deepseq directory exceptions filepath Glob - js-chart microstache mtl mwc-random optparse-applicative parsec - statistics text time transformers transformers-compat vector - vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = lib.licenses.bsd3; - }) {}; - - "criterion_1_5_10_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, binary-orphans, bytestring - , cassava, code-page, containers, criterion-measurement, deepseq - , directory, exceptions, filepath, Glob, HUnit, js-chart - , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-compat, vector - , vector-algorithms - }: - mkDerivation { - pname = "criterion"; version = "1.5.10.0"; sha256 = "0akws27z3i9381xrb0p0h5qicz4w5nnxy8jq7gk68gi50gj0flxq"; + revision = "1"; + editedCabalFile = "0j5cmc0w5m4fy28531f79dmbv3la51zh7k14l3kq3ix835crmmbz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66087,7 +66198,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "criterion-cmp" = callPackage @@ -70581,6 +70691,8 @@ self: { pname = "data-reify"; version = "0.6.3"; sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; + revision = "1"; + editedCabalFile = "137z993v7af9ym468vprys09416c7l7pys5hrng7k5vafga73y3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70701,6 +70813,49 @@ self: { broken = true; }) {}; + "data-sketches" = callPackage + ({ mkDerivation, base, criterion, data-sketches-core, ghc-prim + , hspec, hspec-discover, mtl, mwc-random, pretty-show, primitive + , QuickCheck, statistics, vector, vector-algorithms + }: + mkDerivation { + pname = "data-sketches"; + version = "0.3.1.0"; + sha256 = "0a3157ch2l2vn6s1b6mcfjw3lnvp45vm3dykzbjmfglhz7x9dxbz"; + libraryHaskellDepends = [ + base data-sketches-core ghc-prim mtl mwc-random primitive vector + vector-algorithms + ]; + testHaskellDepends = [ + base data-sketches-core ghc-prim hspec hspec-discover mtl + mwc-random pretty-show primitive QuickCheck statistics vector + vector-algorithms + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion data-sketches-core ghc-prim mtl mwc-random primitive + vector vector-algorithms + ]; + license = lib.licenses.asl20; + }) {}; + + "data-sketches-core" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, mwc-random, primitive + , vector, vector-algorithms + }: + mkDerivation { + pname = "data-sketches-core"; + version = "0.1.0.0"; + sha256 = "0ffw8ppgv1ifqh43nr3730qc188dg65d4bswsk0vj519fw578m93"; + libraryHaskellDepends = [ + base deepseq ghc-prim mwc-random primitive vector vector-algorithms + ]; + testHaskellDepends = [ + base deepseq ghc-prim mwc-random primitive vector vector-algorithms + ]; + license = lib.licenses.bsd3; + }) {}; + "data-spacepart" = callPackage ({ mkDerivation, base, vector-space }: mkDerivation { @@ -72211,8 +72366,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.0.1"; - sha256 = "06w88awpcgjdj7d0alikswcqg76gn7pv8njn7dvb4w8dxllypib2"; + version = "1.1.0"; + sha256 = "0vi9aqlp6pm1qmnihmx426fla3ffvnc2nc1s2i41180wfa6karbf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72288,6 +72443,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "debian-build_0_10_2_1" = callPackage + ({ mkDerivation, base, directory, filepath, process, split + , transformers + }: + mkDerivation { + pname = "debian-build"; + version = "0.10.2.1"; + sha256 = "1114xaqmhx74w0zqdksj6c1ggmfglcshhsxrw89gai5kzy47zp9d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath process split transformers + ]; + executableHaskellDepends = [ base filepath transformers ]; + description = "Debian package build sequence tools"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "debug" = callPackage ({ mkDerivation, aeson, base, bytestring, clock, containers , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed @@ -73801,6 +73975,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-compat_0_6" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.6"; + sha256 = "0yy4gm4wf9ivwfz2hwc7j3kavbya1p01s49fdgnzisgsk3h9xvnp"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-show-simple" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -74436,7 +74634,7 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; - "dhall_1_40_0" = callPackage + "dhall_1_40_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -74454,8 +74652,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.40.0"; - sha256 = "1a5hvfrygk9y9jlldyrbhfv9nzl03s6lqlmzf5dkwycwmfb7cc66"; + version = "1.40.1"; + sha256 = "0m2fw9ak9l6fz8ylpbi0cdihf2j66jlnd5j3vf56r7wlqgbkxhi1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74742,38 +74940,6 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.15"; - sha256 = "0bq6k92g22vdym9zyj95gx052yyzvgr1jv7yszlcj8p5angbxdqy"; - revision = "1"; - editedCabalFile = "0l1y8c02i4ydh3y67br1727al9xahpld879pinwgyv45f30n1jcb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default dhall - dhall-json directory filepath haskell-lsp hslogger lens megaparsec - mtl network-uri prettyprinter rope-utf16-splay text transformers - unordered-containers uri-encode - ]; - executableHaskellDepends = [ base optparse-applicative ]; - testHaskellDepends = [ - base directory doctest filepath haskell-lsp-types hspec lsp-test - QuickCheck tasty tasty-hspec text - ]; - description = "Language Server Protocol (LSP) server for Dhall"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Gabriel439 ]; - }) {}; - - "dhall-lsp-server_1_0_16" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , data-default, dhall, dhall-json, directory, doctest, filepath - , haskell-lsp, haskell-lsp-types, hslogger, hspec, lens, lsp-test - , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter - , QuickCheck, rope-utf16-splay, tasty, tasty-hspec, text - , transformers, unordered-containers, uri-encode - }: - mkDerivation { - pname = "dhall-lsp-server"; version = "1.0.16"; sha256 = "04s4kvbjp4ai17l64syram0br3qc4fpz669ps24r8fkcbbaczckq"; isLibrary = true; @@ -74791,7 +74957,6 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; @@ -75415,8 +75580,8 @@ self: { pname = "diagrams-core"; version = "1.5.0"; sha256 = "0y3smp3hiyfdirdak3j4048cgqv7a5q9p2jb6z8na2llys5mrmdn"; - revision = "1"; - editedCabalFile = "1718pkifs74nq8bdwcm6firahy8riiinwarcxkk087brmm2rbfli"; + revision = "2"; + editedCabalFile = "1wbvmarr8vaki80x19lwahsvyknw2047l1kmk3ybppg5s8mfiqpa"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -76946,12 +77111,12 @@ self: { broken = true; }) {}; - "directory_1_3_6_2" = callPackage + "directory_1_3_7_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.6.2"; - sha256 = "0zgwx7bwhw0s5xc17hfn1ps3fxn9ihv174b2s7rz63flm8lsm0y3"; + version = "1.3.7.0"; + sha256 = "041dnqqnc1dadasqyhivpa7rnhw3i08gq5bwj1kfz7lhlihbv1lz"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -77318,6 +77483,21 @@ self: { license = lib.licenses.mit; }) {markdown = null;}; + "discover-instances" = callPackage + ({ mkDerivation, base, some-dict-of, template-haskell, th-compat }: + mkDerivation { + pname = "discover-instances"; + version = "0.1.0.0"; + sha256 = "1ncmvc9xc4xynsjymw3i61p6310pfi41kkkmqi2dmbagfv7n2xl6"; + libraryHaskellDepends = [ + base some-dict-of template-haskell th-compat + ]; + testHaskellDepends = [ + base some-dict-of template-haskell th-compat + ]; + license = lib.licenses.bsd3; + }) {}; + "discrete" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -78175,10 +78355,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.6.0"; - sha256 = "0m1kw3wy0n611487qhskldivrxmkh7m5bkzib44d8n0qfg5lv06i"; - revision = "1"; - editedCabalFile = "0j35y7ws7rbc68vkmyvpa4m2dyfpzpzzvm4lv7h6r7x34w331dgg"; + version = "1.6.1"; + sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens @@ -78412,8 +78590,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.9"; - sha256 = "17khlv65irp1bdr7j0njlh1sgvr1nhi5xfvdiklhjr7vm6vhmipd"; + version = "0.9.1"; + sha256 = "1ryvgccwfs8yzhywcvgd5s9imr4w3sxdif79npfw3zk1rcnl23v4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78459,8 +78637,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "10"; - editedCabalFile = "0k9h3d93ivjykdpblkdcxyv1aybbjq6m5laqjh7bdv6nrdr5va2c"; + revision = "11"; + editedCabalFile = "1mnf6qa3773v2j2k2gp51qb0pbd9lf1hw9cx2sqrpcwjxfb3lfqg"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -79508,7 +79686,6 @@ self: { ]; description = "Automatic Bibtex and fulltext of scientific articles"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "doldol" = callPackage @@ -79751,6 +79928,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Simple, type-safe and testable HTTP client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dormouse-uri" = callPackage @@ -79775,6 +79953,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library for type-safe representations of Uri/Urls"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dot" = callPackage @@ -80325,28 +80505,29 @@ self: { }) {}; "dprox" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, dns - , hashable, hspec, iproute, network, optparse-applicative, psqueues - , streaming-commons, time, unix, unordered-containers + ({ mkDerivation, attoparsec, base, bytestring, bytestring-trie + , containers, dns, hashable, hspec, iproute, network + , optparse-applicative, psqueues, streaming-commons, time, unix }: mkDerivation { pname = "dprox"; - version = "0.2.0"; - sha256 = "0hylymdpvnh353rg9gh8d9m9ag8hfxjh2ndrdxvhapbpddbbz3qm"; + version = "0.3.0"; + sha256 = "1my3v3g7jb8akc41hxx557kamsqhry3q8g76rhsf9h8fhsm31gv1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base bytestring containers dns hashable iproute network - optparse-applicative psqueues streaming-commons time unix - unordered-containers + attoparsec base bytestring bytestring-trie containers dns hashable + iproute network optparse-applicative psqueues streaming-commons + time unix ]; testHaskellDepends = [ - attoparsec base bytestring containers dns hashable hspec iproute - network optparse-applicative psqueues streaming-commons time unix - unordered-containers + attoparsec base bytestring bytestring-trie containers dns hashable + hspec iproute network optparse-applicative psqueues + streaming-commons time unix ]; description = "a lightweight DNS proxy server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "drClickOn" = callPackage @@ -81182,6 +81363,24 @@ self: { maintainers = with lib.maintainers; [ turion ]; }) {}; + "dunai_0_8_0" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.8.0"; + sha256 = "06xdn1fqfbpffdcpf9mmkl56797bdh9ijwg7nm98fqhwq0d4jnkv"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -81202,8 +81401,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.7.0"; - sha256 = "08pbfw10dkds8dwr913p0rikvs7vxfwyj5rdsr7njzh39fz9lqli"; + version = "0.8.0"; + sha256 = "1n5a30iw0pr94fl1jparlmf0lnw4md4l3r9aq56247cz1npnfaqh"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -83720,14 +83919,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "elm-bridge_0_7_0" = callPackage + "elm-bridge_0_8_0" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text }: mkDerivation { pname = "elm-bridge"; - version = "0.7.0"; - sha256 = "1ccqsvyy60bzq7vhy9kwbl6rmlnpk0bpy7wyqapm54qxkx71bfk6"; + version = "0.8.0"; + sha256 = "05xnbwxzxm80xccrd5g4f83gsvs7gmyg9a7a0xxyk10qx93j4rs3"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -84229,6 +84428,24 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.6.0.0"; + sha256 = "0ni33i5l82pyhsm2y2r5gpn736mnnd56086ma51s880lbr4qcizf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -84250,6 +84467,28 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-markov_0_6_0_0" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, primitive, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.6.0.0"; + sha256 = "12vbb7lrf7qw581pn0y5dpx1gkny74vib9f6sykg650izias8pl1"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random primitive statistics vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec mwc-random vector + ]; + benchmarkHaskellDepends = [ base ]; + description = "Simulate molecular sequences along trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -84262,6 +84501,19 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-nexus_0_6_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.6.0.0"; + sha256 = "0yhyacb04d9080rh030f082r64z72ma5g3sgpxy3vihp139gar34"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive @@ -84282,6 +84534,27 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-seq_0_6_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, mwc-random, parallel, primitive + , vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.6.0.0"; + sha256 = "1jyb8m400qcw7bkm1mdxqny59vk6bhfgp2fwsa1a9vxi1cdswk3l"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices mwc-random + parallel primitive vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, hmatrix @@ -84304,6 +84577,26 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-tools_0_6_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, directory, hmatrix, mwc-random + , optparse-applicative, primitive, template-haskell, text, time + , transformers, vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.6.0.0"; + sha256 = "1jfxyf2f8wf1kzzg3wpw8fixzl6icx1729mpw98hp5wacvp1d4mk"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 directory hmatrix mwc-random optparse-applicative + primitive template-haskell text time transformers vector zlib + ]; + description = "Tools for ELynx"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus @@ -84329,6 +84622,34 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-tree_0_6_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, criterion, data-default, data-default-class, deepseq + , double-conversion, elynx-nexus, elynx-tools, hspec + , math-functions, microlens, mwc-random, parallel, primitive + , QuickCheck, quickcheck-classes, statistics + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.6.0.0"; + sha256 = "1cywd10rky712yijpvq6cfrphmgks760y52gsdlfxwcn6jgych0r"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers + data-default-class deepseq double-conversion elynx-nexus + math-functions mwc-random parallel primitive statistics + ]; + testHaskellDepends = [ + attoparsec base bytestring containers data-default elynx-tools + hspec QuickCheck quickcheck-classes + ]; + benchmarkHaskellDepends = [ + base criterion elynx-tools microlens mwc-random parallel + ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "ema" = callPackage ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup , commonmark, commonmark-extensions, commonmark-pandoc, containers @@ -84773,8 +85094,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.5"; - sha256 = "1kqi6ic5sa8y01ya99v7r5j9rl68vgy2lsixhbnavi8fx2200hcs"; + version = "0.8.6"; + sha256 = "0m68a4q98q4hf0sy0s9b3cmi2pl5s00xxchnjqqs3lb6b8xzg4fz"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -86428,8 +86749,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.2.1"; - sha256 = "1hx3v9cb5w0zckgi83qa1ibfs44172syj89p36xsiphxqhlgaa0s"; + version = "3.5.2.2"; + sha256 = "19m4lzxhjakf1zbsvwa0xmhcln1wb8ydbsnfyhiwhgvryrhvw9ga"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -87399,6 +87720,8 @@ self: { pname = "eventlog2html"; version = "0.9.1"; sha256 = "17fp0q44lk3nkqzpilxlvzbr0b25girbh7j18yl6blcp5mcmq2cd"; + revision = "1"; + editedCabalFile = "17p7h7xii3p0k8ji11jw7dcprmcrwhw0lfpyq2f557s87cpwlinf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87633,6 +87956,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "evoke" = callPackage + ({ mkDerivation, aeson, base, ghc, HUnit, insert-ordered-containers + , lens, QuickCheck, random, swagger2, text + }: + mkDerivation { + pname = "evoke"; + version = "0.2021.8.25"; + sha256 = "14yq5izrlzyqwm3cf9lc26dgxix3yyfiafp5i4p9s6j4d1dspm1i"; + libraryHaskellDepends = [ base ghc random ]; + testHaskellDepends = [ + aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 + text + ]; + description = "A GHC plugin to derive instances"; + license = lib.licenses.mit; + }) {}; + "ewe" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, happy, mtl , pretty, transformers, uuagc, uuagc-cabal, uulib @@ -88414,8 +88754,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "0.1.0.0"; - sha256 = "014jbbzhb9ar3azxqjnagyyasack0dik32h2d0lzb6yr0yiwsv8m"; + version = "0.2.0.0"; + sha256 = "1kd1gf4yrbjpd62arrb74x5sri1xvjx88lk4dah0mbx1f19129ar"; libraryHaskellDepends = [ base flatparse haskell-src-exts haskell-src-meta relude template-haskell text @@ -88791,12 +89131,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "express_1_0_4" = callPackage + "express_1_0_6" = callPackage ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "1.0.4"; - sha256 = "0yv7gn7pj6ya4ijvwsh6gqn02qm4xn3ri98q10zd0zvjipmn20db"; + version = "1.0.6"; + sha256 = "0zkjd3xv2vskj2slyvvxhakcqxygklbcigsrgrlrvg6d3sgx1wy9"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -89194,6 +89534,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "extra_1_7_10" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.10"; + sha256 = "0h219hi4b74x51jdxhyfff0lyxsbgyclm428lv3nr6y8hrwydpwz"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -89392,8 +89751,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.2.2"; - sha256 = "00nxadfipy92rpg7d3ypgigr51n4sn9jjh6n1gzxfjl6p7vq6myn"; + version = "0.3.2.3"; + sha256 = "0x743fvk24pin54ghz4zlzvqngnhi52rx4s1a3pb7l9m4aj1iz4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89408,7 +89767,7 @@ self: { toolshed ]; description = "Rational arithmetic in an irrational world"; - license = "GPL"; + license = lib.licenses.gpl3Plus; }) {}; "facts" = callPackage @@ -90634,6 +90993,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "fcf-composite" = callPackage + ({ mkDerivation, base, composite-base, fcf-containers + , first-class-families, tasty, tasty-hunit, vinyl + }: + mkDerivation { + pname = "fcf-composite"; + version = "0.1.1.0"; + sha256 = "1ghcggwvwrdc47lalamdxx18q1qfxfr4w2kw5vxci4fkfc5p0wkb"; + revision = "1"; + editedCabalFile = "08k5mxb792d940id4kdahdw78sna7appv7n958ni7s2rsds90haj"; + libraryHaskellDepends = [ + base composite-base fcf-containers first-class-families vinyl + ]; + testHaskellDepends = [ + base composite-base fcf-containers first-class-families tasty + tasty-hunit vinyl + ]; + description = "Type-level computation for composite using first-class-families"; + license = lib.licenses.mit; + }) {}; + "fcf-containers" = callPackage ({ mkDerivation, base, doctest, first-class-families, Glob }: mkDerivation { @@ -90949,8 +91329,8 @@ self: { pname = "feed"; version = "1.3.2.0"; sha256 = "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk"; - revision = "1"; - editedCabalFile = "0lg9yphl07hbknzx0nvdxvcw05bpxc5ac9sqb26lv4d9nkb72blg"; + revision = "2"; + editedCabalFile = "12kl1bsgv6jdbvm1dblxjkvc2n8p83wgcpalp8vyf414lhxrjnpx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -91859,14 +92239,14 @@ self: { }: mkDerivation { pname = "file-embed"; - version = "0.0.14.0"; - sha256 = "1b45yk17339zw53zgp8zb5sjg5xn76kryrb6dkqk747vnbdnf0h5"; + version = "0.0.15.0"; + sha256 = "1pavxj642phrkq67620g10wqykjfhmm9yj2rm8pja83sadfvhrph"; libraryHaskellDepends = [ base bytestring directory filepath template-haskell ]; testHaskellDepends = [ base bytestring filepath ]; description = "Use Template Haskell to embed file contents directly"; - license = lib.licenses.bsd3; + license = lib.licenses.bsd2; }) {}; "file-embed-lzma" = callPackage @@ -91877,8 +92257,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "6"; - editedCabalFile = "0m2ay6krrjs2cgmy7divlavx0wvgwhwgba97f1m3ppcxxm1y4ikv"; + revision = "7"; + editedCabalFile = "1jm3jr70vvfv9an3nb7n5rx5ldk6i4c1dcwi3pgbf6lkx7lkp754"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -93720,6 +94100,23 @@ self: { license = lib.licenses.publicDomain; }) {}; + "flexible-numeric-parsers" = callPackage + ({ mkDerivation, attoparsec, base, hedgehog, parsers, scientific + , tasty, tasty-hedgehog, tasty-hunit, text + }: + mkDerivation { + pname = "flexible-numeric-parsers"; + version = "0.1.0.0"; + sha256 = "122nncxfp776g4yn4s78vr8r33khl02dl1x475k3z3138ylav8zp"; + libraryHaskellDepends = [ base parsers scientific ]; + testHaskellDepends = [ + attoparsec base hedgehog parsers scientific tasty tasty-hedgehog + tasty-hunit text + ]; + description = "Flexible numeric parsers for real-world programming languages"; + license = lib.licenses.mit; + }) {}; + "flexible-time" = callPackage ({ mkDerivation, base, bytestring, unix-time }: mkDerivation { @@ -93991,6 +94388,8 @@ self: { pname = "flock"; version = "0.3.2"; sha256 = "0zi04gmrjda11zp8y7zx6r9hkz00wplvjj7sn6q7lbm2h5kv20xr"; + revision = "1"; + editedCabalFile = "18mhjwcrz2jx0vsdd8cyb84lnabhliwfxaw76k8sifarhk847af8"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; @@ -94596,6 +94995,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "fmt_0_6_3_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, call-stack + , containers, criterion, deepseq, doctest, doctest-discover + , formatting, hspec, interpolate, microlens, neat-interpolation + , QuickCheck, text, time, time-locale-compat, vector + }: + mkDerivation { + pname = "fmt"; + version = "0.6.3.0"; + sha256 = "01mh0k69dv5x30hlmxi36dp1ylk0a6affr4jb3pvy8vjm4ypzvml"; + libraryHaskellDepends = [ + base base64-bytestring bytestring call-stack containers formatting + microlens text time time-locale-compat + ]; + testHaskellDepends = [ + base bytestring call-stack containers doctest hspec + neat-interpolation QuickCheck text vector + ]; + testToolDepends = [ doctest-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq formatting interpolate + text vector + ]; + description = "A new formatting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fmt-for-rio" = callPackage ({ mkDerivation, base, enum-text-rio }: mkDerivation { @@ -95603,8 +96030,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.5.0"; - sha256 = "1bza9aav1yy4yzv7lwwi1x466i9h7ar4xvwva1r7992msqp05pxb"; + version = "0.6.0"; + sha256 = "0g0wpcr9ddad59x58gknrw2y7w3h88i7s9br9qk423k48gq8qsla"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95647,6 +96074,35 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "fortran-vars" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq, fgl + , fortran-src, fortran-src-extras, hspec, hspec-discover, HUnit + , text, uniplate + }: + mkDerivation { + pname = "fortran-vars"; + version = "0.1.0"; + sha256 = "1j1k4paca1g6w38kd7fl1h4vzf6rb8ypdfilhkn2fk5llxkkw226"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq fgl fortran-src + fortran-src-extras text uniplate + ]; + executableHaskellDepends = [ + aeson base bytestring containers deepseq fgl fortran-src + fortran-src-extras text uniplate + ]; + testHaskellDepends = [ + aeson base bytestring containers deepseq fgl fortran-src + fortran-src-extras hspec HUnit text uniplate + ]; + testToolDepends = [ hspec-discover ]; + description = "Fortran memory model and other static analysis tools"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "fortytwo" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, hspec, text }: mkDerivation { @@ -96159,8 +96615,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.0.0.2"; - sha256 = "1mrydqmwzwa391cb6pzxmjd5yl04f5xggz0wha7rm2a0pksgxphy"; + version = "1.0.0.3"; + sha256 = "13iw0fj3n409mjbc6kkxcy1jx2zg8dwd55qp150qrkbmmjvrw54q"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit data-default datadog doctest errors exceptions fast-logger filepath @@ -96505,8 +96961,8 @@ self: { pname = "free-vector-spaces"; version = "0.1.5.0"; sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1"; - revision = "3"; - editedCabalFile = "09jy8kj31p6b4pmzry6glq7climw6pmpph23byhijs82a7yl609w"; + revision = "4"; + editedCabalFile = "07xkdzajkrswa69gazl0gpzayklafs883xz4xf8cawk58m5pr645"; libraryHaskellDepends = [ base lens linear MemoTrie pragmatic-show vector vector-space ]; @@ -97927,6 +98383,35 @@ self: { broken = true; }) {}; + "functor-combinators_0_4_0_0" = callPackage + ({ mkDerivation, assoc, base, bifunctors, comonad, constraints + , containers, contravariant, dependent-sum, deriving-compat, free + , hedgehog, invariant, kan-extensions, mmorph, mtl + , natural-transformation, nonempty-containers, pointed, profunctors + , semigroupoids, sop-core, tagged, tasty, tasty-hedgehog, these + , transformers, trivial-constraint, vinyl + }: + mkDerivation { + pname = "functor-combinators"; + version = "0.4.0.0"; + sha256 = "1kikldm7ih7r5ydyq26fkp01025dnwrafipsw9qv897k887b8gvg"; + libraryHaskellDepends = [ + assoc base bifunctors comonad constraints containers contravariant + deriving-compat free invariant kan-extensions mmorph mtl + natural-transformation nonempty-containers pointed profunctors + semigroupoids sop-core tagged these transformers trivial-constraint + vinyl + ]; + testHaskellDepends = [ + base bifunctors dependent-sum free hedgehog nonempty-containers + semigroupoids tasty tasty-hedgehog transformers trivial-constraint + ]; + description = "Tools for functor combinator-based program design"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "functor-combo" = callPackage ({ mkDerivation, base, base-orphans, containers, data-inttrie, lub , type-unary, TypeCompose @@ -98397,33 +98882,34 @@ self: { }) {}; "futhark" = callPackage - ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary - , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm - , containers, directory, directory-tree, dlist, file-embed - , filepath, free, futhark-data, futhark-server, gitrev, happy - , hashable, haskeline, language-c-quote, mainland-pretty - , megaparsec, mtl, neat-interpolation, parallel, parser-combinators - , pcg-random, process, process-extras, QuickCheck, regex-tdfa - , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , temporary, terminal-size, text, time, transformers - , unordered-containers, utf8-string, vector - , vector-binary-instances, versions, zip-archive, zlib + ({ mkDerivation, aeson, alex, ansi-terminal, array, base + , base16-bytestring, binary, blaze-html, bmp, bytestring + , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 + , directory, directory-tree, dlist, file-embed, filepath, free + , futhark-data, futhark-server, githash, half, happy, haskeline + , language-c-quote, mainland-pretty, megaparsec, mtl + , neat-interpolation, parallel, parser-combinators, pcg-random + , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary + , terminal-size, text, time, transformers, unordered-containers + , vector, vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.19.7"; - sha256 = "1c3la98gsw3xxvakg4zsknwn3z3whn75r5vr9rf6w6f48jl0829k"; + version = "0.20.1"; + sha256 = "0ay1ly65sv57p6hymnb902xz5jmvjzl0zfshffrl73v8mgqbgnlv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal array base binary blaze-html bmp bytestring - bytestring-to-vector cmark-gfm containers directory directory-tree - dlist file-embed filepath free futhark-data futhark-server gitrev - hashable haskeline language-c-quote mainland-pretty megaparsec mtl - neat-interpolation parallel pcg-random process process-extras - regex-tdfa srcloc template-haskell temporary terminal-size text - time transformers unordered-containers utf8-string vector - vector-binary-instances versions zip-archive zlib + aeson ansi-terminal array base base16-bytestring binary blaze-html + bmp bytestring bytestring-to-vector cmark-gfm containers + cryptohash-md5 directory directory-tree dlist file-embed filepath + free futhark-data futhark-server githash half haskeline + language-c-quote mainland-pretty megaparsec mtl neat-interpolation + parallel pcg-random process process-extras regex-tdfa srcloc + template-haskell temporary terminal-size text time transformers + unordered-containers vector vector-binary-instances versions + zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -98949,6 +99435,8 @@ self: { pname = "galois-field"; version = "1.0.2"; sha256 = "17khwhh0annwlbbsdj5abh3jv2csg84qvhgn1ircgc69fzb0r59d"; + revision = "1"; + editedCabalFile = "1bxvg0906s3b3gnppdmgdcag5vdpgh6rwbk8a2pkqmd8dn1k2z8z"; libraryHaskellDepends = [ base bitvec groups integer-gmp mod MonadRandom poly protolude QuickCheck semirings vector wl-pprint-text @@ -100110,10 +100598,8 @@ self: { }: mkDerivation { pname = "generic-deriving"; - version = "1.14"; - sha256 = "00nbnxxkxyjfzj3zf6sxh3im24qv485w4jb1gj36c2wn4gjdbayh"; - revision = "1"; - editedCabalFile = "0g17hk01sxv5lmrlnmwqhkk73y3dy3xhy7l9myyg5qnw7hm7iin9"; + version = "1.14.1"; + sha256 = "19qpahcfhs9nqqv6na8znybrvpw885cajbdnrfylxbsmm0sys4s7"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -101694,8 +102180,8 @@ self: { }: mkDerivation { pname = "geomancy"; - version = "0.2.2.4"; - sha256 = "0vx2dz7fxd4hq50whsx0g6i3v1aidr7rpbylf169q1vshhrl8yaf"; + version = "0.2.3.0"; + sha256 = "1li0411y725c5k6zmkki0brz4w4yksxfdbk2ggq31yirmdihc5al"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base deepseq hedgehog linear ]; benchmarkHaskellDepends = [ base criterion deepseq linear ]; @@ -101709,8 +102195,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.4.1"; - sha256 = "1b6dp3vzp8jpgdzkqzfyjk8n26w8jb06adp77qzfbjmik0lw8b03"; + version = "0.5.0"; + sha256 = "1s4zjwhqcxxxb32hva4h93kkmzlvghmj11jvzvkwga9qm4wd9n3a"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -101933,14 +102419,26 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-api-compat"; - version = "8.10.6"; - sha256 = "1zrwa266v776w8rvcjggdpnyhs8kk36w5wrh63l16kxh58yc2vjz"; + version = "8.10.7"; + sha256 = "1swsly340pj4inmk1l57q4s0dpw8iibl192y1zayvkgc43zky62a"; libraryHaskellDepends = [ base ghc ]; doHaddock = false; description = "GHC-API compatibility helpers"; license = lib.licenses.bsd3; }) {}; + "ghc-api-compat_9_0_1" = callPackage + ({ mkDerivation, base, containers, ghc }: + mkDerivation { + pname = "ghc-api-compat"; + version = "9.0.1"; + sha256 = "05jb1sck9cjpsd1j6qlpr7apqv6g2vw3xac36kcsyf0qxw8sq9dk"; + libraryHaskellDepends = [ base containers ghc ]; + description = "GHC-API compatibility helpers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-bignum" = callPackage ({ mkDerivation }: mkDerivation { @@ -101951,6 +102449,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-bignum-orphans" = callPackage + ({ mkDerivation, base, ghc-bignum }: + mkDerivation { + pname = "ghc-bignum-orphans"; + version = "0.1"; + sha256 = "034m3qfw6rks1a0a5ivrhjb9my5prscq6ydc980cfdsz486pap8n"; + libraryHaskellDepends = [ base ghc-bignum ]; + description = "Backwards-compatible orphan instances for ghc-bignum"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ghc-boot_9_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, ghc-boot-th @@ -102012,8 +102523,8 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.5.0.5"; - sha256 = "0ml5v9r729i24dwj54fh8fqr55xbndc7wpbkzaids4r666hsjlsi"; + version = "0.5.0.6"; + sha256 = "14cdfbjk8l3j97v46clpb806zlkckbfhgpzip67byhw9kzv5r14s"; libraryHaskellDepends = [ base containers directory filepath ghc ghc-paths process safe-exceptions template-haskell th-compat transformers @@ -102381,6 +102892,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-exactprint_1_2_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.2.0"; + sha256 = "0dxjhw7vqd7grhghwz5zcjfb7bm5sa9mq0iqsr9vsz4vxxlfyi4k"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -102530,8 +103054,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.6.20210814"; - sha256 = "0gnjps6xf5wq0nl4rlm4c1mqp3a3rbkwskv85fm852n5cf7bicd6"; + version = "8.10.7.20210828"; + sha256 = "1p0svqh9dnpia9ddp6z9v1k5b68jc70181v69adr8rqzk0dl4i40"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -102571,8 +103095,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.6.20210814"; - sha256 = "16kmm5wv3kym3qjq43pldycnira64zyga2c4b2vccvlvbi0v40hi"; + version = "8.10.7.20210828"; + sha256 = "178v4f7q9ndqmlhg2vhlk6ifm3ilajlrz8iw84vggzs7rp0fnlx0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -102611,8 +103135,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.22"; - sha256 = "1a1yhm8rflln6m8sn2bbh5x6cbn20zfq91vfk1ywmia0v5y2sx03"; + version = "8.10.0.23"; + sha256 = "0r5sl7hhn0cxp0b1dskx1lshplc0yka7hcvs2nh10nrj07fjd3vj"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; @@ -103014,8 +103538,8 @@ self: { }: mkDerivation { pname = "ghc-source-gen"; - version = "0.4.1.0"; - sha256 = "09rd6p8bprmj9nbdhh2909hw5il9gapj0cm3i7aiin200v80k84y"; + version = "0.4.2.0"; + sha256 = "1cb4yb48xzpdlrbw3gp6gf6nmjgyy0i9yzh63scl872allv8jfm3"; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck @@ -103174,8 +103698,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.3.1.0"; - sha256 = "10s9i2n8r3ckdz3kd1s4pwwm4j8p8fg13xhn2m2dy4832iwg12bz"; + version = "0.5.1.0"; + sha256 = "1rwdq81k0f85idg3fypac127iq6r3da5jrkq4ynixvpahj1w6m87"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -105213,6 +105737,19 @@ self: { broken = true; }) {}; + "gibbon" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gibbon"; + version = "0.1.1"; + sha256 = "1fvb7fg4dh26xszbfcrjyd7h8pl0nxpxkls6lb1ibyw9z76h0shh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "A compiler for operating on serialized trees"; + license = lib.licenses.bsd3; + }) {}; + "gimlh" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -105493,8 +106030,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210803"; - sha256 = "0777q454bgkzr930wacn48xm6ygi4i6rxsizvxjm3a0dlffnv3b2"; + version = "8.20210903"; + sha256 = "1p6zgk98jmxvqdin5xsdxhgq276bjdr2spi0wabj8x0ziry97rvl"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -106411,20 +106948,19 @@ self: { license = lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_3_0_2" = callPackage + "gitlab-haskell_0_3_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-client , http-conduit, http-types, tasty, tasty-hunit, temporary, text - , time, transformers, unix, unliftio, unliftio-core + , time, transformers, unix }: mkDerivation { pname = "gitlab-haskell"; - version = "0.3.0.2"; - sha256 = "0ndwff0rk1b7vkggymb0ca0h0hg69kym7npcckv2x2pnw55lb5yz"; + version = "0.3.1.1"; + sha256 = "146azh83v963njnkbcf6lacj95qx89wcvi294s3nc89bp72z8igz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-client http-conduit - http-types temporary text time transformers unix unliftio - unliftio-core + http-types temporary text time transformers unix ]; testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; description = "A Haskell library for the GitLab web API"; @@ -107859,57 +108395,91 @@ self: { }) {}; "goal-core" = callPackage - ({ mkDerivation, base, cairo, Chart, Chart-cairo, Chart-gtk, colour - , containers, data-default-class, gtk, lens + ({ mkDerivation, async, base, bytestring, cassava, containers + , criterion, deepseq, directory, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hmatrix + , hmatrix-gsl, math-functions, mwc-probability, mwc-random + , optparse-applicative, primitive, process, vector, vector-sized }: mkDerivation { pname = "goal-core"; - version = "0.1"; - sha256 = "11k66j7by9lx0kra354p8c3h7ph1z33n632wiy8b7vim5pw35fc4"; - isLibrary = true; - isExecutable = true; + version = "0.20"; + sha256 = "0lqcyllfg0r2dxd6lwil1i4wbdlpxq4plyxamjwhi7s5k41q1k93"; libraryHaskellDepends = [ - base cairo Chart Chart-cairo Chart-gtk colour containers - data-default-class gtk lens + async base bytestring cassava containers criterion deepseq + directory finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise hmatrix hmatrix-gsl math-functions + optparse-applicative primitive process vector vector-sized ]; - executableHaskellDepends = [ base ]; - description = "Core imports for Geometric Optimization Libraries"; + benchmarkHaskellDepends = [ + base criterion hmatrix mwc-probability mwc-random + ]; + description = "Common, non-geometric tools for use with Goal"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; "goal-geometry" = callPackage - ({ mkDerivation, base, goal-core, hmatrix, vector }: + ({ mkDerivation, ad, base, ghc-typelits-knownnat + , ghc-typelits-natnormalise, goal-core, indexed-list-literals + }: mkDerivation { pname = "goal-geometry"; - version = "0.1"; - sha256 = "0x6w7qvhs8mvzhf7ccyciznwq1jjpn337nq5jkns2zza72dm5gz0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base goal-core hmatrix vector ]; - executableHaskellDepends = [ base goal-core ]; - description = "Scientific computing on geometric objects"; + version = "0.20"; + sha256 = "0bjyy0q7f4wmwna019wbaf7gfflpkng60f2rqxnffqcar9q127jk"; + libraryHaskellDepends = [ + ad base ghc-typelits-knownnat ghc-typelits-natnormalise goal-core + indexed-list-literals + ]; + description = "The basic geometric type system of Goal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "goal-graphical" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, criterion + , ghc-typelits-knownnat, ghc-typelits-natnormalise, goal-core + , goal-geometry, goal-probability, hmatrix, hmatrix-special + , mwc-probability, mwc-random, parallel, statistics, vector + }: + mkDerivation { + pname = "goal-graphical"; + version = "0.20"; + sha256 = "1ckp0238wkdvsxpi7mc7vp0ymfhmpz4hh2nzgpfr09c9dz02cv61"; + libraryHaskellDepends = [ + base containers ghc-typelits-knownnat ghc-typelits-natnormalise + goal-core goal-geometry goal-probability hmatrix hmatrix-special + mwc-probability mwc-random parallel statistics vector + ]; + benchmarkHaskellDepends = [ + base bytestring cassava criterion goal-core goal-geometry + goal-probability + ]; + description = "Optimization of latent variable and dynamical models with Goal"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "goal-probability" = callPackage - ({ mkDerivation, base, goal-core, goal-geometry, hmatrix - , math-functions, mwc-random, mwc-random-monad, statistics, vector + ({ mkDerivation, base, bytestring, cassava, containers, criterion + , ghc-typelits-knownnat, ghc-typelits-natnormalise, goal-core + , goal-geometry, hmatrix, hmatrix-special, mwc-random, parallel + , statistics, vector }: mkDerivation { pname = "goal-probability"; - version = "0.1"; - sha256 = "0bch2lcq7crr7g96rz7m98wy8lc1cldxq0pl1kf0bsadxwc3b2nl"; - isLibrary = true; - isExecutable = true; + version = "0.20"; + sha256 = "14yfsazxrn8g3ygbwx8zs9xgjjzi5q1dw6sqbdkrixb8ffw7xszm"; libraryHaskellDepends = [ - base goal-core goal-geometry hmatrix math-functions mwc-random - mwc-random-monad statistics vector + base containers ghc-typelits-knownnat ghc-typelits-natnormalise + goal-core goal-geometry hmatrix hmatrix-special mwc-random parallel + statistics vector ]; - executableHaskellDepends = [ base goal-core goal-geometry vector ]; - description = "Manifolds of probability distributions"; + benchmarkHaskellDepends = [ + base bytestring cassava criterion goal-core goal-geometry + ]; + description = "Optimization on manifolds of probability distributions with Goal"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -113452,8 +114022,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.8.0"; - sha256 = "1645pgrs9cj6imhpdpkbkhr9mn9005wbqlvily5f8iaf02zpvfwd"; + version = "0.13.8.1"; + sha256 = "102x753jbc90lfm9s0ng5kvm0risqwpar331xwsd752as0bms142"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -113606,8 +114176,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.15.5"; - sha256 = "1y5wmxxpvhfw1ypli3f48k5bg3hfbx081d9xr5ks8sj3g7f7cf60"; + version = "0.15.6"; + sha256 = "008q6pbl0vq4c2cg94s5az67xdy5q3nzi8qgr7934q3cgdhzbb8w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -115666,8 +116236,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.6.1"; - sha256 = "1h4bcgjf6kxhaxjhdmpxkgxamrg3ibw43hkr97iqk9h5skjcx6d9"; + version = "2.7.0"; + sha256 = "11jpqx6i7qbg4yjh8rbdz7zqjmp9r9ch9z299h72af48wrwr16fl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116165,29 +116735,29 @@ self: { }) {}; "hakyll" = callPackage - ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring - , containers, cryptonite, data-default, deepseq, directory - , file-embed, filepath, fsnotify, http-conduit, http-types - , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc - , parsec, process, QuickCheck, random, regex-tdfa, resourcet - , scientific, tagsoup, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, time + ({ mkDerivation, aeson, array, base, binary, blaze-html + , blaze-markup, bytestring, containers, data-default, deepseq + , directory, file-embed, filepath, fsnotify, hashable, http-conduit + , http-types, lifted-async, lrucache, mtl, network-uri + , optparse-applicative, pandoc, parsec, process, QuickCheck, random + , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text, time , time-locale-compat, unordered-containers, util-linux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.14.0.0"; - sha256 = "088df9vs5f2p5iiv7rbrisz4z4s38mkr9z41gy3hqdapg4m7mi1c"; + version = "4.14.1.0"; + sha256 = "1s0y7fc48zw0dkk4m9gv53mmklk1zfk4rkf7r6xawnkg5cj6sjpc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptonite data-default deepseq directory file-embed filepath - fsnotify http-conduit http-types lrucache memory mtl network-uri - optparse-applicative pandoc parsec process random regex-tdfa - resourcet scientific tagsoup template-haskell text time + aeson array base binary blaze-html blaze-markup bytestring + containers data-default deepseq directory file-embed filepath + fsnotify hashable http-conduit http-types lifted-async lrucache mtl + network-uri optparse-applicative pandoc parsec process random + regex-tdfa resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static warp yaml ]; @@ -118862,17 +119432,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_3_2_0" = callPackage + "hashable_1_3_3_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit , integer-gmp, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.3.2.0"; - sha256 = "0dyn343wdwbm1facpcjiyd8w0s0hk23jqh7mbj108az5dx5rdgar"; - revision = "1"; - editedCabalFile = "05jwmd6d127vykb1y13q7sjn5mhfs5pbbkal33jq5kg1rx3hj6kq"; + version = "1.3.3.0"; + sha256 = "1p45rck6avm0ng963mmhphhwjljv9wcb7r2171cnka5nizjpi9cr"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp text ]; @@ -122170,21 +122738,22 @@ self: { "hasklepias" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, co-log - , containers, flow, ghc-prim, hspec, interval-algebra, lens - , lens-aeson, mtl, nonempty-containers, QuickCheck, safe - , semiring-simple, tasty, tasty-hspec, tasty-hunit, text, time - , unordered-containers, vector, witherable + , containers, contravariant, flow, ghc-prim, hspec + , interval-algebra, lens, lens-aeson, mtl, nonempty-containers + , QuickCheck, safe, semiring-simple, tasty, tasty-hspec + , tasty-hunit, text, time, tuple, unordered-containers, vector + , witherable }: mkDerivation { pname = "hasklepias"; - version = "0.16.1"; - sha256 = "19bskg552zfkfxrkgp7s3pcwjccn3ra3qc13inis55gxg56gwcs0"; + version = "0.18.0"; + sha256 = "1kfsiw32bqf8xl801bk21jzhx5ma7skfi9pnp3vsz3n6n856yva9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cmdargs co-log containers flow ghc-prim - interval-algebra lens lens-aeson mtl nonempty-containers QuickCheck - safe semiring-simple tasty tasty-hunit text time + aeson base bytestring cmdargs co-log containers contravariant flow + ghc-prim interval-algebra lens lens-aeson mtl nonempty-containers + QuickCheck safe semiring-simple tasty tasty-hunit text time tuple unordered-containers vector witherable ]; testHaskellDepends = [ @@ -122725,10 +123294,10 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.71.2"; - sha256 = "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c"; - revision = "2"; - editedCabalFile = "0jidvbmmj4piaxb6apwsd7jypsyjq1a1h2ziz82pc8w13yzascj3"; + version = "0.72.0"; + sha256 = "09p79w16fgpqi6bwq162769xdrnyb7wnmz56k00nz6dj1a0bbbdd"; + revision = "1"; + editedCabalFile = "0q39ssdgm6lcmqj92frjvr53i34divx53zli0qar39mx8ka1l8ml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123700,17 +124269,18 @@ self: { "hasqlator-mysql" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers, dlist - , io-streams, megaparsec, mtl, mysql-haskell, pretty-simple - , prettyprinter, scientific, template-haskell, text, time + , io-streams, megaparsec, mtl, mysql-haskell, optics-core + , pretty-simple, prettyprinter, scientific, template-haskell, text + , time }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.0.8"; - sha256 = "1ns8ckpvib53s4gvdd3pa5c0ypqw2qw2fwvxakkkd1h66xx8as08"; + version = "0.1.0"; + sha256 = "0pkgnx54f4487rc9i5286g3xm9kb6g8fhgbqn4p2yddl8mwzpdby"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec - mtl mysql-haskell pretty-simple prettyprinter scientific - template-haskell text time + mtl mysql-haskell optics-core pretty-simple prettyprinter + scientific template-haskell text time ]; description = "composable SQL generation"; license = lib.licenses.bsd3; @@ -126150,6 +126720,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "hedis_0_15_0" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit + , mtl, network, network-uri, resource-pool, scanner, stm + , test-framework, test-framework-hunit, text, time, tls + , unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.15.0"; + sha256 = "1wcsjvya9hnvgjl9vnimi3928fx2gy0glgdc30slfwnjpijs97n0"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing containers deepseq errors + exceptions HTTP mtl network network-uri resource-pool scanner stm + text time tls unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -126273,6 +126869,8 @@ self: { pname = "hedn"; version = "0.3.0.3"; sha256 = "0amfsmnly9yxzv1j34ya8kq9fqd067kgklx7rswy5g7aflj3bpwl"; + revision = "1"; + editedCabalFile = "0b7574wgav4xkk4ykazvh2dpl3z5dyln2n55m6z288rbw56diylb"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -126875,8 +127473,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.8.2"; - sha256 = "0zz0s9xpi5gdma1ljfbspfysn8vw05859k159nx8lxqbivpf6bxn"; + version = "0.8.3"; + sha256 = "0gwbks6yrjjrys39043wdyx1v0fg8ailv3149b2xi4d49p4jin40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126925,8 +127523,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api"; - version = "0.7.0.0"; - sha256 = "0c8mhmhz89fw0s65a669cpcldqv0g01z9s2343ksv2ykaqz5whi9"; + version = "0.7.1.0"; + sha256 = "1vlkfxkd7arb4qaqyvk4cc2w3b37xzhiqmz6smmpjdddpa39lh8c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126957,8 +127555,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.4.0.0"; - sha256 = "05jdxlr5afr9chayc6frbi9hhagb9qknfdnd2k25cimd7h2syi7r"; + version = "0.4.1.0"; + sha256 = "0cv4cd74049b7j2hy1p3fdr94p0f4fnjzwj78hf1f4lw7migi2vi"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie deepseq exceptions hashable hercules-ci-api-core http-api-data @@ -127006,15 +127604,16 @@ self: { , hercules-ci-api-core, hercules-ci-cnix-expr , hercules-ci-cnix-store, hercules-ci-optparse-applicative , hostname, hspec, http-client, http-client-tls, http-types, katip - , lifted-base, monad-control, network-uri, process, protolude - , QuickCheck, rio, safe-exceptions, servant, servant-auth-client - , servant-client, servant-client-core, servant-conduit, temporary - , text, transformers-base, unix, unliftio, unordered-containers + , lens, lens-aeson, lifted-base, monad-control, network-uri + , process, protolude, QuickCheck, retry, rio, safe-exceptions + , servant, servant-auth-client, servant-client, servant-client-core + , servant-conduit, temporary, text, transformers, transformers-base + , unix, unliftio, unliftio-core, unordered-containers, uuid }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.2.1"; - sha256 = "1lbvc2n1mjrnvnpnqvgjd1zbsa96zdpvjhbawfd8rw63ih8l451z"; + version = "0.2.2"; + sha256 = "1n0dxpvjxi38whqh37d930rbic96gq13g7x8mi8skw164n9vha4g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127022,11 +127621,12 @@ self: { containers data-has directory exceptions filepath hercules-ci-agent hercules-ci-api hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store hercules-ci-optparse-applicative hostname - http-client http-client-tls http-types katip lifted-base - monad-control network-uri process protolude rio safe-exceptions - servant servant-auth-client servant-client servant-client-core - servant-conduit temporary text transformers-base unix unliftio - unordered-containers + http-client http-client-tls http-types katip lens lens-aeson + lifted-base monad-control network-uri process protolude retry rio + safe-exceptions servant servant-auth-client servant-client + servant-client-core servant-conduit temporary text transformers + transformers-base unix unliftio unliftio-core unordered-containers + uuid ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -127064,16 +127664,16 @@ self: { "hercules-ci-cnix-store" = callPackage ({ mkDerivation, base, boost, bytestring, conduit, containers , exceptions, hspec, hspec-discover, inline-c, inline-c-cpp, nix - , protolude, template-haskell, temporary, text, unliftio-core + , protolude, template-haskell, temporary, text, unix, unliftio-core , vector }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.2.0.1"; - sha256 = "1vd7wy23glgxs823c8c1754miwpmrfscsfdn74nyx31gci4jhqgx"; + version = "0.2.1.0"; + sha256 = "18165kwcklp6hg9sh5rmqprnc0ixiq8l9w4y87c9m54dbpwdp4na"; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude - template-haskell unliftio-core vector + template-haskell unix unliftio-core vector ]; librarySystemDepends = [ boost ]; libraryPkgconfigDepends = [ nix ]; @@ -128552,6 +129152,25 @@ self: { broken = true; }) {}; + "hgraph" = callPackage + ({ mkDerivation, array, base, clock, containers, happy-dot, HUnit + , linear, mtl, random, transformers + }: + mkDerivation { + pname = "hgraph"; + version = "1.2.0.1"; + sha256 = "0zdjnkisk1m5z8yz6r3sdprxxbikqffjx4aqw3qarafqb46kr9mv"; + libraryHaskellDepends = [ + array base containers happy-dot linear mtl random transformers + ]; + testHaskellDepends = [ base containers HUnit transformers ]; + benchmarkHaskellDepends = [ + base clock containers random transformers + ]; + description = "Tools for working on (di)graphs"; + license = lib.licenses.gpl3Only; + }) {}; + "hgrep" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, ghc , ghc-exactprint, hscolour, lens, optparse-applicative, pcre-heavy @@ -128859,22 +129478,22 @@ self: { "hie-bios" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq - , directory, extra, file-embed, filepath, ghc, hslogger + , directory, exceptions, extra, file-embed, filepath, ghc, hslogger , hspec-expectations, optparse-applicative, process, tasty , tasty-expected-failure, tasty-hunit, temporary, text, time , transformers, unix-compat, unordered-containers, vector, yaml }: mkDerivation { pname = "hie-bios"; - version = "0.7.5"; - sha256 = "0k8g1qkxqqa0ld15s82mvkgsm4icm65dkabsv8sd2mkrhck0lfw8"; + version = "0.7.6"; + sha256 = "13x8m7hg5ahmh96xq703ygx7f2zk69gbrgmrbrrwzvbc9h0ci02r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit conduit-extra - containers cryptohash-sha1 deepseq directory extra file-embed - filepath ghc hslogger process temporary text time transformers - unix-compat unordered-containers vector yaml + containers cryptohash-sha1 deepseq directory exceptions extra + file-embed filepath ghc hslogger process temporary text time + transformers unix-compat unordered-containers vector yaml ]; executableHaskellDepends = [ base directory filepath ghc optparse-applicative @@ -128950,8 +129569,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.4.0.0"; - sha256 = "1frcl9mxmn97qc97l3kw21ksapyndn6jq7yfxxrr0fvzn7jji7wv"; + version = "0.4.1.0"; + sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129392,8 +130011,8 @@ self: { pname = "hills"; version = "0.1.2.7"; sha256 = "0zq402ycyxaw9rpxlgj0307xz80qw1159albzw1q0sr4lxfxykcv"; - revision = "1"; - editedCabalFile = "1wjln7r8q8dhvq4i5svlhk4zfypibi1cjx75jffc1aq54xy0qq3s"; + revision = "2"; + editedCabalFile = "18a6b08lac0cfc0b2aqwg21brq9qnm93cb973papyyraspwar2iv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131400,6 +132019,8 @@ self: { pname = "hlint"; version = "3.2.7"; sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"; + revision = "1"; + editedCabalFile = "1wc66vjdcf0xdwiw7r2ias1xx328ipjw0227w1xfr48if5lgc4k1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131415,7 +132036,7 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hlint_3_3_1" = callPackage + "hlint_3_3_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex @@ -131424,8 +132045,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.3.1"; - sha256 = "12l2p5pbgh1wcn2bh0ax36sclwaiky8hf09ivgz453pb5ss0jghc"; + version = "3.3.4"; + sha256 = "030hvf0hmnf5pamrcqvr97zmm185b1vs0y28nq6vzlyyg15ap6qq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133847,8 +134468,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.18.1"; - sha256 = "15ia0l96yjdnam5vljcsslcavsjwfq0kxldwdcr3zq9c0w6q6i3w"; + version = "5.0.18.2"; + sha256 = "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136607,25 +137228,6 @@ self: { "hs-tags" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc - , mtl, process, strict - }: - mkDerivation { - pname = "hs-tags"; - version = "0.1.5"; - sha256 = "0gy894sr2557a6pmvi99dkn03990r43ycxknryxym62z54bz1q8f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal containers directory filepath ghc mtl process strict - ]; - description = "Create tag files (ctags and etags) for Haskell code"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "hs-tags_0_1_5_1" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, mtl, process, strict }: mkDerivation { @@ -137739,8 +138341,8 @@ self: { }: mkDerivation { pname = "hscim"; - version = "0.3.5"; - sha256 = "16qkrw1a5la2x26d3q1bixxlnf1giqcc8bx4gn4swbynkyrsihr5"; + version = "0.3.6"; + sha256 = "1zd18l4afknhkjqizwhjzyrdh03p5940kvwz5jdrap1bnpszgv3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139683,17 +140285,20 @@ self: { }) {}; "hspec-pg-transact" = callPackage - ({ mkDerivation, base, bytestring, hspec, pg-transact + ({ mkDerivation, base, bytestring, hspec, hspec-core, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres }: mkDerivation { pname = "hspec-pg-transact"; - version = "0.1.0.2"; - sha256 = "030wy3ajlfd7pi6gwfn6xcsl2yi0gvznxl8m7kq001bkiabjmv55"; + version = "0.1.0.3"; + sha256 = "0laxy8sl5gci8nwal1y3rvddw3mf571sk0mv5j4rzqgqzirdmyps"; libraryHaskellDepends = [ base bytestring hspec pg-transact postgresql-simple resource-pool text tmp-postgres ]; + testHaskellDepends = [ + base hspec hspec-core pg-transact postgresql-simple tmp-postgres + ]; description = "Helpers for creating database tests with hspec and pg-transact"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -140995,8 +141600,8 @@ self: { }: mkDerivation { pname = "htdp-image"; - version = "1.1.0.0"; - sha256 = "17123nqkg8yk0pssmshdza0ipc42rx818q9gidig1d1camiyrfl4"; + version = "1.1.0.1"; + sha256 = "1xyz896dikva5pf8ng2brfj5ckrzp1dmqhsnz3pdmi1n0iwa2fcd"; libraryHaskellDepends = [ AC-Angle base gloss ]; testHaskellDepends = [ base gloss HUnit test-framework test-framework-hunit @@ -141593,8 +142198,8 @@ self: { pname = "http-api-data"; version = "0.4.3"; sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz"; - revision = "2"; - editedCabalFile = "1ihz467bn26cszgdk82l49mz2428r7y11693fj2x75fp2h2ml01i"; + revision = "3"; + editedCabalFile = "0hmi3jbk53pa58k86nl07m133x20bx3ls3vyvn4sjxfapdyh81wn"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -141937,23 +142542,6 @@ self: { "http-common" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , case-insensitive, directory, mtl, network, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-common"; - version = "0.8.2.1"; - sha256 = "1pzi1h9qb6mpzkmv1bfa54vfzrp5jcdlbwj1i7qiricrwhqxh3dk"; - libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring case-insensitive - directory mtl network text transformers unordered-containers - ]; - description = "Common types for HTTP clients and servers"; - license = lib.licenses.bsd3; - }) {}; - - "http-common_0_8_3_4" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, directory, mtl, network, random, text , transformers, unordered-containers }: @@ -141967,7 +142555,6 @@ self: { ]; description = "Common types for HTTP clients and servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-conduit" = callPackage @@ -142591,37 +143178,6 @@ self: { "http-streams" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations - , http-common, HUnit, io-streams, lifted-base, mtl, network - , network-uri, openssl-streams, snap-core, snap-server - , system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.8.1"; - sha256 = "0jh7ps2hi72pjzrjwkmq8sq0djwjv9nf9cbxhjb121grg0gzzrbh"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory HsOpenSSL http-common io-streams mtl - network network-uri openssl-streams text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams lifted-base mtl - network network-uri openssl-streams snap-core snap-server - system-fileio system-filepath text transformers - unordered-containers - ]; - description = "An HTTP client using io-streams"; - license = lib.licenses.bsd3; - }) {}; - - "http-streams_0_8_9_4" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive , directory, filepath, ghc-prim, HsOpenSSL, hspec , hspec-expectations, http-common, HUnit, io-streams, lifted-base , mtl, network, network-uri, openssl-streams, random, snap-core @@ -142648,7 +143204,6 @@ self: { ]; description = "An HTTP client using io-streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-test" = callPackage @@ -146170,6 +146725,8 @@ self: { pname = "hzenity"; version = "0.4"; sha256 = "1zyj7wnjcmv5pmgzn6cgly2zalys5i9waik17b4n46kk38f2pv1i"; + revision = "1"; + editedCabalFile = "11b7zavg3d84w8iypikvp8n4yy0d084j9qvifjh9yny2m64w5xav"; libraryHaskellDepends = [ base containers data-default process process-extras text time ]; @@ -146976,6 +147533,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "if-instance" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugin-api }: + mkDerivation { + pname = "if-instance"; + version = "0.3.0.0"; + sha256 = "0d64h9ai0zmyzb9nnxfmr66chxbgdyy6vw2xhqybh4x7ga3ys4r9"; + libraryHaskellDepends = [ base ghc ghc-tcplugin-api ]; + testHaskellDepends = [ base ghc ]; + doHaddock = false; + description = "Branch on whether a constraint is satisfied"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ifcxt" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck , template-haskell @@ -147894,7 +148465,7 @@ self: { }) {}; "imperative-edsl" = callPackage - ({ mkDerivation, array, base, BoundedChan, constraints, containers + ({ mkDerivation, array, base, BoundedChan, containers , data-default-class, deepseq, directory, exception-transformers , filepath, ghc-prim, language-c-quote, mainland-pretty, microlens , microlens-mtl, microlens-th, mtl, operational-alacarte, process @@ -147902,11 +148473,11 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.8.2"; - sha256 = "1m8ynjzi97ps9x9sf03zg7y2vq15kzch9fdnzmh9wsmmkfpqljzs"; + version = "0.9"; + sha256 = "0qzk3kjmjv3357dlc4fa43k4xn7xhyavmbnni0cd86zrilgxha6h"; libraryHaskellDepends = [ - array base BoundedChan constraints containers data-default-class - deepseq directory exception-transformers ghc-prim language-c-quote + array base BoundedChan containers data-default-class deepseq + directory exception-transformers ghc-prim language-c-quote mainland-pretty microlens microlens-mtl microlens-th mtl operational-alacarte process srcloc stm syntactic time ]; @@ -149172,6 +149743,22 @@ self: { broken = true; }) {}; + "injections" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck + , quickcheck-instances, text + }: + mkDerivation { + pname = "injections"; + version = "0.1.0.0"; + sha256 = "0xvsnggwgm4fc41jgkz3mss9w957663rmkcx6kwlwqa8k37dgmgq"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ + base containers hspec QuickCheck quickcheck-instances text + ]; + description = "Canonical categorical conversions (injections and projections)"; + license = lib.licenses.bsd3; + }) {}; + "inline-asm" = callPackage ({ mkDerivation, base, bytestring, containers, either, ghc-prim , hspec, hspec-core, megaparsec, mtl, parser-combinators @@ -149385,6 +149972,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5"; sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y"; + revision = "1"; + editedCabalFile = "12x4xi525ikbqvxh2kmnxsl7cqmbz2l8vqc5ym4lap0p21niiazr"; libraryHaskellDepends = [ aeson base base-compat deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids semigroups text transformers @@ -149435,22 +150024,6 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.5.0"; - sha256 = "1d8bi60m97yw4vxmajclg66xhaap8nj4dli8bxni0mf4mcm0px01"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_6_0" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; version = "0.4.6.0"; sha256 = "0qz1npyycj4bvyly9xmjbnhw569l52h38gx02rk0r7zhapw83aig"; libraryHaskellDepends = [ @@ -149459,7 +150032,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -149813,18 +150385,17 @@ self: { }) {}; "integer-roots" = callPackage - ({ mkDerivation, base, integer-gmp, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, doctest, integer-gmp, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "integer-roots"; - version = "1.0"; - sha256 = "12570cr39jj5lk30ls5nnc0w6881l0kflzhmwpk35qc7m39pjgy1"; - revision = "1"; - editedCabalFile = "0h130qddg27234mhi5spkwcgcxpnmq07bppwig5vq8z70fh5f1qx"; + version = "1.0.0.1"; + sha256 = "1q0gmgxr5xm15y1id47851z2mcklzrwrv5a9jcjadkarx21knc7q"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ - base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + base doctest smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck ]; description = "Integer roots and perfect powers"; license = lib.licenses.mit; @@ -150348,8 +150919,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.10.1"; - sha256 = "1nplznmspji7g51g2xxsr2b5lahhxqnmbs180mm3zmvkam8zizri"; + version = "0.10.2"; + sha256 = "13rglhfcjlwsvch4qcrsjfgcxv4rsxx63zhw3fjzvb5hrj7qvgb1"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -151968,8 +152539,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "isocline"; - version = "1.0.1"; - sha256 = "1s57gqzhic1zjc0fn1j8l834cfa24w9q2rvhbxdfkb442qpw4piw"; + version = "1.0.5"; + sha256 = "05amznscn43vscz3b9rnb2scryriq0gccjx5z5fk1wn47i3dz6vg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -151977,8 +152548,6 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "A portable alternative to GNU Readline"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "isohunt" = callPackage @@ -152739,6 +153308,21 @@ self: { license = lib.licenses.mit; }) {}; + "ixset-typed-cassava" = callPackage + ({ mkDerivation, base, bytestring, cassava, ixset-typed, vector }: + mkDerivation { + pname = "ixset-typed-cassava"; + version = "0.0.2.0"; + sha256 = "0qr0j1pkq2jc0clwbrzwmj31i90n8frxb0gaki0sapmla8pfb5yc"; + revision = "1"; + editedCabalFile = "07qm52l00j4ghhc7bld99nnjkah9filzbkwcyzpdqhisp51q687q"; + libraryHaskellDepends = [ + base bytestring cassava ixset-typed vector + ]; + description = "cassava encoding and decoding via ixset-typed"; + license = lib.licenses.mit; + }) {}; + "ixset-typed-conversions" = callPackage ({ mkDerivation, base, exceptions, free, hashable, ixset-typed , unordered-containers, zipper-extra @@ -157144,7 +157728,7 @@ self: { "keid-core" = callPackage ({ mkDerivation, adjunctions, base, binary, bytestring , cryptohash-md5, derive-storable, derive-storable-plugin - , distributive, foldl, geomancy, GLFW-b, ktx-codec + , distributive, file-embed, foldl, geomancy, GLFW-b, ktx-codec , neat-interpolation, optparse-applicative, optparse-simple , resourcet, rio, rio-app, StateVar, tagged, template-haskell, text , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils @@ -157152,15 +157736,15 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.0.1"; - sha256 = "1hvrnyw1m03v36xyak514a4v0l2jrwz7mr5k3jqzdmab4srz887s"; + version = "0.1.2.0"; + sha256 = "07l493nn691bn6b2c4z684cjfj589vkip6068szc8j2j9pwqgr23"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable - derive-storable-plugin distributive foldl geomancy GLFW-b ktx-codec - neat-interpolation optparse-applicative optparse-simple resourcet - rio rio-app StateVar tagged template-haskell text transformers - unagi-chan unliftio vector vulkan vulkan-utils - VulkanMemoryAllocator zstd + derive-storable-plugin distributive file-embed foldl geomancy + GLFW-b ktx-codec neat-interpolation optparse-applicative + optparse-simple resourcet rio rio-app StateVar tagged + template-haskell text transformers unagi-chan unliftio vector + vulkan vulkan-utils VulkanMemoryAllocator zstd ]; description = "Core parts of Keid engine"; license = lib.licenses.bsd3; @@ -157168,15 +157752,15 @@ self: { }) {}; "keid-geometry" = callPackage - ({ mkDerivation, base, geomancy, keid-core, mtl, rio, rio-app - , vector, vulkan + ({ mkDerivation, base, geomancy, keid-core, mtl, rio, vector + , vulkan }: mkDerivation { pname = "keid-geometry"; - version = "0.1.0.1"; - sha256 = "0cnvgkqcc4nqvsbm9h6kn1l3sgs7dlhcb7iq6z18ynwry8z510w0"; + version = "0.1.1.1"; + sha256 = "1jicgdkxwmi16a7bqc3qh9qr2a691nlxk87b5kh674jnhsr59db2"; libraryHaskellDepends = [ - base geomancy keid-core mtl rio rio-app vector vulkan + base geomancy keid-core mtl rio vector vulkan ]; description = "Geometry primitives for Keid engine"; license = lib.licenses.bsd3; @@ -157184,21 +157768,21 @@ self: { }) {}; "keid-render-basic" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cryptohash-md5 - , derive-storable, derive-storable-plugin, foldl, geomancy, GLFW-b - , keid-core, keid-geometry, neat-interpolation, resourcet, rio - , rio-app, tagged, text, unliftio, vector, vulkan, vulkan-utils - , VulkanMemoryAllocator, zstd + ({ mkDerivation, adjunctions, aeson, base, bytestring + , derive-storable, derive-storable-plugin, distributive, file-embed + , geomancy, keid-core, keid-geometry, neat-interpolation, resourcet + , rio, tagged, text, unliftio, vector, vulkan, vulkan-utils }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.1.0"; - sha256 = "0j8474chg9qbknj71nd288h8r5652rk55vax7y5nzm5qznbirg1b"; + version = "0.1.2.1"; + sha256 = "0dij5rnzzcbggc1mvsg123aynx1s337vv1a4px965aj0ny3lfn0k"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring cryptohash-md5 derive-storable - derive-storable-plugin foldl geomancy GLFW-b keid-core - keid-geometry neat-interpolation resourcet rio rio-app tagged text - unliftio vector vulkan vulkan-utils VulkanMemoryAllocator zstd + adjunctions aeson base bytestring derive-storable + derive-storable-plugin distributive file-embed geomancy keid-core + keid-geometry neat-interpolation resourcet rio tagged text unliftio + vector vulkan vulkan-utils ]; description = "Basic rendering programs for Keid engine"; license = lib.licenses.bsd3; @@ -157224,15 +157808,14 @@ self: { }) {}; "keid-sound-openal" = callPackage - ({ mkDerivation, base, geomancy, keid-core, OpenAL, opusfile - , resourcet, rio, unliftio + ({ mkDerivation, base, keid-core, OpenAL, opusfile, resourcet, rio }: mkDerivation { pname = "keid-sound-openal"; - version = "0.1.0.0"; - sha256 = "17ml9xh8qrvyrcsi1ai6br286bf9c6j29wbmp5sp65spp2kwlyng"; + version = "0.1.1.0"; + sha256 = "1bzx73wm8xf9nbw0771dl6fsq31lg1nxqg20sr14cglbvmpjiscb"; libraryHaskellDepends = [ - base geomancy keid-core OpenAL opusfile resourcet rio unliftio + base keid-core OpenAL opusfile resourcet rio ]; description = "OpenAL sound system for Keid engine"; license = lib.licenses.bsd3; @@ -157240,21 +157823,17 @@ self: { }) {}; "keid-ui-dearimgui" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash-md5 - , dear-imgui, derive-storable, derive-storable-plugin, foldl - , geomancy, GLFW-b, keid-core, neat-interpolation, resourcet, rio - , rio-app, tagged, unliftio, vector, vulkan, vulkan-utils - , VulkanMemoryAllocator, zstd + ({ mkDerivation, base, binary, bytestring, dear-imgui, GLFW-b + , keid-core, resourcet, rio, rio-app, unliftio, vector, vulkan + , vulkan-utils, VulkanMemoryAllocator }: mkDerivation { pname = "keid-ui-dearimgui"; - version = "0.1.0.0"; - sha256 = "1650h7mbzmkpzs2wjvjh3zwmjkvbcg1h36yk6frlvvf80fhhihjc"; + version = "0.1.0.1"; + sha256 = "1b731r5q8bjpiy84kfzy30pn4wppak1m1zx2ssicdl86181wva1l"; libraryHaskellDepends = [ - base binary bytestring cryptohash-md5 dear-imgui derive-storable - derive-storable-plugin foldl geomancy GLFW-b keid-core - neat-interpolation resourcet rio rio-app tagged unliftio vector - vulkan vulkan-utils VulkanMemoryAllocator zstd + base binary bytestring dear-imgui GLFW-b keid-core resourcet rio + rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator ]; description = "DearImGui elements for Keid engine"; license = lib.licenses.bsd3; @@ -157856,8 +158435,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "3"; - editedCabalFile = "1bx73d86qhki4bvqckhv7nrvn06rha6x231fqjms2a7a9zpv47bm"; + revision = "4"; + editedCabalFile = "1n7bf4l3wmm3qcwswjkw1d8n39a4b7pxqizpnpkjwq6lj8qxkmd2"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -158428,6 +159007,8 @@ self: { ]; description = "Client library for Kubernetes"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kubernetes-client-core" = callPackage @@ -158882,17 +159463,17 @@ self: { }) {}; "lambda-cube" = callPackage - ({ mkDerivation, base, hspec, megaparsec, QuickCheck + ({ mkDerivation, base, hspec, megaparsec, syb, tasty, tasty-hspec , template-haskell, text }: mkDerivation { pname = "lambda-cube"; - version = "0.1.0.0"; - sha256 = "0s5sh4r43r5xhlldxqy2snddc5dgnx2rpawk4pipxp69983xhazi"; - revision = "3"; - editedCabalFile = "0ycaf4j9g0zsbw4qjwd6san4vn7h6iiyyf0dqgqwcl0vfv7z2hf0"; - libraryHaskellDepends = [ base megaparsec template-haskell text ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "0.3.0.0"; + sha256 = "0m4w9pvm87j421yqw5iwywbjpwdpywgliia0bdvnynsms1z8s2a4"; + libraryHaskellDepends = [ + base megaparsec syb template-haskell text + ]; + testHaskellDepends = [ base hspec tasty tasty-hspec text ]; description = "Haskell implementation of (some of) lambda cube calculi"; license = lib.licenses.mit; }) {}; @@ -159061,7 +159642,7 @@ self: { ]; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ ncfavier ]; }) {}; "lambdabot-core" = callPackage @@ -159199,8 +159780,6 @@ self: { ]; description = "Social plugins for Lambdabot"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdabot-trusted" = callPackage @@ -160064,6 +160643,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_10_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter + , QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "10.1.1"; + sha256 = "0qk6riw3xf57p4jizw15bd45in924vmjkrycaw0dvwkizb74a53b"; + libraryHaskellDepends = [ + base bytestring containers data-default-class megaparsec + prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default-class hspec + hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split + text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -161475,8 +162077,8 @@ self: { pname = "lattices"; version = "2.0.2"; sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix"; - revision = "3"; - editedCabalFile = "1n1sv7477v88ibcwb5rh4p1r9r4hj0jj7s0vh6r0y2w4hbhpslvr"; + revision = "4"; + editedCabalFile = "1kqxhrbj0kd9l4fn7qryg9a2k7ad4f7mj4nsaz6lxa90lvi3ynj7"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -161707,6 +162309,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lazify" = callPackage + ({ mkDerivation, base, containers, tagged, transformers }: + mkDerivation { + pname = "lazify"; + version = "0.1.0.1"; + sha256 = "14ar766spifs3acdki8namldgy77fjjd2gxli16k08gnl65bpk1y"; + libraryHaskellDepends = [ base containers tagged transformers ]; + testHaskellDepends = [ base ]; + description = "A simple utility for lazy record matching"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "lazy" = callPackage ({ mkDerivation, base, comonad }: mkDerivation { @@ -162017,6 +162633,35 @@ self: { license = lib.licenses.bsd2; }) {}; + "ldap-scim-bridge" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , email-validate, hscim, http-client, http-client-tls, http-types + , ldap-client, network, relude, servant, servant-client + , servant-client-core, string-conversions, text, tinylog, yaml + }: + mkDerivation { + pname = "ldap-scim-bridge"; + version = "0.2"; + sha256 = "16z878iq7b2spa6mhppm1bjj2hi73f9rm6pl9yw6yz7zbqphi9sd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers email-validate hscim + http-client http-client-tls http-types ldap-client network relude + servant servant-client servant-client-core string-conversions text + tinylog yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers email-validate hscim + http-client http-client-tls http-types ldap-client network relude + servant servant-client servant-client-core string-conversions text + tinylog yaml + ]; + description = "See README for synopsis"; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "ldapply" = callPackage ({ mkDerivation, base, bytestring, docopt, interpolatedstring-perl6 , LDAP, ldif, unordered-containers @@ -162620,8 +163265,8 @@ self: { pname = "lens"; version = "5.0.1"; sha256 = "0gzwx4b758phm51hz5i4bbkbvjw1ka7qj04zd9l9sh9n6s9ksm7c"; - revision = "1"; - editedCabalFile = "0lk83zwnl91yyhzkq6zx18plkk85pdvdf8x0y5rivqkgmr1vwzy9"; + revision = "2"; + editedCabalFile = "1h3jcadrms3xqd0887ckf9190xc3dblmlz9xhb0imlw1rkvj62dw"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -162983,6 +163628,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "lens-tell" = callPackage + ({ mkDerivation, base, lens, tell }: + mkDerivation { + pname = "lens-tell"; + version = "0.1"; + sha256 = "1d0rjlvai6gsavbfw7zxn8m79vxn61pa9fq9d8v5l707mlm9hsz6"; + libraryHaskellDepends = [ base lens tell ]; + description = "MonadTell-based lens combinators"; + license = lib.licenses.bsd3; + }) {}; + "lens-text-encoding" = callPackage ({ mkDerivation, base, bytestring, lens, text }: mkDerivation { @@ -164469,8 +165125,8 @@ self: { pname = "libtelnet"; version = "0.1.0.1"; sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; - revision = "1"; - editedCabalFile = "13lg79nlwmhd5qqyr31bk7wpfl0mvr37q4ha3q83gxya03f34v5h"; + revision = "2"; + editedCabalFile = "1f05qj982h6kkr3mdhxqaycxm39ngw2ljcdx4qr4ydyh5ix6mjw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -165191,24 +165847,18 @@ self: { , bytestring, cryptohash-sha256, deepseq, free, hspec , hspec-discover, hspec-expectations, hspec-wai, http-api-data , http-client, http-client-tls, http-media, http-types, mtl - , scientific, servant, servant-client, servant-client-core - , servant-server, string-conversions, text, time, transformers, wai - , wai-extra, warp + , servant, servant-client, servant-client-core, servant-server + , string-conversions, text, time, transformers, wai, warp }: mkDerivation { pname = "line-bot-sdk"; - version = "0.7.1"; - sha256 = "0q7nzycmd3adckpzrskjfjw72bcxia278qb9z72sa991riyawscz"; - isLibrary = true; - isExecutable = true; + version = "0.7.2"; + sha256 = "0nz4c5r06lkjrmg16nvfg9b6qgiskflrqb14cw69mj74szflqkaw"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 deepseq http-api-data http-client http-client-tls http-media http-types mtl - scientific servant servant-client servant-client-core - servant-server string-conversions text time transformers wai - ]; - executableHaskellDepends = [ - base servant servant-server transformers wai wai-extra warp + servant servant-client servant-client-core servant-server + string-conversions text time wai ]; testHaskellDepends = [ aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256 @@ -169976,8 +170626,8 @@ self: { ({ mkDerivation, base, unamb }: mkDerivation { pname = "lub"; - version = "0.1.7"; - sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h"; + version = "0.1.8"; + sha256 = "0b3p70sw88a66c0gzj0h5mn3ki72ya5zyx70934mkzh1y4lcwicc"; libraryHaskellDepends = [ base unamb ]; description = "information operators: least upper bound (lub) and greatest lower bound (glb)"; license = lib.licenses.bsd3; @@ -172093,8 +172743,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.4.0"; - sha256 = "0cp0xd4by5ml1526lybqvxr1g5ccgskmj9ibl3xnrcmkbi9a14y6"; + version = "0.5.5.0"; + sha256 = "1zq7kfs513zh7v5y4hafh5d6ly4jhmxsl3rfjavh2faw4i19fy3n"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -173174,8 +173824,10 @@ self: { }: mkDerivation { pname = "matchable-th"; - version = "0.1.1.1"; - sha256 = "0q6bvdfmdil68van4cmhy6kj2w0x1kf2kgs2f3wzz6m723ach30v"; + version = "0.1.2.0"; + sha256 = "007ngl7c5sl57pjg40kl6iwz0bwb93ky4vd7z2x4qsjw4p6qgc0j"; + revision = "1"; + editedCabalFile = "11q83hcj3a58y76r12yfj29yi6inrgcnjq770f86c8dq28ibzbiw"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -174166,6 +174818,32 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "mcmc_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, circular, containers + , criterion, data-default, deepseq, directory, dirichlet + , double-conversion, hspec, log-domain, math-functions, matrices + , microlens, monad-parallel, mwc-random, pretty-show, primitive + , statistics, time, transformers, vector, zlib + }: + mkDerivation { + pname = "mcmc"; + version = "0.6.0.0"; + sha256 = "13m4rdgfwvwhw7nznxlq6af2w56pizgypxxyn8g2agzn2vl6nzfl"; + libraryHaskellDepends = [ + aeson base bytestring circular containers data-default deepseq + directory dirichlet double-conversion log-domain math-functions + matrices microlens monad-parallel mwc-random pretty-show primitive + statistics time transformers vector zlib + ]; + testHaskellDepends = [ + base hspec log-domain mwc-random statistics + ]; + benchmarkHaskellDepends = [ base criterion microlens mwc-random ]; + description = "Sample from a posterior using Markov chain Monte Carlo"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -180876,6 +181554,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoidal-functors" = callPackage + ({ mkDerivation, base, bifunctors, comonad, contravariant + , profunctors, semigroupoids, tagged, these + }: + mkDerivation { + pname = "monoidal-functors"; + version = "0.1.0.0"; + sha256 = "0k590a0hmdzg9zwq697v73xdr0xh03yalr5pzxqkbx59grg31dw3"; + libraryHaskellDepends = [ + base bifunctors comonad contravariant profunctors semigroupoids + tagged these + ]; + license = lib.licenses.mit; + }) {}; + "monoidplus" = callPackage ({ mkDerivation, base, contravariant, semigroups, transformers }: mkDerivation { @@ -180919,8 +181612,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.0.0.2"; - sha256 = "1m0c6ldc5sg2if4b21n7b13f5rpyws0vmw9nn8gjqly7rbq446az"; + version = "1.0.0.3"; + sha256 = "1jzjpzf3y5rawis57f8a08sxpqhmjgkndvjks5n06406k4c9qafd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181052,8 +181745,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "1"; - editedCabalFile = "0hg0qa1bja05ls9l0aascqxx65nxvm1rwyvgis93ajwrbqpbi9j5"; + revision = "2"; + editedCabalFile = "1fvpzhfjpf2j01p2rwds6m82d2q0j77ak5v467nxsc8f161rfz21"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -181082,6 +181775,27 @@ self: { broken = true; }) {}; + "monus-weighted-search" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq, mtl + , QuickCheck, random, tasty, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "monus-weighted-search"; + version = "0.1.0.0"; + sha256 = "121pmhk45kq290xxqnj9d74p2y9lyml3m9b3321j6943fshfx772"; + libraryHaskellDepends = [ + array base containers deepseq mtl QuickCheck random transformers + ]; + testHaskellDepends = [ + array base mtl QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion random ]; + description = "Efficient search weighted by an ordered monoid with monus"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "monzo" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, hspec, http-client, http-client-tls, mtl, network @@ -181352,18 +182066,18 @@ self: { }) {}; "morph" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , optparse-applicative, postgresql-simple, text, yaml + ({ mkDerivation, base, bytestring, directory, filepath + , optparse-applicative, postgresql-simple, text }: mkDerivation { pname = "morph"; - version = "0.1.1.3"; - sha256 = "0dbqw6bk5wnmbbn494qzfrh55cxwb80d0kc2vn4j5y043iznswgm"; + version = "0.2.0.0"; + sha256 = "0yc6b5gmr8px2vcrdg09l9xs77la3dwxd3ay0hix89g28wrrfv6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring directory filepath optparse-applicative - postgresql-simple text yaml + base bytestring directory filepath optparse-applicative + postgresql-simple text ]; executableHaskellDepends = [ base ]; description = "A simple database migrator for PostgreSQL"; @@ -185749,6 +186463,8 @@ self: { ]; description = "Simple interface to rendering with NanoVG"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nanq" = callPackage @@ -186625,7 +187341,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "net-mqtt_0_8_0_2" = callPackage + "net-mqtt_0_8_1_0" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, checkers, conduit, conduit-extra, connection , containers, deepseq, HUnit, network-conduit-tls, network-uri @@ -186634,8 +187350,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.0.2"; - sha256 = "0rvsyb9msp1dkba941094d07apdinlda0hg4pb32jxs17wwnj0a7"; + version = "0.8.1.0"; + sha256 = "1cy17mv8ld3aifh1nr5sggm4x08h58vaa6q1s7nd7nhnkj1icajk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189476,20 +190192,21 @@ self: { }) {}; "nix-tree" = callPackage - ({ mkDerivation, aeson, base, brick, bytestring, clock, containers - , deepseq, directory, filepath, hashable, hedgehog, hrfsize, relude - , text, transformers, typed-process, unordered-containers, vty + ({ mkDerivation, aeson, async, base, brick, bytestring, clock + , containers, deepseq, directory, filepath, hashable, hedgehog + , hrfsize, relude, terminal-progress-bar, text, transformers + , typed-process, unordered-containers, vty }: mkDerivation { pname = "nix-tree"; - version = "0.1.7"; - sha256 = "17w0lcfr2rxyfzrdhbw9lci9k5xs1566jypip910r78373c72nbj"; + version = "0.1.8"; + sha256 = "0bbisb0n7jg5ng17qyh92rbx1qphvd8w4gr6v773j8m72j24vj0c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base brick bytestring clock containers deepseq directory - filepath hashable hrfsize relude text transformers typed-process - unordered-containers vty + aeson async base brick bytestring clock containers deepseq + directory filepath hashable hrfsize relude terminal-progress-bar + text transformers typed-process unordered-containers vty ]; testHaskellDepends = [ aeson base brick bytestring clock containers deepseq directory @@ -189583,27 +190300,56 @@ self: { }) {}; "nixpkgs-update" = callPackage - ({ mkDerivation, base, directory, doctest, errors, filepath, github - , mtl, neat-interpolation, optparse-applicative, regex-applicative - , shelly, text, time, unix, vector + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , cryptohash-sha256, directory, doctest, errors, filepath, github + , hspec, hspec-discover, http-client, http-client-tls, http-conduit + , http-types, iso8601-time, lifted-base, mtl, neat-interpolation + , optparse-applicative, parsec, parsers, partial-order, polysemy + , polysemy-plugin, regex-applicative-text, servant, servant-client + , sqlite-simple, template-haskell, temporary, text, th-env, time + , transformers, typed-process, unix, unordered-containers, vector + , versions, xdg-basedir, zlib }: mkDerivation { pname = "nixpkgs-update"; - version = "0.2.0"; - sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z"; - isLibrary = false; + version = "0.3.0"; + sha256 = "1lgy6m3s4qr2kgjhvly55f05y32aljdpzrd45r4fprmycf5zj2h7"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers cryptohash-sha256 + directory errors filepath github http-client http-client-tls + http-conduit http-types iso8601-time lifted-base mtl + neat-interpolation optparse-applicative parsec parsers + partial-order polysemy polysemy-plugin regex-applicative-text + servant servant-client sqlite-simple template-haskell temporary + text th-env time transformers typed-process unix + unordered-containers vector versions xdg-basedir zlib + ]; executableHaskellDepends = [ - base directory errors filepath github mtl neat-interpolation - optparse-applicative regex-applicative shelly text time unix vector + aeson base bytestring conduit containers cryptohash-sha256 + directory errors filepath github http-client http-client-tls + http-conduit http-types iso8601-time lifted-base mtl + neat-interpolation optparse-applicative parsec parsers + partial-order polysemy polysemy-plugin regex-applicative-text + servant servant-client sqlite-simple template-haskell temporary + text th-env time transformers typed-process unix + unordered-containers vector versions xdg-basedir zlib ]; testHaskellDepends = [ - base directory doctest errors filepath github mtl - neat-interpolation optparse-applicative regex-applicative shelly - text time unix vector + aeson base bytestring conduit containers cryptohash-sha256 + directory doctest errors filepath github hspec hspec-discover + http-client http-client-tls http-conduit http-types iso8601-time + lifted-base mtl neat-interpolation optparse-applicative parsec + parsers partial-order polysemy polysemy-plugin + regex-applicative-text servant servant-client sqlite-simple + template-haskell temporary text th-env time transformers + typed-process unix unordered-containers vector versions xdg-basedir + zlib ]; + testToolDepends = [ hspec-discover ]; description = "Tool for semi-automatic updating of nixpkgs repository"; - license = lib.licenses.publicDomain; + license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190177,8 +190923,8 @@ self: { }: mkDerivation { pname = "nonempty-containers"; - version = "0.3.4.1"; - sha256 = "0cpn0f0gnir9w366hw2906316qx5yc06rrrlv67xba1p66507m83"; + version = "0.3.4.3"; + sha256 = "1k58xj3cvi4s79ga5xi3ci16lh6wcxsb9qsn9ipa1kvzj0p4i5g0"; libraryHaskellDepends = [ aeson base comonad containers deepseq nonempty-vector semigroupoids these vector @@ -190874,8 +191620,8 @@ self: { }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.1"; - sha256 = "0nvkq4h7fdc9jifk3dd2sac6bwk4ks4bda8slln8dqwgxbh31ln2"; + version = "0.1.0.2"; + sha256 = "12z515bs17ig8ps1kq2pp1c80r6cn0rldvqa6rzfgc1nrd0p8hc9"; libraryHaskellDepends = [ aeson async base bytestring conduit hedis nri-env-parser nri-observability nri-prelude resourcet safe-exceptions text @@ -191261,6 +192007,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "numeric-logarithms" = callPackage + ({ mkDerivation, base, integer-gmp, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "numeric-logarithms"; + version = "0.1.0.0"; + sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; + libraryHaskellDepends = [ base integer-gmp ]; + testHaskellDepends = [ + base integer-gmp QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "Efficient rounded log2 algorithms on integral and rational types"; + license = lib.licenses.asl20; + }) {}; + "numeric-ode" = callPackage ({ mkDerivation, ad, base, Chart, Chart-cairo, colour , data-accessor, data-default-class, diagrams-cairo, diagrams-lib @@ -191423,14 +192186,13 @@ self: { broken = true; }) {}; - "numhask_0_8_0_0" = callPackage - ({ mkDerivation, base, doctest, QuickCheck }: + "numhask_0_8_1_0" = callPackage + ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.8.0.0"; - sha256 = "104vc3b43lbck6r39kv5rscvqx3hxxf8nyvzsw8shb9xifmnijkh"; + version = "0.8.1.0"; + sha256 = "0qq9fr4nm5swarc266mnz5xly296db4nwzm7k5cwsn2pjijmyknk"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -191438,18 +192200,16 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, distributive, doctest, numhask - , vector + ({ mkDerivation, adjunctions, base, distributive, numhask, vector }: mkDerivation { pname = "numhask-array"; - version = "0.9.0"; - sha256 = "09l0cm2f66c5bagrwby8bj22b6lklbi8mbsgxxh0gw5zvb9bhgmr"; + version = "0.9.1"; + sha256 = "02xklvpk21h97005xs1ywll83qn3h6845zxp9baljk12b9j4ls1r"; libraryHaskellDepends = [ adjunctions base distributive numhask vector ]; - testHaskellDepends = [ base doctest ]; - description = "Multi-dimensional array interface for numhask"; + description = "Multi-dimensional arrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -191544,18 +192304,16 @@ self: { "numhask-space" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive - , doctest, numhask, random, semigroupoids, tdigest, text, time - , vector + , numhask, random, semigroupoids, tdigest, text, time, vector }: mkDerivation { pname = "numhask-space"; - version = "0.8.0.0"; - sha256 = "1ya4fcr0mxj4blijl2k2sdfkkywjmr616qcaddl7zqphjvrc4gd0"; + version = "0.8.1.0"; + sha256 = "1j117m1qfnl5h286x6c8kbm06xpm8rqqkipv1qbw0sp7a0cc022z"; libraryHaskellDepends = [ adjunctions base containers distributive numhask random semigroupoids tdigest text time vector ]; - testHaskellDepends = [ base doctest ]; description = "Numerical spaces"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -195199,10 +195957,8 @@ self: { }: mkDerivation { pname = "optparse-generic"; - version = "1.4.4"; - sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; - revision = "3"; - editedCabalFile = "1y5m84d72z2fhnzznlyq4hj4hfg04hgszng3ps4dz4s1wd565m1s"; + version = "1.4.5"; + sha256 = "06lyx1im1a5sxj2i6v3lzc16q8pk6lafqzqvdzg9aiximm3idy1a"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -195272,8 +196028,8 @@ self: { ({ mkDerivation, base, bytestring, opusfile }: mkDerivation { pname = "opusfile"; - version = "0.1.0.0"; - sha256 = "12mjkmsffnid48sjc6j1wrikw4pl1yz5jk6bgnarv86wcs30w54a"; + version = "0.1.0.1"; + sha256 = "159qx2z2q56f42yi3smj9fx7gbpqxxnsyap09hdnpy8rzv4gl904"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -197301,8 +198057,8 @@ self: { ({ mkDerivation, base, containers, pandoc-types, relude, text }: mkDerivation { pname = "pandoc-link-context"; - version = "1.0.0.0"; - sha256 = "0pl232p0cdn810jyp3xjdhf3zfj6ryjmb1f462l4jivawffyjfd4"; + version = "1.2.0.0"; + sha256 = "06yd4wp7v8p1z9jrg4rzcinkkdng94v2gpcs039brb7cb9qi4gpl"; libraryHaskellDepends = [ base containers pandoc-types relude text ]; @@ -197605,8 +198361,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.5"; - sha256 = "0r8pw2zy6yckizy9hrwg3kpg6f9v0dkj0fxw873sxpc4ccz5nkl0"; + version = "0.4.6"; + sha256 = "0x1wnrdbri1jcpi2iva69rw6bs6i9y192fymjamrab0w69bd9p4y"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -199398,6 +200154,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "partial-isomorphisms_0_2_3_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "partial-isomorphisms"; + version = "0.2.3.0"; + sha256 = "08390b7vj02kbx0s5q3irxljr1p8w4rvm6kf33ivv04cal3r2q39"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Partial isomorphisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "partial-lens" = callPackage ({ mkDerivation, base, comonad-transformers, data-lens , transformers @@ -201458,17 +202226,16 @@ self: { }) {}; "perf" = callPackage - ({ mkDerivation, base, containers, deepseq, doctest, foldl, rdtsc - , text, time, transformers + ({ mkDerivation, base, containers, deepseq, foldl, mtl, rdtsc, text + , time, transformers }: mkDerivation { pname = "perf"; - version = "0.7.0"; - sha256 = "140fy74sq3b1k6px008yz2pr9ikikd68llzc411qs3nclwzasxgx"; + version = "0.8.0"; + sha256 = "1wgl5nwvip2mxicskqqj6c0c53rp1x4ls31j5i5njd324kvxp8ql"; libraryHaskellDepends = [ - base containers deepseq foldl rdtsc text time transformers + base containers deepseq foldl mtl rdtsc text time transformers ]; - testHaskellDepends = [ base deepseq doctest rdtsc ]; description = "Low-level run time measurement"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -201914,8 +202681,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.1.1"; - sha256 = "0sg51psmpjsz9hiva0gn3xcnd74a6dwbzx1bzi918idcfkpbn496"; + version = "2.13.1.2"; + sha256 = "09si4h64i9drqr80a2sxpxhmsinacqx9bvsc3jah5zlm915q092y"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -202252,8 +203019,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.13.0.1"; - sha256 = "1gl48xcsczpzipg9v107x970rzi66vr26772ml9z8szxygamgsdb"; + version = "2.13.0.2"; + sha256 = "18ji7a7lb1mjgqvi2mv2cg4vlgjkyzg2hgp09s7c9v071p3ll732"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -202391,6 +203158,40 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_13_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.1.0"; + sha256 = "05bj3b7kdwaba3szrrsmafxr6vcnvdhq20jk5xx348jnf2flkw0i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -203359,6 +204160,7 @@ self: { ]; description = "A generalization of the uniqueness-periods-vector-general functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-permutations" = callPackage @@ -203389,8 +204191,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.8.1.0"; - sha256 = "1y67w8ywcmv8d86b52vhiqxsgk31pglf8hcjnmml2q5kh8cpjwmp"; + version = "0.8.4.0"; + sha256 = "1sxc7qsp93qdf11lp09www1ynrzpnxnc0k00pidz1bpka2hqcjh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203409,17 +204211,22 @@ self: { }: mkDerivation { pname = "phonetic-languages-plus"; - version = "0.2.0.0"; - sha256 = "05xzmkzx3lc070ln6q2ynbqfh6rb70rx1n845gy0i59h6zpsl9ai"; + version = "0.4.0.0"; + sha256 = "01c0yfgg78za60izyak3qcxwf39xydyw405grflwxxkcl4bq5ax7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base lists-flines ]; + libraryHaskellDepends = [ + base bytestring lists-flines parallel + uniqueness-periods-vector-stats + ]; executableHaskellDepends = [ base bytestring lists-flines parallel uniqueness-periods-vector-stats ]; description = "Some common shared between different packages functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-properties" = callPackage @@ -203445,8 +204252,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.9.0.0"; - sha256 = "1xymd8r5lp4jn0qb4p1dyzbhdyb3nsnvphx7f9nvf46kjbz18670"; + version = "0.9.1.0"; + sha256 = "1j2fr1hf6k9b7838sqyv5lq5cx75a44d2adk78ljyc0qx9hh9537"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -203495,8 +204302,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.10.0.0"; - sha256 = "0m7p4iddilaf0v81kjya41m6rczplhw8cl3gq4axwq5lw0x5nppf"; + version = "0.11.0.1"; + sha256 = "0mr1pckay3i72yh1b1dbbm68cbf4jx2vw1w0h86ykvamc1vjy7lp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203523,25 +204330,25 @@ self: { ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-examples-common" = callPackage ({ mkDerivation, base, heaps, mmsyn2-array , phonetic-languages-constraints-array - , phonetic-languages-ukrainian-array, subG - , ukrainian-phonetics-basic-array + , phonetic-languages-ukrainian-array }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.1.1.0"; - sha256 = "09h63czjpab863gi7806k1yw4q9mykszvvnb3zwbv9i97nfbvnfa"; + version = "0.1.3.0"; + sha256 = "09jl0zjpny5xh7f9igglfdl36lazrrr131khi625ay48283g2wpc"; libraryHaskellDepends = [ base heaps mmsyn2-array phonetic-languages-constraints-array - phonetic-languages-ukrainian-array subG - ukrainian-phonetics-basic-array + phonetic-languages-ukrainian-array ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage @@ -203557,8 +204364,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.10.0.0"; - sha256 = "169ln5g5gz4lshsk2qfmj6h25x3xch0ar4mm0i9wn07wa7g1yyvj"; + version = "0.11.0.0"; + sha256 = "0qxvfn4ii0v722r11hgcwb68d19ji1xchdkgr5n4dsbdkzqlvjrf"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -203572,18 +204379,18 @@ self: { ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-common" = callPackage ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics - , subG }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.2.0.0"; - sha256 = "15ngw29ffsyp7j71rpyllfyifvqybgpb5mh2cfgi1vscl8c6zydl"; + version = "0.2.1.0"; + sha256 = "1i05h0rd6svffwpwzsrryzf6yvjwxd0g3f4wasz8mkh1sdgj0r5g"; libraryHaskellDepends = [ - base heaps phonetic-languages-phonetics-basics subG + base heaps phonetic-languages-phonetics-basics ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; @@ -203596,8 +204403,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.8.0.0"; - sha256 = "0fi76agkx6i55121pcj3wxrfw4ymqyqb5l8sa8vm78nvx5r54nsd"; + version = "0.8.1.0"; + sha256 = "0bf3fijam1ipswp85kakhgphp9z3fqjkxl4rkqgh25jvz5yvz4si"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -203648,8 +204455,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.8.0.0"; - sha256 = "1h32g5cqib72j2ib26ch6b1r50j506arx0pz6zfxl968095vmcan"; + version = "0.8.1.0"; + sha256 = "1v2kyb631kf71j71gz0gmvzmmdhzby769gax4fr8p5yng4nabmxg"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -203713,11 +204520,16 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.2.1.0"; - sha256 = "17gyg64hwk5cj9drpdsadyn3l94g2n6m859ghfplr665id2pgzlg"; + version = "0.6.0.0"; + sha256 = "01wsdcnl9vidwbmxv1jlvchad477l5kdkz6jnfm6rnfkyrfwrcrn"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; + executableHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-vector" = callPackage @@ -207568,8 +208380,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.1.3.2"; - sha256 = "0h3fla28m0y9fgw5pxrirz3bhm7baf12z70a5s8rmpi8q5h8v841"; + version = "0.1.4.0"; + sha256 = "1rkk87rnvs58hlcm46l8hqd8zf27madk8yr5p8zs0iliy0j1zsi0"; libraryHaskellDepends = [ aeson base chronos containers polysemy polysemy-time relude text ]; @@ -207583,23 +208395,20 @@ self: { }) {}; "polysemy-conc" = callPackage - ({ mkDerivation, async, base, containers, hedgehog, polysemy - , polysemy-test, polysemy-time, relude, stm, stm-chans - , string-interpolate, tasty, tasty-hedgehog, template-haskell, text - , time, unagi-chan, unix + ({ mkDerivation, async, base, containers, polysemy, polysemy-test + , polysemy-time, relude, stm, stm-chans, string-interpolate, tasty + , template-haskell, text, time, unagi-chan, unix }: mkDerivation { pname = "polysemy-conc"; - version = "0.1.1.0"; - sha256 = "0mhhywk0iziw33j8i47k8fbdk8xrzr382afkk5wlwac7gqr4hxkf"; + version = "0.2.0.0"; + sha256 = "16ywldx4p76s64qfwlm7swdzz8kcvzzrflz7cprlq2pc1fc6bf7x"; libraryHaskellDepends = [ async base containers polysemy polysemy-time relude stm stm-chans string-interpolate template-haskell text time unagi-chan unix ]; testHaskellDepends = [ - async base containers hedgehog polysemy polysemy-test polysemy-time - relude stm stm-chans string-interpolate tasty tasty-hedgehog - template-haskell text time unagi-chan unix + base polysemy polysemy-test polysemy-time stm tasty unagi-chan unix ]; description = "Polysemy Effects for Concurrency"; license = "BSD-2-Clause-Patent"; @@ -207746,8 +208555,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.2.2.2"; - sha256 = "16xr9ym9ahc4452v5rdna8i5xsm7z50zjkjxa6kl6ql3vxrqfj2m"; + version = "0.2.2.3"; + sha256 = "1a2l9zspg0ajbgq0vqbxz399fcbr53sydhk71j8ii8y79pm1b3z4"; libraryHaskellDepends = [ ansi-terminal base polysemy polysemy-conc polysemy-time relude string-interpolate template-haskell text time @@ -207769,8 +208578,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.2.2.2"; - sha256 = "1w3jyl8qb491v2a0lbkffpg7yx04mwhxsv1zqk7894145rryxkpn"; + version = "0.2.2.3"; + sha256 = "04gx2irrj59rs0jm0mrc3mka3xk46qx9z5mwad4akh0kmpsl09rz"; libraryHaskellDepends = [ base co-log co-log-core co-log-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -207792,8 +208601,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.2.2.2"; - sha256 = "0p1sz7w247fqvxjmz0bjh34nbvb8p9pc4wimklcmkvghqzny5qkz"; + version = "0.2.2.3"; + sha256 = "050y12sgd4j3487q01bczsjsn1dask507gpz1i8fgl958vr0ywwj"; libraryHaskellDepends = [ base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -208066,8 +208875,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.1.3.2"; - sha256 = "0h0fds1qz2k9w24v6kng8hb5zr32r6y6r8jm2jaj2krn9s58pv7b"; + version = "0.1.4.0"; + sha256 = "1j6qm8nribp876z4h8jgms0790qmm37f32k5aw883c8716nfavjq"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor @@ -208142,8 +208951,8 @@ self: { }: mkDerivation { pname = "polysemy-webserver"; - version = "0.2.1.0"; - sha256 = "1kzswc20c2a720r46krphwckp6bcgkinw59immjpwvixxdfd0bma"; + version = "0.2.1.1"; + sha256 = "126c4bw0gj9knvqn67yldzy90cp08hmc70ip85vsfl3njd0ayj33"; libraryHaskellDepends = [ base bytestring http-types polysemy polysemy-plugin wai wai-websockets warp websockets @@ -208825,6 +209634,80 @@ self: { license = lib.licenses.bsd3; }) {}; + "portray" = callPackage + ({ mkDerivation, base, containers, HUnit, test-framework + , test-framework-hunit, text, wrapped + }: + mkDerivation { + pname = "portray"; + version = "0.1.0.0"; + sha256 = "06czmcf00rdhj7f5xyrllkjmbqsvgv7j9bxvr0jn4cipvnd8lq7c"; + libraryHaskellDepends = [ base containers text wrapped ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit text + wrapped + ]; + description = "A pseudo-Haskell syntax type and typeclass producing it"; + license = lib.licenses.asl20; + }) {}; + + "portray-diff" = callPackage + ({ mkDerivation, base, containers, dlist, portray, text, wrapped }: + mkDerivation { + pname = "portray-diff"; + version = "0.1.0.0"; + sha256 = "16lb8gcvdqbnjz72znjcm5c8zrydnjwwmqr9hm4bq3vay4f2dapm"; + libraryHaskellDepends = [ + base containers dlist portray text wrapped + ]; + description = "Visualize the structural differences between two values"; + license = lib.licenses.asl20; + }) {}; + + "portray-diff-hunit" = callPackage + ({ mkDerivation, base, HUnit, portray-diff, portray-pretty, pretty + }: + mkDerivation { + pname = "portray-diff-hunit"; + version = "0.1.0.0"; + sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; + libraryHaskellDepends = [ + base HUnit portray-diff portray-pretty pretty + ]; + description = "Equality assertion functions for HUnit based on portray-diff"; + license = lib.licenses.asl20; + }) {}; + + "portray-diff-quickcheck" = callPackage + ({ mkDerivation, base, portray-diff, portray-pretty, QuickCheck }: + mkDerivation { + pname = "portray-diff-quickcheck"; + version = "0.1.0.0"; + sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; + libraryHaskellDepends = [ + base portray-diff portray-pretty QuickCheck + ]; + description = "Equality assertion functions for QuickCheck based on portray-diff"; + license = lib.licenses.asl20; + }) {}; + + "portray-pretty" = callPackage + ({ mkDerivation, base, HUnit, portray, portray-diff, pretty + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "portray-pretty"; + version = "0.1.0.0"; + sha256 = "1pz42y8b0psks8p9yd18ns0149q9m41ym4ah28zcg1arl36b3bf4"; + libraryHaskellDepends = [ base portray portray-diff pretty text ]; + testHaskellDepends = [ + base HUnit portray portray-diff pretty test-framework + test-framework-hunit text + ]; + description = "\"pretty\" integration for \"portray\""; + license = lib.licenses.asl20; + }) {}; + "ports" = callPackage ({ mkDerivation, base, haskell98, unix }: mkDerivation { @@ -209247,8 +210130,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.4"; - sha256 = "1im0wfssg8f31rdis86qxhz0cqra1bdgiyxgsbqxf78qi3w05f4c"; + version = "0.12.4.1"; + sha256 = "1pldd0fx60bl2xfdlyygjdk5p415lgh94km6l48nfib6sxqwlks4"; libraryHaskellDepends = [ aeson base binary-parser bytestring bytestring-strict-builder containers network-ip scientific text time transformers @@ -212756,14 +213639,14 @@ self: { }: mkDerivation { pname = "procex"; - version = "0.3.0"; - sha256 = "1s4p6150ps17pb1wzq1qysw92nivy1pxqpwacqyyclkrg07rql9b"; + version = "0.3.1"; + sha256 = "16f91ic12wldf59dabdca76bdcvq5r1alf05bai060dby5qqj2qj"; libraryHaskellDepends = [ async base bytestring containers deepseq unix utf8-string ]; testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; - license = lib.licenses.asl20; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213409,8 +214292,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.17"; - sha256 = "1c98ybwv8jdswkx80q2wlxr7jqll6kyy07lyk2rc27phxb153slk"; + version = "0.0.0.18"; + sha256 = "0pjw02zr3gvwfq8raibqq4dwmnkf8ybqdg1jv74q9gjgqi5y08pp"; libraryHaskellDepends = [ aeson amazonka base bytestring cassava containers generic-random lens mongoDB mtl network-uri persistent persistent-mongoDB @@ -213465,6 +214348,36 @@ self: { license = lib.licenses.asl20; }) {}; + "prometheus-client_1_1_0" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, clock + , containers, criterion, data-sketches, deepseq, doctest + , exceptions, hspec, mtl, primitive, QuickCheck, random + , random-shuffle, stm, text, transformers, transformers-compat + , utf8-string + }: + mkDerivation { + pname = "prometheus-client"; + version = "1.1.0"; + sha256 = "1f9csz40asdkmmh6kp8sc8gkbxvkrvv8v2byxn4jp67lg7s3g9bx"; + libraryHaskellDepends = [ + atomic-primops base bytestring clock containers data-sketches + deepseq exceptions mtl primitive stm text transformers + transformers-compat utf8-string + ]; + testHaskellDepends = [ + atomic-primops base bytestring clock containers data-sketches + deepseq doctest exceptions hspec mtl primitive QuickCheck + random-shuffle stm text transformers transformers-compat + utf8-string + ]; + benchmarkHaskellDepends = [ + base bytestring criterion random text utf8-string + ]; + description = "Haskell client library for http://prometheus.io."; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "prometheus-effect" = callPackage ({ mkDerivation, base, bytestring, clock, criterion, hashable , http-types, mtl, random, retry, safe-exceptions, streaming @@ -213499,8 +214412,8 @@ self: { }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "1.0.1.1"; - sha256 = "0afa29ym9jvagm8n99axj2qy6m4ps6qd07k1wlyb64078yc2nqn9"; + version = "1.0.1.2"; + sha256 = "06pah4wn9yj65shpgg6lb5pwfmx46gk2nbrs1d6bqiqni05s9pzk"; libraryHaskellDepends = [ base prometheus-client text utf8-string ]; @@ -214530,6 +215443,8 @@ self: { ]; description = "Prune unused Haskell dependencies"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "psc-ide" = callPackage @@ -215319,8 +216234,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.14.3"; - sha256 = "0g0zly5wh75w8p09zq6sy25phbb432vb0allmcbx34vd84nm70ia"; + version = "0.14.4"; + sha256 = "0qda90yycv2yyjdpfqvmsnxbyxpx55b53cfp9rgnbhbrskr0w2vk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215433,8 +216348,8 @@ self: { }: mkDerivation { pname = "purescript-cst"; - version = "0.3.0.0"; - sha256 = "15gf3fxpqngnx75w7g8nyvmj452y3x9p8ymwwk4mkzql0zps2fy2"; + version = "0.4.0.0"; + sha256 = "0r3f5lr9lrv9wpgkwj6nyl42lvxryj2lvr1w7ld4gki8ylq24n8g"; libraryHaskellDepends = [ aeson array base base-compat bytestring containers deepseq dlist filepath microlens mtl protolude scientific semigroups serialise @@ -219694,8 +220609,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.3.1"; - sha256 = "1kn86izm2wpqj59nnpxw34n37bh1w5y7h9rd59c1pcymhp29n6qd"; + version = "0.4"; + sha256 = "1bx98zsykvfc72jaas3qzjm614dliij2bdvbm44fj0npd3zvbq0r"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -220925,8 +221840,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.11"; - sha256 = "1hsk7n8hrskj30wcil4rvjhng3zcj7f9a0dn69371iay4x8d75md"; + version = "0.2.12"; + sha256 = "02vyfcfanf09nd33q37jmnq0wbncvkfjn4hx4yzr62dkmh47bkkf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -222103,6 +223018,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "reflex-dom-pandoc_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, constraints + , containers, data-default, lens, lens-aeson, mtl, pandoc-types + , ref-tf, reflex, reflex-dom-core, safe, skylighting, text, time + }: + mkDerivation { + pname = "reflex-dom-pandoc"; + version = "1.0.0.0"; + sha256 = "1xfz8r61y6kgh0s79406dm816ndvakfpslzblf03y7x2gkzx0fvy"; + libraryHaskellDepends = [ + aeson base binary bytestring constraints containers data-default + lens lens-aeson mtl pandoc-types ref-tf reflex reflex-dom-core safe + skylighting text time + ]; + description = "Render Pandoc documents to HTML using reflex-dom"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reflex-dom-retractable" = callPackage ({ mkDerivation, base, containers, jsaddle, mtl, ref-tf, reflex , reflex-dom @@ -224077,6 +225011,22 @@ self: { broken = true; }) {}; + "reloto" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "reloto"; + version = "2.1.0.20180829"; + sha256 = "1z9y85k9rvi71l2wvv2fyvi9zkqh43ap1a96ayg45acj71m260xg"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-quickcheck text transformers + ]; + description = "Equiprobable draw from publicly verifiable random data"; + license = lib.licenses.agpl3Plus; + }) {}; + "relude" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text @@ -226028,16 +226978,16 @@ self: { ({ mkDerivation, barbies, base, clash-ghc, clash-lib, clash-prelude , containers, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, lens, lift-type, monoidal-containers - , mtl, template-haskell, transformers + , mtl, template-haskell, th-orphans, transformers }: mkDerivation { pname = "retroclash-lib"; - version = "0.1.0"; - sha256 = "062pjqhba41d4bb9gb8wxpd87mpsmzj3np8y9ymagjrnv5iyaf5w"; + version = "0.1.0.1"; + sha256 = "1wcnr6hk05xj3qyq6wdwyn5qv820wi6djlcllyv8nc2cz8zgc3v7"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - lens lift-type monoidal-containers mtl template-haskell + lens lift-type monoidal-containers mtl template-haskell th-orphans transformers ]; description = "Code shared across the code samples in the book \"Retrocomputing with Clash\""; @@ -226544,6 +227494,28 @@ self: { broken = true; }) {}; + "rhbzquery_0_4_4" = callPackage + ({ mkDerivation, base, bytestring, config-ini, directory + , email-validate, extra, filepath, http-types, optparse-applicative + , simple-cmd, simple-cmd-args, text + }: + mkDerivation { + pname = "rhbzquery"; + version = "0.4.4"; + sha256 = "00175smanmcr6k8b83kj7mif47jggxn0pvy64yjc4ikpbw822c2q"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring config-ini directory email-validate extra filepath + http-types optparse-applicative simple-cmd simple-cmd-args text + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Bugzilla query tool"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "rhine" = callPackage ({ mkDerivation, base, containers, deepseq, dunai, free , MonadRandom, random, simple-affine-space, time, transformers @@ -229823,8 +230795,8 @@ self: { }: mkDerivation { pname = "safe-money"; - version = "0.9"; - sha256 = "0c3xpsydqgcz183klmhgdn3xdagrj0falfqb63cmknk77z610s7f"; + version = "0.9.1"; + sha256 = "03fizw68y87lyk6r1r2dmjpakgm1whi54avsb5k2krvmgwhy6fs5"; libraryHaskellDepends = [ base binary constraints deepseq hashable QuickCheck text vector-space @@ -232267,8 +233239,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "4"; - editedCabalFile = "0xwqybz4hhhw6ccqgyf4khis06p2pc17h9b78va0wywqsz01xaqb"; + revision = "5"; + editedCabalFile = "0fvxkpggysz6wfpllqwzx5xywgb2fnfmknw9xhvmxgk765v60jrn"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -233560,6 +234532,31 @@ self: { broken = true; }) {inherit (pkgs) secp256k1;}; + "secp256k1-haskell_0_6_0" = callPackage + ({ mkDerivation, base, base16, bytestring, cereal, deepseq, entropy + , hashable, hspec, hspec-discover, HUnit, monad-par, mtl + , QuickCheck, secp256k1, string-conversions, unliftio-core + }: + mkDerivation { + pname = "secp256k1-haskell"; + version = "0.6.0"; + sha256 = "0qq37xy61kk5h9h6zaiycjlrr1k9kjddy319qgqi0ja9vkm8msj1"; + libraryHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable QuickCheck + string-conversions unliftio-core + ]; + libraryPkgconfigDepends = [ secp256k1 ]; + testHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable hspec HUnit + monad-par mtl QuickCheck string-conversions unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) secp256k1;}; + "secp256k1-legacy" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions @@ -234222,10 +235219,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "semigroups"; - version = "0.19.1"; - sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr"; - revision = "1"; - editedCabalFile = "10hp5ij4zivkgh1paxiwnwclgwf5xv3zrkfyvqkpgdf2l2mpm0nd"; + version = "0.19.2"; + sha256 = "0h1sl3i6k8csy5zkkpy65rxzds9wg577z83aaakybr3n1gcv4855"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = lib.licenses.bsd3; @@ -235490,6 +236485,8 @@ self: { pname = "servant-benchmark"; version = "0.1.2.0"; sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; + revision = "1"; + editedCabalFile = "1zzprj7pw7fzyscg4n9g023c47bb6fywq5b11krazz3vyynh53cc"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -235500,6 +236497,8 @@ self: { ]; description = "Generate benchmark files from a Servant API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-blaze" = callPackage @@ -236642,8 +237641,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.2"; sha256 = "1lqvycbv49x0i3adbsdlcl49n65wxfjzhiz9pj11hg4k0j952q5p"; - revision = "2"; - editedCabalFile = "0cb41wx0lgssda2v26cn36c32j2g0q6gsif7jyy3c5fhaqmn3svv"; + revision = "3"; + editedCabalFile = "0pbv4h3nb61b8ykxniav1a8b769i8qbvxdkpkncgsx1xaklq16ly"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -243158,8 +244157,8 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.3.0.0"; - sha256 = "1z223dhv0qb7labrxppjq65lp2jyscxgxk4rjdvfd2xsglj36dbf"; + version = "0.3.0.1"; + sha256 = "0dx0g6syvp9j5nslv7zdrawf7ldabgdpcrxlwmcijslfr29dk12h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -243532,6 +244531,29 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "slynx_0_6_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , mwc-random, optparse-applicative, statistics, text, transformers + , vector + }: + mkDerivation { + pname = "slynx"; + version = "0.6.0.0"; + sha256 = "0jk3l7nlz0s57x952qcn1yj6fdfds01flcz6xiykpjwbyjm0fq81"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix mwc-random optparse-applicative + statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -246495,8 +247517,8 @@ self: { ({ mkDerivation, base, constraints }: mkDerivation { pname = "some-dict-of"; - version = "0.1.0.0"; - sha256 = "0c7gr41fqak777wnh0q81mkpv89j6m1q3qqca5r2mzqhkqli4d4d"; + version = "0.1.0.1"; + sha256 = "15gs459x08a8dg18vjizy0rmhh0vnmy33dvx9a38jni0bpmmnc6f"; libraryHaskellDepends = [ base constraints ]; testHaskellDepends = [ base constraints ]; description = "Carry evidence of constraints around"; @@ -247515,12 +248537,12 @@ self: { broken = true; }) {}; - "speculate_0_4_12" = callPackage + "speculate_0_4_14" = callPackage ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; - version = "0.4.12"; - sha256 = "0v5c8nzad1y5wjrnjswq4hyahkfmmb4npzhrrkdg5brwv6c784v7"; + version = "0.4.14"; + sha256 = "1v635vvj4c3krbgv0y681l0dd3kq6knb9vfqy1jhnci14dy2nnr2"; libraryHaskellDepends = [ base cmdargs containers express leancheck ]; @@ -249236,20 +250258,20 @@ self: { }) {}; "stack-all" = callPackage - ({ mkDerivation, aeson, base, bytestring, config-ini, directory - , extra, filepath, http-query, process, simple-cmd, simple-cmd-args - , text, time, unordered-containers, xdg-basedir + ({ mkDerivation, aeson, base, cached-json-file, config-ini + , directory, extra, filepath, http-query, process, simple-cmd + , simple-cmd-args, text, unordered-containers }: mkDerivation { pname = "stack-all"; - version = "0.3"; - sha256 = "0bxrchryn0r02bbkxwwyi9rlkknjqwbiypbfj47q9fzyb2rv9gk1"; + version = "0.3.1"; + sha256 = "0jsz28p1xpzh77r3mhjh98jsz3lnzirfvh9w64rcgxpacdyajwhf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring config-ini directory extra filepath - http-query process simple-cmd simple-cmd-args text time - unordered-containers xdg-basedir + aeson base cached-json-file config-ini directory extra filepath + http-query process simple-cmd simple-cmd-args text + unordered-containers ]; description = "CLI tool for building across Stackage major versions"; license = lib.licenses.bsd3; @@ -251093,8 +252115,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "5"; - editedCabalFile = "03xg6n7dyz73y3llbbahnlh46xfy2iq29s1jwjp22qxd4z6xndsa"; + revision = "6"; + editedCabalFile = "01ncir4kfij1wp591wi333isf20v4sppjfcv27siz6m048cbscg4"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -252631,24 +253653,23 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client , http-client-tls, json-stream, mtl, network, network-simple, pipes , resourcet, streaming, streaming-bytestring, streaming-commons - , transformers + , transformers, zlib }: mkDerivation { pname = "streaming-utils"; - version = "0.2.0.0"; - sha256 = "05cgcypwxrhhf3xyxggwiz0v3193hf8h7vripqjam38f8ji3lxhk"; - revision = "1"; - editedCabalFile = "0wfk7bq5kpm6cn28z8mjlr1w5y2gp7bkm1xng1myy3jzyjwr68ph"; + version = "0.2.1.0"; + sha256 = "1c751g4k93365bibambr713w5fngpx4n11sp38pxixlhw7a2f7x7"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl network network-simple pipes resourcet streaming streaming-bytestring streaming-commons transformers ]; + libraryPkgconfigDepends = [ zlib ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {}; + }) {inherit (pkgs) zlib;}; "streaming-wai" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, http-types @@ -252672,10 +253693,8 @@ self: { }: mkDerivation { pname = "streaming-with"; - version = "0.2.2.1"; - sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09"; - revision = "1"; - editedCabalFile = "0z1jy02hc4k1xv0bd4981cblnm4pr022hakrj6zmi4zds74m9wzm"; + version = "0.3.0.0"; + sha256 = "00p8n7qx4rjbxfhw40nnpankar3zsbciqv2yxpyq3gzgzj9g5n7i"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -253515,10 +254534,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.2.0.0"; - sha256 = "1bwdfbpmlfqixfwc02jxdyyv0pkiysh24pnmna12cwpvb9582f6n"; + version = "0.5.2.0"; + sha256 = "1i6y41kyhbarwsppm55rlb1ddqihnpcc89yfgsd8mjgmbrmpsr3l"; libraryHaskellDepends = [ base ]; - description = "Is used in the recursive mode for phonetic languages approach"; + description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; }) {}; @@ -254862,8 +255881,8 @@ self: { ({ mkDerivation, base, generics-sop, vector }: mkDerivation { pname = "summer"; - version = "0.2.0.1"; - sha256 = "0kxxvifs68gbmh7vdjfcsf1baiih646s9msvd5rh7hrbr8n14w5l"; + version = "0.3.2.0"; + sha256 = "1gs9w6a5wh14f4c868b85acz92wn0s75cv8hadiws0546g4amb9v"; libraryHaskellDepends = [ base generics-sop vector ]; testHaskellDepends = [ base ]; description = "An implementation of extensible products and sums"; @@ -256090,7 +257109,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest_0_3_0_3" = callPackage + "sydtest_0_4_0_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -256099,8 +257118,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.3.0.3"; - sha256 = "1h6x9k5shpsp028d5mhi03pgzg324qglapk1nick1cnr0njr7v7w"; + version = "0.4.0.0"; + sha256 = "1r3isd8rjlzx7j1j5drgd1zjxdp8a1hvwsla513hpv32mkbqf0za"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -256635,13 +257654,13 @@ self: { }: mkDerivation { pname = "symantic-base"; - version = "0.1.0.20210703"; - sha256 = "1jwk22d028k34h468218fx0czmr9ksc8fm2462am82av20azb07h"; + version = "0.2.0.20210831"; + sha256 = "1vvhshqv0pcnyrdmpk7fpz39lic666ck5hcqpw429fyqmv92k4kh"; libraryHaskellDepends = [ base containers hashable template-haskell transformers unordered-containers ]; - description = "Commonly useful symantics for Embedded Domain-Specific Languages (EDSL)"; + description = "Basic symantics combinators for Embedded Domain-Specific Languages (EDSL)"; license = lib.licenses.agpl3Plus; }) {}; @@ -256669,14 +257688,14 @@ self: { }: mkDerivation { pname = "symantic-document"; - version = "1.5.1.20191028"; - sha256 = "1c4vwjjh6r2m6y3waz1zgf5c1xq3xg9xy4742hgfsfjigw0ba4hj"; + version = "1.5.3.20200320"; + sha256 = "1xcvvdmy8wfx5ylbvabfc3fd93lickmhkvp8nqw226ymnk3x9nbr"; libraryHaskellDepends = [ ansi-terminal base text transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit text transformers ]; - description = "Document symantics"; - license = lib.licenses.gpl3Only; + description = "Symantics combinators for generating documents"; + license = lib.licenses.agpl3Plus; }) {}; "symantic-grammar" = callPackage @@ -256855,8 +257874,8 @@ self: { }: mkDerivation { pname = "symantic-parser"; - version = "0.2.0.20210703"; - sha256 = "16mpc4s9y41a9hqxvx9jfnv1nrnpzk342bylh9091qd34gw657il"; + version = "0.2.1.20210803"; + sha256 = "1nr0zl2cajnk70jv92ayprhpnc5lbvxyxwvwsgyg3xm8zx747yi9"; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq directory filepath ghc-prim hashable megaparsec pretty process strict @@ -259081,8 +260100,8 @@ self: { pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; - revision = "3"; - editedCabalFile = "0qjhii1lhvqav3pnm6z5ly40d9gwp7p3y4g7k26bhxgy31bx1pll"; + revision = "4"; + editedCabalFile = "03a33nj9k62f318qgmp5pgk7i99c8cyqy5f7m7p0bwc5ni39ysfq"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -259291,8 +260310,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.11.3"; - sha256 = "1wymiy9cp8d3h17nbk6qfb1visdr30c6ivrygm6dwxrbambarvd8"; + version = "1.11.4"; + sha256 = "1mcpl4wj2lc6bv6x75c2snw9aqa27k2yh0bbwc2xl185c33a3rp7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259361,23 +260380,6 @@ self: { }: mkDerivation { pname = "tasty"; - version = "1.4.1"; - sha256 = "0ixfsjjdps0an6iy8cqb41h6kjjli9sg0xw531jwci8xlr7g0a17"; - libraryHaskellDepends = [ - ansi-terminal base clock containers mtl optparse-applicative stm - tagged unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = lib.licenses.mit; - }) {}; - - "tasty_1_4_2" = callPackage - ({ mkDerivation, ansi-terminal, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth - }: - mkDerivation { - pname = "tasty"; version = "1.4.2"; sha256 = "0574hbqzxzyv6vsk5kzbf04kz58y0iy8x9ydcj4b8fpncgmgy63g"; libraryHaskellDepends = [ @@ -259386,7 +260388,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -260035,8 +261036,8 @@ self: { pname = "tasty-rerun"; version = "1.1.18"; sha256 = "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"; - revision = "1"; - editedCabalFile = "17w6kxdd9zw87lh1bmh24c7dp59df8dshygx88j2i5nhbn7lfn50"; + revision = "2"; + editedCabalFile = "1fis4l7rlzmkw4135q3dikx9v22yhyqin3snlm1l7hsv8s33jpyl"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -260055,6 +261056,8 @@ self: { pname = "tasty-silver"; version = "3.2.2"; sha256 = "0zsl6nna8ir215qyxhyh2czx4i16hzw1n1m8jw8ym02j6sp6iz13"; + revision = "1"; + editedCabalFile = "0mgdk77xz38zc46qbxvss6vnp4yk328zbpw1l0c1n0f5gyf6sbav"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -260472,6 +261475,8 @@ self: { pname = "tdigest"; version = "0.2.1.1"; sha256 = "1dvkf7cs8dcr13wza5iyq2qgvz75r33mzgfmhdihw62xzxsqb6d3"; + revision = "1"; + editedCabalFile = "1paw32ixw4jgq0pl9f4ag43n8gqg5gmdjib6w4wx8x6ynmk19cq0"; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers vector vector-algorithms @@ -260954,6 +261959,17 @@ self: { broken = true; }) {}; + "tell" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "tell"; + version = "0.1"; + sha256 = "0l56mvgj543xp9cgafqycch6f9pgwjsnahy3zcpi1dxbmlwwy6gr"; + libraryHaskellDepends = [ base mtl transformers ]; + description = "The MonadTell class and related monad transformers"; + license = lib.licenses.bsd3; + }) {}; + "tellbot" = callPackage ({ mkDerivation, base, bifunctors, bytestring, containers , http-conduit, mtl, network, regex-pcre, split, tagsoup, text @@ -261385,6 +262401,64 @@ self: { license = lib.licenses.agpl3Only; }) {}; + "ten" = callPackage + ({ mkDerivation, adjunctions, base, data-default-class, deepseq + , distributive, hashable, HUnit, portray, portray-diff, some + , test-framework, test-framework-hunit, text, transformers, wrapped + }: + mkDerivation { + pname = "ten"; + version = "0.1.0.0"; + sha256 = "0rgcwwc3rq1bk3dc1plqyhc8mzk429ghswl6ry4zs2n8ds57gnwj"; + revision = "1"; + editedCabalFile = "0dslnfn52q87sb2d9di80nirwmfk3bkhc2wbp2wh209k0b5va63w"; + libraryHaskellDepends = [ + adjunctions base data-default-class deepseq distributive hashable + portray portray-diff some text transformers wrapped + ]; + testHaskellDepends = [ + adjunctions base data-default-class deepseq distributive hashable + HUnit portray portray-diff some test-framework test-framework-hunit + text transformers wrapped + ]; + description = "Typeclasses like Functor, etc. over arity-1 type constructors."; + license = lib.licenses.asl20; + }) {}; + + "ten-lens" = callPackage + ({ mkDerivation, base, lens, profunctors, some, ten }: + mkDerivation { + pname = "ten-lens"; + version = "0.1.0.0"; + sha256 = "1b27ds47395jnzqvhsp68807ffa6lmln37vzqkyp1l4r3bk2s7wb"; + libraryHaskellDepends = [ base lens profunctors some ten ]; + description = "Lenses for the types in the \"ten\" package"; + license = lib.licenses.asl20; + }) {}; + + "ten-unordered-containers" = callPackage + ({ mkDerivation, base, hashable, HUnit, lens, portray, portray-diff + , portray-diff-hunit, portray-pretty, some, ten, ten-lens + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, wrapped + }: + mkDerivation { + pname = "ten-unordered-containers"; + version = "0.1.0.0"; + sha256 = "1p399g5m3sbd5f11wksiz49hjd4jrs000jypav82dqw9qr2ys0xl"; + libraryHaskellDepends = [ + base hashable portray portray-diff some ten unordered-containers + wrapped + ]; + testHaskellDepends = [ + base hashable HUnit lens portray portray-diff portray-diff-hunit + portray-pretty some ten ten-lens test-framework + test-framework-hunit text transformers unordered-containers wrapped + ]; + description = "A package providing one unordered container"; + license = lib.licenses.asl20; + }) {}; + "tensor" = callPackage ({ mkDerivation, base, ghc-prim, QuickCheck, random, vector }: mkDerivation { @@ -263186,6 +264260,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ldap_0_1_1_14" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, memory + , QuickCheck, quickcheck-simple, random, transformers + }: + mkDerivation { + pname = "text-ldap"; + version = "0.1.1.14"; + sha256 = "0wb5x5q099i1phgwzhi4rs3qrrimsrfg6cnxah33sdzszax7dqnn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers memory transformers + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-simple random + ]; + description = "Parser and Printer for LDAP text data stream"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-lens" = callPackage ({ mkDerivation, base, extra, hspec, lens, text }: mkDerivation { @@ -263277,23 +264373,6 @@ self: { }: mkDerivation { pname = "text-metrics"; - version = "0.3.0"; - sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; - revision = "4"; - editedCabalFile = "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1"; - libraryHaskellDepends = [ base containers text vector ]; - testHaskellDepends = [ base hspec QuickCheck text ]; - benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; - description = "Calculate various string metrics efficiently"; - license = lib.licenses.bsd3; - }) {}; - - "text-metrics_0_3_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, hspec - , QuickCheck, text, vector, weigh - }: - mkDerivation { - pname = "text-metrics"; version = "0.3.1"; sha256 = "17bp1lnbkqr5ykrcd6v5sqv0fhljck7hky8zrrpw7rlkb1f3sdc2"; libraryHaskellDepends = [ base containers text vector ]; @@ -263301,7 +264380,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; description = "Calculate various string metrics efficiently"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-normal" = callPackage @@ -263520,10 +264598,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.9"; - sha256 = "1cj6w77lgh9cydg1jz3wfhll0bvzrmhgk37dgm7s33qbkpq9mf90"; - revision = "1"; - editedCabalFile = "1jwsp8g7c7wywxvhb7ns7xw0h7mbr33c3kyhba8ybw0rn43ynjki"; + version = "3.9.2"; + sha256 = "0srm3qj7z0c1zxpzp7n0frjdh0hxb76mz43d1ry30nrg0k4lj8lh"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -263927,10 +265003,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.4.2.0"; - sha256 = "0h0wl442a82llpjsxv45i7grgyanlzjj7k28mhnvbi2zlb6v41pa"; - revision = "1"; - editedCabalFile = "1yc17r29vkwi4qzbrxy1d3gra87hk3ghy1jzfmrl2q8zjc0v59vb"; + version = "0.4.3.0"; + sha256 = "01nyscmjriga4fh4362b4zjad48hdv33asjkd28sj8hx3pii7fy8"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -264001,8 +265075,8 @@ self: { }: mkDerivation { pname = "th-compat"; - version = "0.1.2"; - sha256 = "009qc0yy5iq61kgnp9n6vdlqh8zmk4bjawcvpigccgfyk40mvi1b"; + version = "0.1.3"; + sha256 = "1il1hs5yjfkb417c224pw1vrh4anyprasfwmjbd4fkviyv55jl3b"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base base-compat hspec mtl template-haskell @@ -264137,6 +265211,8 @@ self: { pname = "th-expand-syns"; version = "0.4.8.0"; sha256 = "1mw0yxfbmicv0irfrcz4s6pn39za7yjd7zz09ialwym1b46624si"; + revision = "1"; + editedCabalFile = "0l30cmwm20lgjpvr3a5yxj6429s1hqahjsij8z2ap88754phd41l"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -264145,6 +265221,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_9_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.9.0"; + sha256 = "1yc6n4pgapl3vfjcilxn6hjdf6cr54c1w32i7wwbn806sljflhwy"; + libraryHaskellDepends = [ + base containers syb template-haskell th-abstraction + ]; + testHaskellDepends = [ base template-haskell th-abstraction ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -264351,16 +265444,18 @@ self: { "th-orphans" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover - , mtl, template-haskell, th-compat, th-lift, th-lift-instances - , th-reify-many + , mtl, template-haskell, th-compat, th-expand-syns, th-lift + , th-lift-instances, th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.13.11"; - sha256 = "1m7mysjhdmfc642dqbxq6sz5fir00kzq54w4n1pcn5d64ip5njkf"; + version = "0.13.12"; + sha256 = "03n6qxnpxhbzyzbyrjq77d1y62dwgx39mmxfwmnc04l8pawgrxxz"; + revision = "1"; + editedCabalFile = "0vfz9dl5g9xwp2zmwqc5gngyvjaqj3i0s97vbcslafcqhdqw3qaj"; libraryHaskellDepends = [ - base mtl template-haskell th-compat th-lift th-lift-instances - th-reify-many + base mtl template-haskell th-compat th-expand-syns th-lift + th-lift-instances th-reify-many ]; testHaskellDepends = [ base bytestring ghc-prim hspec template-haskell th-lift @@ -264422,12 +265517,31 @@ self: { pname = "th-reify-many"; version = "0.1.9"; sha256 = "0hxf56filzqnyrc8q7766vai80y6cgrrbrczx6n93caskl1dv2gq"; + revision = "1"; + editedCabalFile = "0y0gyh866i40a71732mbkzb1clxh4cq26kma4xnrq86kdd7s2rr8"; + libraryHaskellDepends = [ + base containers mtl safe template-haskell th-expand-syns + ]; + testHaskellDepends = [ base template-haskell ]; + description = "Recurseively reify template haskell datatype info"; + license = lib.licenses.bsd3; + }) {}; + + "th-reify-many_0_1_10" = callPackage + ({ mkDerivation, base, containers, mtl, safe, template-haskell + , th-expand-syns + }: + mkDerivation { + pname = "th-reify-many"; + version = "0.1.10"; + sha256 = "19g4gc1q3zxbylmvrgk3dqjzychq2k02i7fwvs3vhbrg4ihhw9cx"; libraryHaskellDepends = [ base containers mtl safe template-haskell th-expand-syns ]; testHaskellDepends = [ base template-haskell ]; description = "Recurseively reify template haskell datatype info"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "th-sccs" = callPackage @@ -264479,8 +265593,8 @@ self: { pname = "th-test-utils"; version = "1.1.0"; sha256 = "12a8yp9wfl40afa3ps8jg3axcaah018pangjm0fzzga2awr1wzwk"; - revision = "2"; - editedCabalFile = "1jwx31jqglfcy6ylj4520kqfp918lnv6m13flx2qvhfwbd88xwcv"; + revision = "3"; + editedCabalFile = "10726mnihw50vjbl6qqccx18a3wjcik5jl5gw85jfxlam7ifwyrb"; libraryHaskellDepends = [ base template-haskell th-orphans transformers ]; @@ -264910,6 +266024,39 @@ self: { license = lib.licenses.mit; }) {}; + "thread-utils-context" = callPackage + ({ mkDerivation, base, containers, criterion, ghc-prim, mtl + , thread-utils-finalizers + }: + mkDerivation { + pname = "thread-utils-context"; + version = "0.2.0.0"; + sha256 = "0bxr9bpm3zr29nd2ymblijr2ikbhgxvx3vj7yn6bwx8s6cgc4mr9"; + libraryHaskellDepends = [ + base containers ghc-prim thread-utils-finalizers + ]; + testHaskellDepends = [ + base containers ghc-prim thread-utils-finalizers + ]; + benchmarkHaskellDepends = [ + base containers criterion ghc-prim mtl thread-utils-finalizers + ]; + description = "Garbage-collected thread local storage"; + license = lib.licenses.bsd3; + }) {}; + + "thread-utils-finalizers" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "thread-utils-finalizers"; + version = "0.1.0.0"; + sha256 = "0r8pvp8137y5gklxr0dyi4l4s7x2qcma64529npkw32ma61iabdl"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ghc-prim ]; + description = "Perform finalization for threads"; + license = lib.licenses.bsd3; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -265764,15 +266911,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "time-compat_1_9_6" = callPackage + "time-compat_1_9_6_1" = callPackage ({ mkDerivation, base, base-compat, base-orphans, deepseq, hashable , HUnit, QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck , time }: mkDerivation { pname = "time-compat"; - version = "1.9.6"; - sha256 = "0k466nyn7v8g3lx0gjfq6hzs4gmm4ws2wcm7xqyw48fmn55pb5rx"; + version = "1.9.6.1"; + sha256 = "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -267190,6 +268337,29 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "tlynx_0_6_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , comonad, containers, data-default-class, elynx-tools, elynx-tree + , gnuplot, mwc-random, optparse-applicative, parallel, statistics + , text, transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.6.0.0"; + sha256 = "1iz555rfq4wi5yc5bqfgkgwzmlxcksxmbpcfdwmcarcijazm9mpi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring comonad containers + data-default-class elynx-tools elynx-tree gnuplot mwc-random + optparse-applicative parallel statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -268117,8 +269287,8 @@ self: { pname = "topograph"; version = "1.0.0.1"; sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; - revision = "1"; - editedCabalFile = "1cbpm16jk8x8xy0r3v8zdmwrdgxlp6zww03rmzbz0031hddpywrk"; + revision = "2"; + editedCabalFile = "1iyjrvpv7lgfpfirb2vw0lv4fs3fhpkfkicl2p49wi8zc4dv7xz1"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -268672,8 +269842,8 @@ self: { pname = "trackit"; version = "0.7.2"; sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; - revision = "1"; - editedCabalFile = "0l9hi5f90nixayzahksgxrs4zij76767x64irql890ph6qzsq13c"; + revision = "2"; + editedCabalFile = "0dinhqmnm23rwg9xd056idbd7351bzbyik4k708h8xlw3pgq62i9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -269576,6 +270746,8 @@ self: { pname = "tree-diff"; version = "0.2"; sha256 = "1ny7mi0n8cyb65q9ihbnm2gxiyya888dw2c4y0hjy8k882wdhf0x"; + revision = "1"; + editedCabalFile = "0brlnq5ddmambidll1dn4jnjac2i44a9hd5hwp2p0rbh1s8jfyhm"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -270088,8 +271260,8 @@ self: { pname = "trie-simple"; version = "0.4.1.1"; sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7"; - revision = "3"; - editedCabalFile = "02h7dw73879gvy0jrxd7a4rzfhi2fcr5jivqc4ck97w67w2pg8zm"; + revision = "4"; + editedCabalFile = "0in7aycdkf63d6431dz747znkkky4q1jw9a3ihzvcjam41nc2wpw"; libraryHaskellDepends = [ base containers deepseq mtl ]; testHaskellDepends = [ base containers hspec QuickCheck vector ]; benchmarkHaskellDepends = [ @@ -270652,22 +271824,6 @@ self: { }: mkDerivation { pname = "ttc"; - version = "1.1.0.1"; - sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; - libraryHaskellDepends = [ base bytestring template-haskell text ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit template-haskell text - ]; - description = "Textual Type Classes"; - license = lib.licenses.mit; - }) {}; - - "ttc_1_1_0_2" = callPackage - ({ mkDerivation, base, bytestring, tasty, tasty-hunit - , template-haskell, text - }: - mkDerivation { - pname = "ttc"; version = "1.1.0.2"; sha256 = "0i1jnign6xb0i4y5rkwz2rp2lj7q3r50i4bkjghz8i2djw2sd1cw"; libraryHaskellDepends = [ base bytestring template-haskell text ]; @@ -270676,7 +271832,6 @@ self: { ]; description = "Textual Type Classes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ttl-hashtables" = callPackage @@ -275154,23 +276309,18 @@ self: { }) {}; "units" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit-approx, lens - , linear, mtl, multimap, singletons, syb, tasty, tasty-hunit - , template-haskell, th-desugar, units-parser, vector-space + ({ mkDerivation, base, containers, deepseq, lens, linear, mtl + , multimap, singletons, syb, template-haskell, th-desugar + , units-parser, vector-space }: mkDerivation { pname = "units"; - version = "2.4.1.3"; - sha256 = "1ksrw65ci9j8qnqj6cxpdmdb9b3k4k9w8ld3j4h00r2vkcqgn9qg"; + version = "2.4.1.4"; + sha256 = "1r6innb99d6ljbbbrl2q9i4l6j4cb96mmv0k56q9l2xckwlsfz32"; libraryHaskellDepends = [ base containers deepseq lens linear mtl multimap singletons syb template-haskell th-desugar units-parser vector-space ]; - testHaskellDepends = [ - base containers deepseq HUnit-approx lens linear mtl multimap - singletons syb tasty tasty-hunit template-haskell th-desugar - units-parser vector-space - ]; description = "A domain-specific type system for dimensional analysis"; license = lib.licenses.bsd3; }) {}; @@ -275196,8 +276346,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.2"; - sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki"; + version = "2.2.1"; + sha256 = "0b7g29hqz0rzk9sjyz1h7b73jvsfd7il6l9yj982mpxazk5mc2j7"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = lib.licenses.bsd3; @@ -275495,8 +276645,8 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; - revision = "7"; - editedCabalFile = "1hkmb19m2mm8h2v69awip25i7cpg0967yih89q5npqsxknix4hkw"; + revision = "8"; + editedCabalFile = "1ydydm9i82pn5sy7drl404qlll318x8bjwhpvr2lwqwmb5f3dx8m"; libraryHaskellDepends = [ base bytestring time ]; description = "POSIX functionality"; license = lib.licenses.bsd3; @@ -275749,8 +276899,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.19"; - sha256 = "052m0vr6444r5adzyzr3aqj07p9ay5y2sqfsczwj52bc66qqyy36"; + version = "0.2.20"; + sha256 = "0mbm57h7r16qd7kpglbm50qrnfjmazd70avbrl647n4jwhlrp7my"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -276877,8 +278027,6 @@ self: { testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "urlpath" = callPackage @@ -278031,13 +279179,30 @@ self: { }) {}; "valida" = callPackage - ({ mkDerivation, base, smallcheck, tasty, tasty-hunit + ({ mkDerivation, base, profunctors, smallcheck, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "valida"; - version = "0.1.0"; - sha256 = "1spdf40jcm9b6ah18m5nw550x2mlq4bjmqvscf4cnjpc7izdmdng"; + version = "1.1.0"; + sha256 = "1i9di1gmcd6s2xmf8s5mwg7fra48zg54r89f1qf1gfj34asab62m"; + libraryHaskellDepends = [ base profunctors ]; + testHaskellDepends = [ + base profunctors smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Simple applicative validation for product types, batteries included!"; + license = lib.licenses.mit; + }) {}; + + "valida-base" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "valida-base"; + version = "0.2.0"; + sha256 = "0wyj7nm1dqy5lq86mgqzr40s065jkwccmb4bky4hg1h7nz2lpqbj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck @@ -278361,6 +279526,22 @@ self: { license = lib.licenses.mit; }) {}; + "valor_1_0_0_0" = callPackage + ({ mkDerivation, base, doctest, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "valor"; + version = "1.0.0.0"; + sha256 = "0ssdyy84xh68rxinp6i36zg7c3k10122b1l30q1qi8r10bvyg3r0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Simple and powerful data validation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -278970,6 +280151,8 @@ self: { pname = "vector"; version = "0.12.3.0"; sha256 = "00xp86yad3yv4ja4q07gkmmcf7iwpcnzkkaf91zkx9nxb981iy0m"; + revision = "2"; + editedCabalFile = "18nlva9z2s37ikcl4msadynl7glipsx9cfpcdi8pzy8k5gvdm5hm"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans HUnit primitive QuickCheck random tasty @@ -279324,10 +280507,25 @@ self: { pname = "vector-rotcev"; version = "0.1.0.0"; sha256 = "1sl5jwmpmzzvknalgqrbpy3yhqclgqxf75wnpb24rn416kdscy6j"; + revision = "1"; + editedCabalFile = "1hn2g8wykmisaacw4w8iffcd8qn3dnkl9lkj3j9n0324xm1b3sp0"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base tasty tasty-quickcheck vector ]; + description = "Vectors with O(1) reverse"; + license = lib.licenses.bsd3; + }) {}; + + "vector-rotcev_0_1_0_1" = callPackage + ({ mkDerivation, base, tasty, tasty-quickcheck, vector }: + mkDerivation { + pname = "vector-rotcev"; + version = "0.1.0.1"; + sha256 = "1zrw1r6xspjncavd307xbbnjdmmhjq9w3dbvm0khnkxjgh47is8v"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base tasty tasty-quickcheck vector ]; description = "Vectors with O(1) reverse"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vector-shuffling" = callPackage @@ -279359,6 +280557,25 @@ self: { maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; + "vector-sized_1_5_0" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.5.0"; + sha256 = "13h4qck1697iswd9f8w17fpjc6yhl2pgrvay7pb22j2h3mgaxpjl"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ expipiplus1 ]; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -282268,8 +283485,8 @@ self: { }: mkDerivation { pname = "wai-middleware-prometheus"; - version = "1.0.0"; - sha256 = "0c04cq7q3ck394d7n92mwm0k9qh2dmyn9bsf1n20yzrwrnr9fgkl"; + version = "1.0.0.1"; + sha256 = "1657zar254550skn3hx7y1g06aww2pjls5i4frw6ci4sxy3nynxp"; libraryHaskellDepends = [ base bytestring clock data-default http-types prometheus-client text wai @@ -282829,6 +284046,33 @@ self: { broken = true; }) {}; + "wai-session-redis_0_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, cereal, data-default, hedis + , hspec, http-types, vault, wai, wai-session, warp + }: + mkDerivation { + pname = "wai-session-redis"; + version = "0.1.0.3"; + sha256 = "1ikm5i4cvx2wzlq5ij7aqk9c37jpnw9c0dl0xdw3c4hqsnjnb5yj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal data-default hedis vault wai wai-session + ]; + executableHaskellDepends = [ + base bytestring cereal data-default hedis http-types vault wai + wai-session warp + ]; + testHaskellDepends = [ + base bytestring cereal data-default hedis hspec vault wai + wai-session + ]; + description = "Simple Redis backed wai-session backend"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-session-tokyocabinet" = callPackage ({ mkDerivation, base, bytestring, cereal, errors , tokyocabinet-haskell, transformers, wai-session @@ -284821,8 +286065,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.1.3"; - sha256 = "0yph2dzg4xrfs7439jmxn3jc7h42id0c2f987wl6lccrbn39vzd7"; + version = "2.2.0"; + sha256 = "07ylcq8mza4429snaklhfszpg2c0xcp75hyf0jxhi32mpiz7a5v2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -285008,37 +286252,42 @@ self: { }) {}; "wgpu-hs" = callPackage - ({ mkDerivation, base, bytestring, data-default, GLFW-b, text - , transformers, vector, wgpu-raw-hs + ({ mkDerivation, base, bytestring, containers, data-default + , data-has, GLFW-b, lens, mtl, resourcet, safe-exceptions, sdl2 + , string-qq, text, transformers, vector, wgpu-raw-hs }: mkDerivation { pname = "wgpu-hs"; - version = "0.2.0.0"; - sha256 = "1kc5xmknfhh9dmn90rbnplmx8n7f07xwvrvz7dcybjpiw8pr2dml"; + version = "0.3.0.0"; + sha256 = "1m5rglmj20544x36i64iyiz8zb73pci8aqf483wrpfswrvf2k6xg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring data-default GLFW-b text transformers vector - wgpu-raw-hs + base bytestring containers data-default data-has GLFW-b lens mtl + resourcet safe-exceptions sdl2 text vector wgpu-raw-hs ]; executableHaskellDepends = [ - base data-default GLFW-b text transformers + base data-default data-has GLFW-b lens mtl resourcet + safe-exceptions sdl2 string-qq text transformers vector ]; doHaddock = false; description = "WGPU"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wgpu-raw-hs" = callPackage - ({ mkDerivation, base, GLFW-b, unix }: + ({ mkDerivation, base, GLFW-b, SDL2, sdl2, unix }: mkDerivation { pname = "wgpu-raw-hs"; - version = "0.2.0.0"; - sha256 = "05dzz6q5laxw7wwhly7v5i4bppfqz4yahh8qq6qc0h2c8v0qmdzp"; - libraryHaskellDepends = [ base GLFW-b unix ]; + version = "0.3.0.0"; + sha256 = "0p7j8v0wxjv22b1zmdx0d433rdl91h7p5bcbvm9g30dg8y0fip0x"; + libraryHaskellDepends = [ base GLFW-b sdl2 unix ]; + libraryPkgconfigDepends = [ SDL2 ]; description = "WGPU Raw"; license = lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) SDL2;}; "what4" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized @@ -285491,7 +286740,6 @@ self: { ]; description = "Implements Windows Live Web Authentication and Delegated Authentication"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "winerror" = callPackage @@ -286657,6 +287905,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "wrapped" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "wrapped"; + version = "0.1.0.0"; + sha256 = "07xvml89ml36qx23114qr72sk1kqfpj3dassfs5mwhaw45016rk2"; + libraryHaskellDepends = [ base ]; + description = "Provides a single standardized place to hang DerivingVia instances"; + license = lib.licenses.asl20; + }) {}; + + "wrapped-generic-default" = callPackage + ({ mkDerivation, base, data-default-class, wrapped }: + mkDerivation { + pname = "wrapped-generic-default"; + version = "0.1.0.0"; + sha256 = "0h1aay81l8b2nih08pli30ly0vcwvi8n2kdxck60ww2qb2b7wzzc"; + libraryHaskellDepends = [ base data-default-class wrapped ]; + description = "Provides an orphan instance Default (Wrapped Generic a)"; + license = lib.licenses.asl20; + }) {}; + "wraxml" = callPackage ({ mkDerivation, base, containers, data-accessor , explicit-exception, HaXml, hxt, hxt-filter, polyparse, tagchup @@ -290479,8 +291749,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.3.6"; - sha256 = "034dj7k0719lkhwgrz91wk2dfpxg4kvyj9ax7cpz9q6qa8jn0zp7"; + version = "0.3.4"; + sha256 = "1ac05hm2kh1xv0987yb5vjfrmanvzkq6yx8whi7jxdwdb0fa7l3p"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -295330,6 +296600,8 @@ self: { pname = "zlib"; version = "0.6.2.3"; sha256 = "125wbayk8ifp0gp8cb52afck2ziwvqfrjzbmwmy52g6bz7fnnzw0"; + revision = "1"; + editedCabalFile = "1r6sc6p648jgq4vslzbr171w52rk3fjv3wspxvs5kgkhygdr6ai6"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ @@ -295600,8 +296872,8 @@ self: { ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.2.0"; - sha256 = "0s0svxa7y7a35jg4f0qq6zdg187c2g1s0f3payd26vpwa6rp8f8k"; + version = "0.1.3.1"; + sha256 = "0mfarqcm2h9chbn7kybw58gd6l2wpjkhpg1vgip92djwmvkilarl"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ base hspec ]; diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.12.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.12.nix index 4b631098fe19..0ea014e36d70 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.12.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.12.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.12.2"; - sha256 = "sha256-PQkvBaQQljATt+LA3hWJOFyQessqqR1t6o1J2LHllec="; + version = "1.12.3"; + sha256 = "sha256-Jo9ZC5cSBVpjVnGZ8tEIUKOhW9uvJM/h84+VcnrT0R0="; minimumOTPVersion = "22"; } diff --git a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index 13d2d33abfcd..3d5c692930b6 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -22,6 +22,7 @@ , parallelBuild ? false , systemd , wxSupport ? true +, systemdSupport ? stdenv.isLinux # systemd support in epmd # updateScript deps , writeScript , common-updater-scripts @@ -42,7 +43,6 @@ , javacPackages ? [ openjdk11 ] , odbcSupport ? false , odbcPackages ? [ unixODBC ] -, withSystemd ? stdenv.isLinux # systemd support in epmd , opensslPackage ? openssl , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "" @@ -96,7 +96,7 @@ stdenv.mkDerivation ({ ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages - ++ optional withSystemd systemd + ++ optional systemdSupport systemd ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; @@ -123,7 +123,7 @@ stdenv.mkDerivation ({ ++ optional javacSupport "--with-javac" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" - ++ optional withSystemd "--enable-systemd" + ++ optional systemdSupport "--enable-systemd" ++ optional stdenv.isDarwin "--enable-darwin-64bit" ++ configureFlags; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix index 5639b2a4bb90..64e872ad5f63 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -238,7 +238,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab inherit externalDeps; } // passthru; - meta = with lib.maintainers; { + meta = { platforms = lua.meta.platforms; # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ ]; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index f2b2961c4c77..3e36f77dab43 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -54,9 +54,4 @@ rec { inherit callPackage; }; - luajit_openresty = import ../luajit/openresty.nix { - self = luajit_openresty; - inherit callPackage; - }; - } diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix index 3476b2b648b6..a780e6ba49f1 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, readline , compat ? false , callPackage -, packageOverrides ? (self: super: {}) +, makeWrapper +, packageOverrides ? (final: prev: {}) , sourceVersion , hash , patches ? [] @@ -10,7 +11,10 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let -luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; + luaPackages = callPackage ../../lua-modules { + lua = self; + overrides = packageOverrides; + }; plat = if stdenv.isLinux then "linux" else if stdenv.isDarwin then "macosx" @@ -31,21 +35,32 @@ self = stdenv.mkDerivation rec { sha256 = hash; }; - LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; - LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; + LuaPathSearchPaths = luaPackages.lib.luaPathList; + LuaCPathSearchPaths = luaPackages.lib.luaCPathList; setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ readline ]; inherit patches; - postPatch = lib.optionalString (!stdenv.isDarwin && !staticOnly) '' + # we can't pass flags to the lua makefile because for portability, everything is hardcoded + postPatch = '' + { + echo -e ' + #undef LUA_PATH_DEFAULT + #define LUA_PATH_DEFAULT "./share/lua/${luaversion}/?.lua;./?.lua;./?/init.lua" + #undef LUA_CPATH_DEFAULT + #define LUA_CPATH_DEFAULT "./lib/lua/${luaversion}/?.so;./?.so;./lib/lua/${luaversion}/loadall.so" + ' + } >> src/luaconf.h + '' + lib.optionalString (!stdenv.isDarwin && !staticOnly) '' # Add a target for a shared library to the Makefile. sed -e '1s/^/LUA_SO = liblua.so/' \ -e 's/ALL_T *= */&$(LUA_SO) /' \ -i src/Makefile cat ${./lua-dso.make} >> src/Makefile - ''; + '' ; # see configurePhase for additional flags (with space) makeFlags = [ diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix b/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix index f00e0d5ac336..049afcd6116d 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -4,16 +4,13 @@ , makeWrapper }: -with lib; - # defined in trivial-builders.nix # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput makeSetupHook { - deps = makeWrapper; - substitutions.executable = lua.interpreter; - substitutions.lua = lua; - substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; - substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; - + deps = makeWrapper; + substitutions.executable = lua.interpreter; + substitutions.lua = lua; + substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; + substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; } ./wrap.sh diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix index 0459b67534d4..b9ac255d2432 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix @@ -11,13 +11,18 @@ let env = let paths = requiredLuaModules (extraLibs ++ [ lua ] ); - in (buildEnv { + in buildEnv { name = "${lua.name}-env"; inherit paths; inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + nativeBuildInputs = [ + makeWrapper + (lua.pkgs.lua-setup-hook lua.LuaPathSearchPaths lua.LuaCPathSearchPaths) + ]; + # we create wrapper for the binaries in the different packages postBuild = '' if [ -L "$out/bin" ]; then @@ -37,7 +42,12 @@ let rm -f "$out/bin/$prg" if [ -x "$prg" ]; then nix_debug "Making wrapper $prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" \ + --set-default LUA_PATH ";;" \ + --suffix LUA_PATH ';' "$LUA_PATH" \ + --set-default LUA_CPATH ";;" \ + --suffix LUA_CPATH ';' "$LUA_CPATH" \ + ${lib.concatStringsSep " " makeWrapperArgs} fi fi done @@ -62,8 +72,5 @@ let ''; }; }; - }).overrideAttrs (_: { - # Add extra deps needed for postBuild hook. - nativeBuildInputs = [ makeWrapper lua ]; - }); + }; in env diff --git a/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix b/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix index ceb796f0433e..efae91c17bc7 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix @@ -1,14 +1,12 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - owner = "LuaJIT"; - repo = "LuaJIT"; - version = "2.0.5-2021-06-08"; - rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; + version = "2.0.5-2021-07-27"; + rev = "3a654999c6f00de4cb9e61232d23579442e544a0"; isStable = true; - sha256 = "1pdmhk5syp0nir80xcnkf6xy2w5rwslak8hgmjpgaxzlnrjcgs7p"; + sha256 = "0q187vn6bspn9i33hrvfy59mh83nd8jjmik5qkkkc3vls13jxr6z"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build - platforms = with lib; filter (p: p != "aarch64-linux") + platforms = with lib; filter (p: !hasPrefix "aarch64-" p) (platforms.linux ++ platforms.darwin); }; } diff --git a/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix index 87976a45dfe1..6ac47a6c3359 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix @@ -1,10 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - owner = "LuaJIT"; - repo = "LuaJIT"; - version = "2.1.0-2021-06-25"; - rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; + version = "2.1.0-2021-08-12"; + rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597"; isStable = false; - sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj"; + sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr"; } diff --git a/nixpkgs/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch b/nixpkgs/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch new file mode 100644 index 000000000000..dcfb1e9d4e7f --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile b/src/Makefile +index 2538503f..7e6380da 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -320,7 +320,9 @@ ifeq (Darwin,$(TARGET_SYS)) + $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY) + endif + TARGET_STRIP+= -x ++ ifneq (arm64,$(shell uname -m)) + TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL ++ endif + TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC + TARGET_DYNXLDOPTS= + TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) diff --git a/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 728161598282..ac74610bcce9 100644 --- a/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages +{ lib +, stdenv +, fetchFromGitHub +, buildPackages , name ? "luajit-${version}" , isStable -, owner -, repo , sha256 , rev , version -, extraMeta ? {} +, extraMeta ? { } , callPackage , self -, packageOverrides ? (self: super: {}) +, packageOverrides ? (final: prev: {}) , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT @@ -26,28 +27,34 @@ assert enableJITDebugModule -> enableJIT; assert enableGDBJITSupport -> enableJIT; assert enableValgrindSupport -> valgrind != null; let - luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; + luaPackages = callPackage ../../lua-modules { lua = self; overrides = packageOverrides; }; XCFLAGS = with lib; - optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" - ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" - ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" - ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" - ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" - ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" - ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" - ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" - ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" + optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" + ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" + ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" + ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" + ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" + ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" + ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" + ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" + ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" ; in stdenv.mkDerivation rec { inherit name version; src = fetchFromGitHub { - inherit owner repo sha256 rev; + owner = "LuaJIT"; + repo = "LuaJIT"; + inherit sha256 rev; }; luaversion = "5.1"; + # Fix for pcall on aarch64-darwin. + # Upstream issue: https://github.com/LuaJIT/LuaJIT/issues/698 + patches = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./aarch64-darwin-disable-unwind-external.patch ]; + postPatch = '' substituteInPlace Makefile --replace ldconfig : if test -n "''${dontStrip-}"; then @@ -55,6 +62,15 @@ stdenv.mkDerivation rec { # passed by nixpkgs CC wrapper is insufficient on its own substituteInPlace src/Makefile --replace "#CCDEBUG= -g" "CCDEBUG= -g" fi + + { + echo -e ' + #undef LUA_PATH_DEFAULT + #define LUA_PATH_DEFAULT "./share/lua/${luaversion}/?.lua;./?.lua;./?/init.lua" + #undef LUA_CPATH_DEFAULT + #define LUA_CPATH_DEFAULT "./lib/lua/${luaversion}/?.so;./?.so;./lib/lua/${luaversion}/loadall.so" + ' + } >> src/luaconf.h ''; configurePhase = false; @@ -81,29 +97,26 @@ stdenv.mkDerivation rec { ln -s "$out"/bin/luajit-* "$out"/bin/luajit ''; - LuaPathSearchPaths = [ - "lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua" - "share/lua/${luaversion}/?/init.lua" "lib/lua/${luaversion}/?/init.lua" - "share/${name}/?.lua" - ]; - LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ]; - setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + LuaPathSearchPaths = luaPackages.lib.luaPathList; + LuaCPathSearchPaths = luaPackages.lib.luaCPathList; + + setupHook = luaPackages.lua-setup-hook luaPackages.lib.luaPathList luaPackages.lib.luaCPathList; passthru = rec { buildEnv = callPackage ../lua-5/wrapper.nix { lua = self; inherit (luaPackages) requiredLuaModules; }; - withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages;}; + withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages; }; pkgs = luaPackages; interpreter = "${self}/bin/lua"; }; meta = with lib; { description = "High-performance JIT compiler for Lua 5.1"; - homepage = "http://luajit.org"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; + homepage = "http://luajit.org"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir lblasc ]; } // extraMeta; } diff --git a/nixpkgs/pkgs/development/interpreters/luajit/openresty.nix b/nixpkgs/pkgs/development/interpreters/luajit/openresty.nix deleted file mode 100644 index 78e06f46f1d0..000000000000 --- a/nixpkgs/pkgs/development/interpreters/luajit/openresty.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ self, callPackage }: -callPackage ./default.nix rec { - inherit self; - owner = "openresty"; - repo = "luajit2"; - version = "2.1-20210510"; - rev = "v${version}"; - isStable = true; - sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd"; -} diff --git a/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/nixpkgs/pkgs/development/interpreters/micropython/default.nix index 2e0b587acfde..7591e997beb2 100644 --- a/nixpkgs/pkgs/development/interpreters/micropython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/micropython/default.nix @@ -1,44 +1,24 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , pkg-config -, libffi , python3 +, libffi , readline }: stdenv.mkDerivation rec { pname = "micropython"; - version = "1.15"; + version = "1.17"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "11bf1lq4kgfs1nzg5cnshh2dqxyk5w2k816i04innri6fj0g7y6p"; + sha256 = "0aqij36iykmfdsv5dqrifvghmjx7qid8hmbxcpx3xpk3nizh7w84"; fetchSubmodules = true; }; - # drop the following patches when upgrading to 1.16 - patches = [ - # fix build with modern clang https://github.com/micropython/micropython/pull/7254 - (fetchpatch { - url = "https://github.com/micropython/micropython/commit/126b1c727118352923703719a2a3d45b9fad3c97.patch"; - sha256 = "13a2bmz24syhd1qsqbx39dcjkjdhf05ln7lanh816m94lkfib21j"; - }) - # fix build with modern clang https://github.com/micropython/micropython/pull/7254 - (fetchpatch { - url = "https://github.com/micropython/micropython/commit/7ceccad4e2f1e9d073f5781c32e5b377e8391a25.patch"; - sha256 = "04mbxmb5yr6pbhhf9villq8km4wy579r46v9p4n0ysivrxij7i6f"; - }) - # fix build on aarch64-darwin https://github.com/micropython/micropython/pull/7393 - (fetchpatch { - url = "https://github.com/micropython/micropython/commit/95048129b1d93854c25f501c02801929aeeb23f0.patch"; - sha256 = "1cngcwq4jviyhdnfcrrkdadfikhffzbj0d634j0344cp247jb41n"; - }) - ]; - nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libffi readline ]; @@ -78,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://micropython.org"; platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ sgo ]; + maintainers = with maintainers; [ prusnak sgo ]; }; } diff --git a/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix b/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix index f93e0ae5d958..194c67eba98f 100644 --- a/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix @@ -1,30 +1,39 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , shen-sources , sbcl }: stdenv.mkDerivation rec { - name = "shen-sbcl-${version}"; + pname = "shen-sbcl"; version = "3.0.3"; + src = fetchurl { url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz"; sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz"; }; - buildInputs = [ - sbcl shen-sources - ]; - buildPhase = '' + + nativeBuildInputs = [ sbcl ]; + + preBuild = '' ln -s ${shen-sources} kernel - make sbcl ''; + + buildFlags = [ "build-sbcl" ]; + + checkTarget = "test-sbcl"; + + doCheck = true; + installPhase = '' - mkdir -p $out install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl ''; + meta = with lib; { - homepage = https://shenlanguage.org; + homepage = "https://shenlanguage.org"; description = "Port of Shen running on Steel Bank Common Lisp"; + changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md"; platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix b/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix index 84839cf42dee..99e72fbea112 100644 --- a/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix +++ b/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix @@ -1,26 +1,28 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl }: stdenv.mkDerivation rec { - name = "shen-sources-${version}"; - version = "22.3"; + pname = "shen-sources"; + version = "22.4"; src = fetchurl { url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz"; - sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q"; + sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260"; }; - buildInputs = []; - buildPhase = ""; + dontBuild = true; + installPhase = '' mkdir -p $out cp . $out -R ''; meta = with lib; { - homepage = https://shenlanguage.org; + homepage = "https://shenlanguage.org"; description = "Source code for the Shen Language"; + changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md"; platforms = platforms.all; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix index a1610ce82624..072af53757bc 100644 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - version = "20210324.1"; + version = "20210324.2"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "16w63brfwgiayiyhvawsnr14xyy5hpp68k8fj0z6yk0bjzw6jvjw"; + sha256 = "0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix index f1a7420fbce7..f53ea0d705cc 100644 --- a/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.4"; + version = "0.5.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = version; - sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz"; + rev = "${version}+21.10.20210710-0ubuntu1"; + sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; }; nativeBuildInputs = [ @@ -57,11 +57,6 @@ stdenv.mkDerivation rec { libwnck ]; - patches = [ - # Port tests and checks to python3 lxml. - ./gtester2xunit-python3.patch - ]; - # Fix hard-coded path # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/bamf/gtester2xunit-python3.patch b/nixpkgs/pkgs/development/libraries/bamf/gtester2xunit-python3.patch deleted file mode 100644 index 8dc478541943..000000000000 --- a/nixpkgs/pkgs/development/libraries/bamf/gtester2xunit-python3.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 41cb7db..93ef0ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -115,9 +115,9 @@ GTK_DOC_CHECK(1.0) - - AC_PATH_PROG([PYTHON],[python]) - AC_MSG_CHECKING(for gtester2xunit dependencies) --if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then -+if !($PYTHON -c "import lxml" 2> /dev/null); then - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]); -+ AC_MSG_ERROR([You need to install python-lxml]); - fi - AC_MSG_RESULT([yes]) - -@@ -189,6 +189,6 @@ ${PACKAGE}-${VERSION} - Introspection: ${enable_introspection} - Headless tests: ${enable_headless_tests} - Coverage Reporting: ${use_gcov} -- Export actions menus: ${enable_export_actions_menu} -+ Export actions menus: ${enable_export_actions_menu} - - EOF -diff --git a/tests/gtester2xunit.py b/tests/gtester2xunit.py -index fbe3c66..861d541 100755 ---- a/tests/gtester2xunit.py -+++ b/tests/gtester2xunit.py -@@ -1,18 +1,17 @@ - #! /usr/bin/python - from argparse import ArgumentParser --import libxslt --import libxml2 - import sys - import os -+from lxml import etree - - XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl' - - def transform_file(input_filename, output_filename, xsl_file): -- gtester = libxml2.parseFile(xsl_file) -- style = libxslt.parseStylesheetDoc(gtester) -- doc = libxml2.parseFile(input_filename) -- result = style.applyStylesheet(doc, None) -- result.saveFormatFile(filename=output_filename, format=True) -+ gtester = etree.parse(xsl_file) -+ style = etree.XSLT(gtester) -+ doc = etree.parse(input_filename) -+ result = style(doc) -+ result.write(filename=output_filename, format=True) - - - def get_output_filename(input_filename): diff --git a/nixpkgs/pkgs/development/libraries/blitz/default.nix b/nixpkgs/pkgs/development/libraries/blitz/default.nix new file mode 100644 index 000000000000..f47b051caadf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/blitz/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, gfortran, texinfo, python, boost +# Select SIMD alignment width (in bytes) for vectorization. +, simdWidth ? 1 +# Pad arrays to simdWidth by default? +# Note: Only useful if simdWidth > 1 +, enablePadding ? false +# Activate serialization through Boost.Serialize? +, enableSerialization ? true +# Activate test-suite? +# WARNING: Some of the tests require up to 1700MB of memory to compile. +, doCheck ? true +}: + +let + inherit (lib) optional optionals; +in +stdenv.mkDerivation rec { + pname = "blitz++"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "blitzpp"; + repo = "blitz"; + rev = "1.0.1"; + sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh"; + }; + + nativeBuildInputs = [ pkg-config python texinfo ]; + buildInputs = [ gfortran texinfo boost ]; + + configureFlags = + [ "--enable-shared" + "--disable-static" + "--enable-fortran" + "--enable-optimize" + "--with-pic=yes" + "--enable-html-docs" + "--disable-doxygen" + "--disable-dot" + "--disable-latex-docs" + "--enable-simd-width=${toString simdWidth}" + "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.out}/lib" + ] ++ optional enablePadding "--enable-array-length-padding" + ++ optional enableSerialization "--enable-serialization" + ++ optional stdenv.is64bit "--enable-64bit"; + + enableParallelBuilding = true; + + inherit doCheck; + checkTarget = "check-testsuite check-examples"; + + meta = with lib; { + description = "Fast multi-dimensional array library for C++"; + homepage = https://sourceforge.net/projects/blitz/; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ ToxicFrog ]; + longDescription = '' + Blitz++ is a C++ class library for scientific computing which provides + performance on par with Fortran 77/90. It uses template techniques to + achieve high performance. Blitz++ provides dense arrays and vectors, + random number generators, and small vectors (useful for representing + multicomponent or vector fields). + ''; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix index a486ba498205..113c4a27b919 100644 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -1,10 +1,19 @@ -{ callPackage, ... } @ args: +{ callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "2.18"; - revision = "0"; - sha256 = "09z3fy31q1pvnvpy4fswrsl2aq8ksl94lbh5rl7b6nqc3qp8ar6c"; + revision = "1"; + sha256 = "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; + extraPatches = [ + (fetchpatch { + name = "CVE-2021-40529.patch"; + url = "https://github.com/randombit/botan/commit/9a23e4e3bc3966340531f2ff608fa9d33b5185a2.patch"; + sha256 = "1ax1n2l9zh0hk35vkkywgkhzpdk76xb9apz2wm3h9kjvjs9acr3y"; + # our source tarball doesn't include the tests + excludes = [ "src/tests/*" ]; + }) + ]; }) diff --git a/nixpkgs/pkgs/development/libraries/botan/default.nix b/nixpkgs/pkgs/development/libraries/botan/default.nix index c494fa25f771..d6ee9ff152f4 100644 --- a/nixpkgs/pkgs/development/libraries/botan/default.nix +++ b/nixpkgs/pkgs/development/libraries/botan/default.nix @@ -10,6 +10,7 @@ callPackage ./generic.nix (args // { sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; knownVulnerabilities = [ + "CVE-2021-40529" # https://botan.randombit.net/security.html#id1 "2020-03-24: Side channel during CBC padding" ]; diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 3313b8c4fcd1..1384bdee9add 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -3,6 +3,7 @@ , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" +, extraPatches ? [ ] , postPatch ? null , knownVulnerabilities ? [ ] , CoreServices @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { ]; inherit sha256; }; + patches = extraPatches; inherit postPatch; buildInputs = [ python3 bzip2 zlib gmp openssl boost ] diff --git a/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix index 398ca028c09c..93ac618bcacf 100644 --- a/nixpkgs/pkgs/development/libraries/civetweb/default.nix +++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "civetweb"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-6qBsM9zkN838cMtpE3+c7qcrFpZCS/Av7Ch7EWmlnD4="; + sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4="; }; makeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix index 9237c3bd3071..7ac6918ef73e 100644 --- a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m"; + sha256 = "sha256-4ZyTp0TOKqDbziqBTkeUs3J+f3stFyUVpkzk4Jx6CDc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/dbxml/default.nix b/nixpkgs/pkgs/development/libraries/dbxml/default.nix index b4e74d036191..c65e7ad93eca 100644 --- a/nixpkgs/pkgs/development/libraries/dbxml/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbxml/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; license = licenses.agpl3; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix index a4f19678f240..4082ccfb1d0e 100644 --- a/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.08"; + version = "21.09"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-zgXIho1jmoOCVcjvDwiq+J1jOzsPgxvvaWN8NfszEdA="; + sha256 = "sha256-/hc++LEqH7vg2IK/x6sVP5864QF+3xd++HK/tIp0IRA="; }; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/fftw/default.nix b/nixpkgs/pkgs/development/libraries/fftw/default.nix index b2189b77bf76..37a7f1ce8fe4 100644 --- a/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -9,6 +9,8 @@ , enableAvx2 ? stdenv.hostPlatform.avx2Support , enableAvx512 ? stdenv.hostPlatform.avx512Support , enableFma ? stdenv.hostPlatform.fmaSupport +, enableMpi ? false +, mpi }: with lib; @@ -38,10 +40,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ gfortran ]; - buildInputs = lib.optionals stdenv.cc.isClang [ + buildInputs = optionals stdenv.cc.isClang [ # TODO: This may mismatch the LLVM version sin the stdenv, see #79818. llvmPackages.openmp - ]; + ] ++ optional enableMpi mpi; configureFlags = [ "--enable-shared" @@ -56,6 +58,7 @@ stdenv.mkDerivation { ++ optional enableAvx512 "--enable-avx512" ++ optional enableFma "--enable-fma" ++ [ "--enable-openmp" ] + ++ optional enableMpi "--enable-mpi" # doc generation causes Fortran wrapper generation which hard-codes gcc ++ optional (!withDoc) "--disable-doc"; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index 91551d076dcf..b2774e41ce46 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.08.23.00"; + version = "2021.08.30.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-B+J4h12jjusA15+QRR3egmUEwYRrnegtEWMuQX+QuJk="; + sha256 = "sha256-LS1FD5NMLkv7dr4j1b75aEdTDJdbjrXymF7eDFPGRDI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/nixpkgs/pkgs/development/libraries/freeimage/default.nix index 236305a572bf..87997cead43f 100644 --- a/nixpkgs/pkgs/development/libraries/freeimage/default.nix +++ b/nixpkgs/pkgs/development/libraries/freeimage/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation { prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; patches = [ ./unbundle.diff ]; + postPatch = '' + # To support cross compilation, use the correct `pkg-config`. + substituteInPlace Makefile.fip \ + --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace Makefile.gnu \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/gdl/default.nix b/nixpkgs/pkgs/development/libraries/gdl/default.nix index 5b73e3d7a139..6e7e1e39b38d 100644 --- a/nixpkgs/pkgs/development/libraries/gdl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gdl"; - version = "3.34.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5"; + sha256 = "NkHU/WadHhgYrv88+f+3iH/Fw2eFC3jCjHdeukq2pVU="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index 0cd2f79ea552..c4d961f4b76f 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.8"; + version = "2.2.9"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6+hYytLMg5E1KTBPWSteVu2VjF0APkcoOiigqzrBI+U="; + sha256 = "sha256-SN8zMMBX02kIS9q1/7DO+t826DpmbZBO37TDZtvRT1A="; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index c46a42049bce..ff3e9ee52e99 100644 --- a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.2"; + version = "0.12.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IyK1UqyjMO73lySmmcUaMCNF1eB0c4V4s5i38v+XlEw="; + sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM="; }; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix index e86775de623b..54f19d1756cb 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.68.2"; + version = "1.68.3"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cP8CraaC8TAzjsXMTFEQPcDlyrjVN+t2sYHsUSpl7jA="; + sha256 = "sha256-ghx/T3jxUA2mpWxUY3I72P+A3mM8y6Q6WrA9jMyiHT8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index f015773e2041..4a9fce04214f 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.39.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.40.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1yrr04g6faphh4hwzryqrwzgcr0hqqh05x9mc3vhpzmdkrrbz4zn"; + sha256 = "08l2dyf3g3zrffy60ycid6jngvhfaghg792yrkfjcpcif5dqfd9f"; fetchSubmodules = true; }; @@ -33,6 +33,13 @@ stdenv.mkDerivation rec { url = "https://github.com/grpc/grpc/commit/2f4cf1d9265c8e10fb834f0794d0e4f3ec5ae10e.patch"; sha256 = "0ams3jmgh9yzwmxcg4ifb34znamr7pb4qm0609kvil9xqvkqz963"; }) + + # Revert gRPC C++ Mutex to be an alias of Abseil, because it breaks dependent packages + (fetchpatch { + url = "https://github.com/grpc/grpc/commit/931f91b745cd5b2864a0d1787815871d0bd844ae.patch"; + sha256 = "0vc93g2i4982ys4gzyaxdv9ni25yk10sxq3n7fkz8dypy8sylck7"; + revert = true; + }) ]; nativeBuildInputs = [ cmake pkg-config ] diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 5723323defd6..aa89d947a012 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -55,6 +55,7 @@ , opencv4 , openexr , openh264 +, libopenmpt , pango , rtmpdump , sbc @@ -143,6 +144,7 @@ stdenv.mkDerivation rec { mpeg2dec libmicrodns openjpeg + libopenmpt libopus librsvg curl.dev @@ -250,7 +252,6 @@ stdenv.mkDerivation rec { # is needed, and then patching upstream to find it (though it probably # already works on Arch?). "-Dmusepack=disabled" - "-Dopenmpt=disabled" # `libopenmpt` not packaged in nixpkgs as of writing "-Dopenni2=disabled" # not packaged in nixpkgs as of writing "-Dopensles=disabled" # not packaged in nixpkgs as of writing "-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing diff --git a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix index ddab0046b660..0cc510ce7313 100644 --- a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,22 +1,30 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gtk3 +, pango +, cairo +}: stdenv.mkDerivation rec { - name = "gtkdatabox-0.9.3.1"; + pname = "gtkdatabox"; + version = "1.0.0"; src = fetchurl { - url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz"; - sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh"; + url = "mirror://sourceforge/gtkdatabox/${pname}-${version}.tar.gz"; + sha256 = "1qykm551bx8j8pfgxs60l2vhpi8lv4r8va69zvn2594lchh71vlb"; }; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ gtk2 ]; + propagatedBuildInputs = [ gtk3 pango cairo ]; meta = { description = "GTK widget for displaying large amounts of numerical data"; - - license = lib.licenses.lgpl2; - + homepage = "https://gtkdatabox.sourceforge.io/"; + license = lib.licenses.lgpl2Only; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ yl3dy ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix new file mode 100644 index 000000000000..6706057ab8c4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, glib +, glib-networking +, gnutls +, gpgme +, hiredis +, libgcrypt +, libnet +, libpcap +, libssh +, libuuid +, libxml2 +, pkg-config +, zlib +, freeradius +}: + +stdenv.mkDerivation rec { + pname = "gvm-libs"; + version = "21.4.2"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = pname; + rev = "v${version}"; + sha256 = "14v7z8ynd20s4pkhp2nc19n6gbmbh8yrn39yi2fbfm7gj28b52sx"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + glib + glib-networking + gnutls + gpgme + hiredis + libgcrypt + freeradius + libnet + libpcap + libssh + libuuid + libxml2 + zlib + ]; + + meta = with lib; { + description = "Libraries module for the Greenbone Vulnerability Management Solution"; + homepage = "https://github.com/greenbone/gvm-libs"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix index fe807d3dfb44..13c3a4752e67 100644 --- a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }: +{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, substituteAll }: stdenv.mkDerivation rec { - pname = "howard-hinnant-date-unstable"; - version = "2020-03-09"; + pname = "howard-hinnant-date"; + version = "3.0.1"; src = fetchFromGitHub { owner = "HowardHinnant"; repo = "date"; - rev = "4c1968b8f038483037cadfdbad3215ce21d934bb"; - sha256 = "0dywrf18v1znfnz0gdxgi2ydax466zq34gc1vvg2k7vq17a30wq3"; + rev = "v${version}"; + sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35"; }; patches = [ + # Add pkg-config file + # https://github.com/HowardHinnant/date/pull/538 (fetchpatch { - url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch"; - sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2"; + name = "output-date-pc-for-pkg-config.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728"; + sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154"; }) # Without this patch, this library will drop a `tzdata` directory into # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it @@ -26,7 +29,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ curl ]; cmakeFlags = [ "-DBUILD_TZ_LIB=true" @@ -41,6 +43,6 @@ stdenv.mkDerivation rec { description = "A date and time library based on the C++11/14/17 <chrono> header"; homepage = "https://github.com/HowardHinnant/date"; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ r-burns ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/imath/default.nix b/nixpkgs/pkgs/development/libraries/imath/default.nix index f3678064f3c5..15bd5907af9e 100644 --- a/nixpkgs/pkgs/development/libraries/imath/default.nix +++ b/nixpkgs/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-X+LY1xtMeYMO6Ri6fmBF2JEDuY6MF7j5XO5YhWMuffM="; + sha256 = "sha256-LoyV1Wtugva6MTpREstP2rYMrHW2xR0qfEAIV1Fo1Ns="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 23e4b2b3508d..71c1efe3f914 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , cmake }: @@ -7,9 +9,9 @@ stdenv.mkDerivation rec { version = "21.2.2"; src = fetchFromGitHub { - owner = "intel"; - repo = "gmmlib"; - rev = "${pname}-${version}"; + owner = "intel"; + repo = "gmmlib"; + rev = "${pname}-${version}"; sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v"; }; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { and buffer management for the Intel(R) Graphics Compute Runtime for OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ primeos ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix index 23801d3436da..510bc162501d 100644 --- a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "ip2location-c"; - version = "7.0.2"; # meta.homepage might change after a major update + version = "8.4.0"; - src = fetchurl { - sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx"; - url = "https://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "chrislim2888"; + repo = "IP2Location-C-Library"; + rev = version; + sha256 = "0rqjgmv62s7abiiqi3ff3ff838qx4pzr509irmzvqlflnkxxi0q6"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + ]; enableParallelBuilding = true; @@ -25,8 +33,9 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = "http://www.ip2location.com/developers/c-7"; + homepage = "https://www.ip2location.com/developers/c"; license = with licenses; [ gpl3Plus lgpl3Plus ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 4a78f3c5e51d..3ee5f3749165 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" + ] ++ lib.optionals stdenv.isAarch32 [ + # armv7l-hf-multiplatform does not support NEON + # see lib/systems/platform.nix + "-DENABLE_NEON=0" ]; postFixup = '' diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index e8fdad61b2af..9cc0ca65ae0b 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; }) ./no-static-lib.patch + # https://github.com/deltachat/deltachat-core-rust/pull/2660 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch"; + sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x"; + }) ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 0d69a5b93e1e..98aba664c02a 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; - doCheck = true; + doCheck = !stdenv.isDarwin; checkPhase = '' NO_AT_BRIDGE=1 \ @@ -115,6 +115,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libhandy"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/nixpkgs/pkgs/development/libraries/libjxl/default.nix index d33b2bc3bb58..b406654caba1 100644 --- a/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -18,17 +18,24 @@ stdenv.mkDerivation rec { pname = "libjxl"; - version = "unstable-2021-06-22"; + version = "0.5"; src = fetchFromGitHub { owner = "libjxl"; repo = "libjxl"; - rev = "409efe027d6a4a4446b84abe8d7b2fa40409257d"; - sha256 = "1akb6yyp2h4h6mfcqd4bgr3ybcik5v5kdc1rxaqnyjs7fp2f6nvv"; + rev = "v${version}"; + sha256 = "0grljgmy6cfhm8zni9d1mdn01qzc49k1pl75vhr7qcd3sp4r8lxm"; # There are various submodules in `third_party/`. fetchSubmodules = true; }; + # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 + # unless we disable highway's tests + postPatch = lib.optional stdenv.isDarwin '' + substituteInPlace third_party/highway/CMakeLists.txt \ + --replace 'if(BUILD_TESTING)' 'if(false)' + ''; + nativeBuildInputs = [ asciidoc # for docs cmake diff --git a/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/nixpkgs/pkgs/development/libraries/liblinear/default.nix index aa2dcd648b81..f30d4a2d73bd 100644 --- a/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { description = "A library for large linear classification"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; license = licenses.bsd3; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index dd2738b1774d..dba0b3956616 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-STAfA2QgSrCZaT/tcoj0BVnFfO3jbe6W2FgVOfxjpJc="; + sha256 = "sha256-vuD+afTOzldhfCRG5ghnWulNhip7BaTE7GfPhxXSMFw="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/nixpkgs/pkgs/development/libraries/libnbd/default.nix index 7781c936b929..3988a79c3251 100644 --- a/nixpkgs/pkgs/development/libraries/libnbd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnbd/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - hash = "sha256-qF9IFZGj+9Zuw00+9pbgAhBUk+eUIAxhYNJAMWxmWo0="; + hash = "sha256-BnMoxIiuwhqcwVr3AwAIFgZPcFsIg55N66ZwWMTUnCw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index a7da64f787a3..099bac9274b2 100644 --- a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.120.3"; + version = "4.157.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80"; + sha256 = "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h"; }; nativeBuildInputs = [ @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" - "-Ddemos=false" + "-Ddemos=false" # Don't build and install the demo programs + "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/nixpkgs/pkgs/development/libraries/libplctag/default.nix index 41283ed7ccd0..6ca637a5b515 100644 --- a/nixpkgs/pkgs/development/libraries/libplctag/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc="; + sha256 = "sha256-AGU1/56OO96njWLSS91HBSe2tFXBwKzJMSh2/m6Fv0E="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 99c8b7352943..f8a39f815c2d 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-Ut6tXaM97R8Y5D2dV/xPvxVzS6Ep6fOKAujtRNKoQCc="; + sha256 = "sha256-RiglS0aqLRDOfwxhVE95NaKpRy94xfeul18o3NB5L3I="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix index edb74c807bfa..92229811207f 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "tw7c9GEWUcVKQm4QmxcZbh+hfaCQWSpQAOLRNMA6xc4="; + sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libspng/default.nix b/nixpkgs/pkgs/development/libraries/libspng/default.nix new file mode 100644 index 000000000000..798a99371804 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libspng/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, stdenv +, zlib +, ninja +, meson +, pkg-config +, cmake +, libpng +}: + +stdenv.mkDerivation rec { + pname = "libspng"; + version = "0.7.0-rc3"; + + src = fetchFromGitHub { + owner = "randy408"; + repo = pname; + rev = "v${version}"; + sha256 = "0n91mr06sr34cqq91738251iaw21h5c4jgjpn0kqfx69ywxcl9fj"; + }; + + doCheck = true; + + mesonBuildType = "release"; + + mesonFlags = [ + # this is required to enable testing + # https://github.com/randy408/libspng/blob/bc383951e9a6e04dbc0766f6737e873e0eedb40b/tests/README.md#testing + "-Ddev_build=true" + ]; + + outputs = [ "out" "dev" ]; + + checkInputs = [ + cmake + libpng + ]; + + buildInputs = [ + pkg-config + zlib + ]; + + nativeBuildInputs = [ + ninja + meson + ]; + + meta = with lib; { + description = "Simple, modern libpng alternative"; + homepage = "https://github.com/randy408/libspng"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index ddd7c7b207da..595f9a5a9cd4 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -4,22 +4,14 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.0"; + version = "2.1"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn"; + sha256 = "sha256-7wSpKqjIdQeOdsQu4xN3kFHV49n6qQ3xVbjUcY1tmas="; }; - patches = [ - # Fix build on 32-bit ARM - (fetchpatch { - url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch"; - sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd"; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/nixpkgs/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch b/nixpkgs/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch new file mode 100644 index 000000000000..ae97c6455c6b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch @@ -0,0 +1,14 @@ +diff --git a/src/ch/meson.build b/src/ch/meson.build +index e34974d56c..4767763c2c 100644 +--- a/src/ch/meson.build ++++ b/src/ch/meson.build +@@ -68,7 +68,7 @@ if conf.has('WITH_CH') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'ch', +- runstatedir / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', ++ install_prefix + runstatedir / 'libvirt' / 'ch', + ] + endif diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 28b67a801989..2d13b993fd28 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -1,15 +1,66 @@ -{ lib, stdenv, fetchurl, fetchgit -, makeWrapper, autoreconfHook, fetchpatch -, coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils -, iproute2, readline, lvm2, util-linux, systemd, libpciaccess, gettext -, libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor -, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin -, meson, ninja, audit, cmake, bash-completion, pkg-config -, enableXen ? false, xen ? null -, enableIscsi ? false, openiscsi -, enableCeph ? false, ceph -, enableGlusterfs ? false, glusterfs +{ lib +, stdenv +, fetchurl +, fetchFromGitLab +, makeWrapper +, autoreconfHook +, fetchpatch +, coreutils +, libxml2 +, gnutls +, perl +, python3 +, attr +, glib +, docutils +, iproute2 +, readline +, lvm2 +, util-linux +, systemd +, libpciaccess +, gettext +, libtasn1 +, iptables +, ebtables +, libgcrypt +, yajl +, pmutils +, libcap_ng +, libapparmor +, dnsmasq +, libnl +, libpcap +, libxslt +, xhtml1 +, numad +, numactl +, perlPackages +, curl +, libiconv +, gmp +, zfs +, parted +, bridge-utils +, dmidecode +, dbus +, libtirpc +, rpcsvc-proto +, darwin +, meson +, ninja +, audit +, cmake +, bash-completion +, pkg-config +, enableXen ? false +, xen ? null +, enableIscsi ? false +, openiscsi +, enableCeph ? false +, ceph +, enableGlusterfs ? false +, glusterfs }: with lib; @@ -30,30 +81,39 @@ let ln -sf ${ebtables}/bin/ebtables-legacy $out/bin/ebtables ''; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "libvirt"; - version = "7.0.0"; + version = "7.7.0"; src = if buildFromTarball then - fetchurl { - url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "12fxkpy7j2qhfxypw9jg3bzdd9xx6vf6x96iy5kjihh89n236f6a"; - } + fetchurl + { + url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; + sha256 = "1cjj48dn4ww13ayicd2g863a5kz0sc5jlbv2991bj54dq6cn0q8v"; + } else - fetchgit { - url = "https://gitlab.com/libvirt/libvirt.git"; + fetchFromGitLab { + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "0xg9d410008mny73r2cp5ipghqpk0gz9gy7j32vcfk691dq75b3c"; + sha256 = "sha256-gv/tORDlzZP3L3YcU6/YPEpqHQSLzEWa6kEX8EzZM28="; fetchSubmodules = true; }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + ./0002-meson-patch-ch-install-prefix.patch ]; nativeBuildInputs = [ - ninja meson cmake makeWrapper pkg-config docutils + ninja + meson + cmake + makeWrapper + pkg-config + docutils ] ++ optional (!stdenv.isDarwin) [ rpcsvc-proto ] ++ optionals stdenv.isDarwin [ @@ -61,12 +121,39 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - bash-completion pkg-config - libxml2 gnutls perl python3 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus + bash-completion + pkg-config + libxml2 + gnutls + perl + python3 + readline + gettext + libtasn1 + libgcrypt + yajl + libxslt + xhtml1 + perlPackages.XMLXPath + curl + libpcap + glib + dbus ] ++ optionals stdenv.isLinux [ - audit libpciaccess lvm2 util-linux systemd libnl numad zfs - libapparmor libcap_ng numactl attr parted libtirpc + audit + libpciaccess + lvm2 + util-linux + systemd + libnl + numad + zfs + libapparmor + libcap_ng + numactl + attr + parted + libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen ] ++ optionals enableIscsi [ @@ -76,77 +163,84 @@ in stdenv.mkDerivation rec { ] ++ optionals enableGlusterfs [ glusterfs ] ++ optionals stdenv.isDarwin [ - libiconv gmp + libiconv + gmp ]; - preConfigure = let - overrides = { - QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; - QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; - }; - patchBuilder = var: value: '' - sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" - ''; - in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH - # the path to qemu-kvm will be stored in VM's .xml and .save files - # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations - substituteInPlace src/lxc/lxc_conf.c \ - --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - patchShebangs . - '' - + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); + preConfigure = + let + overrides = { + QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; + QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; + }; + patchBuilder = var: value: '' + sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" + ''; + in + '' + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + # the path to qemu-kvm will be stored in VM's .xml and .save files + # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations + substituteInPlace src/lxc/lxc_conf.c \ + --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + patchShebangs . + '' + + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); mesonAutoFeatures = "auto"; - mesonFlags = let - opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; - in [ - "--sysconfdir=/var/lib" - "-Dinstall_prefix=${placeholder "out"}" - "-Dlocalstatedir=/var" - "-Drunstatedir=/run" - "-Dlibpcap=enabled" - "-Ddriver_qemu=enabled" - "-Ddriver_vmware=enabled" - "-Ddriver_vbox=enabled" - "-Ddriver_test=enabled" - "-Ddriver_esx=enabled" - "-Ddriver_remote=enabled" - "-Dpolkit=enabled" - (opt "storage_iscsi" enableIscsi) - ] ++ optionals stdenv.isLinux [ - (opt "storage_zfs" (zfs != null)) - "-Dattr=enabled" - "-Dapparmor=enabled" - "-Dsecdriver_apparmor=enabled" - "-Dnumad=enabled" - "-Dstorage_disk=enabled" - (opt "glusterfs" enableGlusterfs) - (opt "storage_rbd" enableCeph) - ] ++ optionals stdenv.isDarwin [ - "-Dinit_script=none" - ]; + mesonFlags = + let + opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + in + [ + "--sysconfdir=/var/lib" + "-Dinstall_prefix=${placeholder "out"}" + "-Dlocalstatedir=/var" + "-Drunstatedir=/run" + "-Dlibpcap=enabled" + "-Ddriver_qemu=enabled" + "-Ddriver_vmware=enabled" + "-Ddriver_vbox=enabled" + "-Ddriver_test=enabled" + "-Ddriver_esx=enabled" + "-Ddriver_remote=enabled" + "-Dpolkit=enabled" + (opt "storage_iscsi" enableIscsi) + ] ++ optionals stdenv.isLinux [ + (opt "storage_zfs" (zfs != null)) + "-Dattr=enabled" + "-Dapparmor=enabled" + "-Dsecdriver_apparmor=enabled" + "-Dnumad=enabled" + "-Dstorage_disk=enabled" + (opt "glusterfs" enableGlusterfs) + (opt "storage_rbd" enableCeph) + ] ++ optionals stdenv.isDarwin [ + "-Dinit_script=none" + ]; - postInstall = let - # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332) - binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; - in '' - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh - # Added in nixpkgs: - gettext() { "${gettext}/bin/gettext" "$@"; } - ' - '' + optionalString stdenv.isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} - ''; + postInstall = + let + # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332) + binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; + in + '' + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString stdenv.isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} + ''; meta = { homepage = "https://libvirt.org/"; diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index 0680e4b832ce..b46bc9626302 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "0cy3x2zn1bldc5i0rzislfbc8h4nqgds445jkfqjv0d1shvdy0zn"; + sha256 = "07iljmv737kx24kd33x9ndf5l854mwslg9x2psqm12k07jmq9wjw"; }; buildInputs = [ gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/libxklavier/default.nix b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix index acf82886d466..b3b87e46b72a 100644 --- a/nixpkgs/pkgs/development/libraries/libxklavier/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxklavier/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "5.4"; src = fetchgit { - url = "git://anongit.freedesktop.org/git/libxklavier"; + url = "https://gitlab.freedesktop.org/archived-projects/libxklavier.git"; rev = "${pname}-${version}"; sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; diff --git a/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/nixpkgs/pkgs/development/libraries/mm-common/default.nix index 7ce2675e3017..44f78daec72d 100644 --- a/nixpkgs/pkgs/development/libraries/mm-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2"; + sha256 = "6BWWYliZqs8dC/J8zC/Mfzc0BexIc1yhxyc8D7zcHvU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix index 2df6214ab091..fc17bb8e8c55 100644 --- a/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.68"; + version = "3.70"; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0nvj7h2brcw21p1z99nrsxka056d0r1yy9nqqg0lw0w3mhnb60n4"; + sha256 = "sha256-K4mruGAe5AW+isW1cD1x8fs4pRw6ZKPYNDh/eLMlURs="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index d940d0518155..ee8f4dfe2e0a 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -12,6 +12,7 @@ , qtbase , libusb1 , libpcap +, libtiff , libXt , libpng , Cocoa @@ -33,20 +34,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ - qhull - flann - boost eigen libusb1 libpcap - libpng - vtk qtbase libXt ] ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ] ++ lib.optionals withCuda [ cudatoolkit ]; + propagatedBuildInputs = [ + boost + flann + libpng + libtiff + qhull + vtk + ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.14/fetch.sh index e4e02bd82ed3..ca0073afbbb4 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ \ +WGET_ARGS=( https://download.qt.io/archive/qt/5.14/5.14.2/submodules/ \ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.14/srcs.nix index 6ac958442f49..b5b6eb1a32c6 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/srcs.nix @@ -6,7 +6,7 @@ qt3d = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; name = "qt3d-everywhere-src-5.14.2.tar.xz"; }; @@ -14,7 +14,7 @@ qtactiveqt = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; }; @@ -22,7 +22,7 @@ qtandroidextras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; }; @@ -30,7 +30,7 @@ qtbase = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; name = "qtbase-everywhere-src-5.14.2.tar.xz"; }; @@ -38,7 +38,7 @@ qtcharts = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; name = "qtcharts-everywhere-src-5.14.2.tar.xz"; }; @@ -46,7 +46,7 @@ qtconnectivity = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; }; @@ -54,7 +54,7 @@ qtdatavis3d = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; }; @@ -62,7 +62,7 @@ qtdeclarative = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; }; @@ -70,7 +70,7 @@ qtdoc = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; name = "qtdoc-everywhere-src-5.14.2.tar.xz"; }; @@ -78,7 +78,7 @@ qtgamepad = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; }; @@ -86,7 +86,7 @@ qtgraphicaleffects = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; }; @@ -94,7 +94,7 @@ qtimageformats = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; }; @@ -102,7 +102,7 @@ qtlocation = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; name = "qtlocation-everywhere-src-5.14.2.tar.xz"; }; @@ -110,7 +110,7 @@ qtlottie = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; name = "qtlottie-everywhere-src-5.14.2.tar.xz"; }; @@ -118,7 +118,7 @@ qtmacextras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; }; @@ -126,7 +126,7 @@ qtmultimedia = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; }; @@ -134,7 +134,7 @@ qtnetworkauth = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; }; @@ -142,7 +142,7 @@ qtpurchasing = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; }; @@ -150,7 +150,7 @@ qtquick3d = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; }; @@ -158,7 +158,7 @@ qtquickcontrols = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; }; @@ -166,7 +166,7 @@ qtquickcontrols2 = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; }; @@ -174,7 +174,7 @@ qtquicktimeline = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; }; @@ -182,7 +182,7 @@ qtremoteobjects = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; }; @@ -190,7 +190,7 @@ qtscript = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; name = "qtscript-everywhere-src-5.14.2.tar.xz"; }; @@ -198,7 +198,7 @@ qtscxml = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; name = "qtscxml-everywhere-src-5.14.2.tar.xz"; }; @@ -206,7 +206,7 @@ qtsensors = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; name = "qtsensors-everywhere-src-5.14.2.tar.xz"; }; @@ -214,7 +214,7 @@ qtserialbus = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; }; @@ -222,7 +222,7 @@ qtserialport = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; name = "qtserialport-everywhere-src-5.14.2.tar.xz"; }; @@ -230,7 +230,7 @@ qtspeech = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; name = "qtspeech-everywhere-src-5.14.2.tar.xz"; }; @@ -238,7 +238,7 @@ qtsvg = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; name = "qtsvg-everywhere-src-5.14.2.tar.xz"; }; @@ -246,7 +246,7 @@ qttools = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; name = "qttools-everywhere-src-5.14.2.tar.xz"; }; @@ -254,7 +254,7 @@ qttranslations = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; name = "qttranslations-everywhere-src-5.14.2.tar.xz"; }; @@ -262,7 +262,7 @@ qtvirtualkeyboard = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; }; @@ -270,7 +270,7 @@ qtwayland = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; name = "qtwayland-everywhere-src-5.14.2.tar.xz"; }; @@ -278,7 +278,7 @@ qtwebchannel = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; }; @@ -286,7 +286,7 @@ qtwebengine = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; }; @@ -294,7 +294,7 @@ qtwebglplugin = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; }; @@ -302,7 +302,7 @@ qtwebsockets = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; }; @@ -310,7 +310,7 @@ qtwebview = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; name = "qtwebview-everywhere-src-5.14.2.tar.xz"; }; @@ -318,7 +318,7 @@ qtwinextras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; }; @@ -326,7 +326,7 @@ qtx11extras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; }; @@ -334,7 +334,7 @@ qtxmlpatterns = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; }; diff --git a/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/nixpkgs/pkgs/development/libraries/rocclr/default.nix index cf085d50edb0..eed5b998ee7b 100644 --- a/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , clang @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-2DI/PL29aiZcxOrGZBzXwAnNgZQpSDjyyGKgl+vDErk="; + hash = "sha256-3lk7Zucoam+11gFBzg/TWQI1L8uAlxTrPz/mDwTwod4="; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -51,11 +52,18 @@ stdenv.mkDerivation rec { --replace "/build/source/build" "$out" ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocclr "$version" + ''; + meta = with lib; { description = "Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lovesegfault ]; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. diff --git a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix index 95fe28ce9fd3..ee646b008a04 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, cmake, clang, device-libs, lld, llvm }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, lld, llvm }: stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-LbQqyJxRqb6vpXiYSkRlF1FeqXJJXktPafGmYDDK02U="; + hash = "sha256-wHSAhp1cqR9xOreGt2M2Td/ELCuLEHjpMRRkqE9dUy0="; }; sourceRoot = "source/lib/comgr"; nativeBuildInputs = [ cmake ]; - buildInputs = [ clang device-libs lld llvm ]; + buildInputs = [ clang rocm-device-libs lld llvm ]; cmakeFlags = [ "-DCLANG=${clang}/bin/clang" @@ -36,11 +36,18 @@ stdenv.mkDerivation rec { -i CMakeLists.txt ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-comgr "$version" + ''; + meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index 383d91bd08c1..e32331486569 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, writeScript , cmake , clang , clang-unwrapped @@ -9,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-9p6PIXdHFIgHgNWZzqVz5O9i2Np0z/iyxodG2cLrpGs="; + hash = "sha256-fPD9vevO2UDaFaclSI0CC/lRfM5WemWmxP1K5ajXHbk="; }; nativeBuildInputs = [ cmake ]; @@ -30,11 +31,18 @@ stdenv.mkDerivation rec { "-DCLANG=${clang}/bin/clang" ]; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-device-libs "$version" + ''; + meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix index 0a9d124561e2..9b0f7ab9f81f 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 40ffcae79246..f92d495a83c4 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, writeScript , addOpenGLRunpath , cmake , rocm-cmake @@ -21,13 +23,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-+6h1E5uWNKjjaeO5ZIi854CWYi0QGQ5mVUHdi9+4vX4="; + hash = "sha256-4+PNxRqvAvU0Nj2igYl3WiS5h5HGV63J+cHbIVW89LE="; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -73,11 +75,18 @@ stdenv.mkDerivation rec { echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocm-opencl-runtime "$version" + ''; + meta = with lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ acowley lovesegfault ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index eb4ce3c19fb6..f7ed0107fa5e 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,30 +1,33 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, writeScript , addOpenGLRunpath , clang-unwrapped , cmake , xxd , elfutils , llvm +, numactl , rocm-device-libs , rocm-thunk }: stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-Jxg3n203tV0L+UrmeQEuzX0TKpFu5An2cnuEA/F/SNY="; + hash = "sha256-B67v9B8LXDbWNxYNRxM3dgFFLjFSyJmm0zd3G5Bgvek="; }; sourceRoot = "source/src"; nativeBuildInputs = [ cmake xxd ]; - buildInputs = [ clang-unwrapped elfutils llvm ]; + buildInputs = [ clang-unwrapped elfutils llvm numactl ]; cmakeFlags = [ "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode" @@ -39,10 +42,17 @@ stdenv.mkDerivation rec { rm -rf $out/hsa ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-runtime "$version" + ''; + meta = with lib; { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lovesegfault ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index 770dd16740ca..4d641f873021 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, writeScript , cmake , pkg-config , numactl @@ -7,13 +8,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-gdto7BbrSRa3UiRNvTW1KLkHyjrcxdah4+L+1Gdm0wA="; + hash = "sha256-jpwFL4UbEnWkw1AiM4U1s1t7GiqzBeOwa55VpnOG2Dk="; }; preConfigure = '' @@ -28,10 +29,17 @@ stdenv.mkDerivation rec { cp -r $src/include $out ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocm-thunk "$version" + ''; + meta = with lib; { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lovesegfault ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index c3a63c637c34..191751993c3a 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "1.5"; + version = "1.8"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "12j20j9qbkkx55ix4nm1iw7wd36hamkpidbwhcnmj4yk5fqlyq4y"; + sha256 = "sha256-eC45V0aqFSUVJrxhaEXFzgzaXkHVwA5Yj8YyGvii0QI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix index 1eea35a34e76..cba9c28164a3 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { description = "BLAS-compatible library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix index f17124db47bb..b28fa43a2269 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { description = "LAPACK-compatible linear algebra library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index 26659ffc1661..847d8429c92f 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { description = "BLAS-compatible linear algebra library"; homepage = "https://github.com/flame/blis"; license = licenses.bsd3; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index efbd071ecd79..712713c82be4 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; license = licenses.unfree; # Includes CUDA and Intel MKL. - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix index 52747b1033b8..0f7450320d6a 100644 --- a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Unsupervised text tokenizer for Neural Network-based text generation"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ danieldk pashashocky ]; + maintainers = with maintainers; [ pashashocky ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index e2331d89751a..7e53222d0a33 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null , python3Packages +, enableDeserialize ? false }: assert interactive -> readline != null && ncurses != null; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; - NIX_CFLAGS_COMPILE = toString [ + NIX_CFLAGS_COMPILE = toString ([ "-DSQLITE_ENABLE_COLUMN_METADATA" "-DSQLITE_ENABLE_DBSTAT_VTAB" "-DSQLITE_ENABLE_JSON1" @@ -48,7 +49,10 @@ stdenv.mkDerivation rec { "-DSQLITE_SECURE_DELETE" "-DSQLITE_MAX_VARIABLE_NUMBER=250000" "-DSQLITE_MAX_EXPR_DEPTH=10000" - ]; + ] ++ lib.optionals enableDeserialize [ + # Can be removed in v3.36+, as this will become the default + "-DSQLITE_ENABLE_DESERIALIZE" + ]); # Test for features which may not be available at compile time preBuild = '' diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index a272cf8b9340..d367a56010ba 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -38,9 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace src/tss2-tcti/tctildr-dl.c \ --replace '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c \ - --replace ', "libtss2' ", \"$out/lib/libtss2" \ - --replace ', "foo' ", \"$out/lib/foo" \ - --replace ', TEST_TCTI_NAME' ", \"$out/lib/\"TEST_TCTI_NAME" + --replace '@PREFIX@' $out/lib ''; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch index 86cdcd1541e6..fc905885f506 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch @@ -1,12 +1,16 @@ diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c -index b364695c..b13be3ef 100644 +index b364695c..d026de71 100644 --- a/src/tss2-tcti/tctildr-dl.c +++ b/src/tss2-tcti/tctildr-dl.c -@@ -85,7 +85,15 @@ handle_from_name(const char *file, - if (handle == NULL) { - return TSS2_TCTI_RC_BAD_REFERENCE; +@@ -116,6 +116,50 @@ handle_from_name(const char *file, + return TSS2_TCTI_RC_BAD_VALUE; } -- *handle = dlopen(file, RTLD_NOW); + *handle = dlopen(file_xfrm, RTLD_NOW); ++ if (*handle != NULL) { ++ return TSS2_RC_SUCCESS; ++ } else { ++ LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); ++ } + size = snprintf(file_xfrm, + sizeof (file_xfrm), + "@PREFIX@%s", @@ -16,24 +20,206 @@ index b364695c..b13be3ef 100644 + return TSS2_TCTI_RC_BAD_VALUE; + } + *handle = dlopen(file_xfrm, RTLD_NOW); - if (*handle != NULL) { - return TSS2_RC_SUCCESS; - } else { -@@ -94,7 +102,7 @@ handle_from_name(const char *file, - /* 'name' alone didn't work, try libtss2-tcti-<name>.so.0 */ - size = snprintf(file_xfrm, - sizeof (file_xfrm), -- TCTI_NAME_TEMPLATE_0, ++ if (*handle != NULL) { ++ return TSS2_RC_SUCCESS; ++ } else { ++ LOG_DEBUG("Could not load TCTI file: \"%s\": %s", file, dlerror()); ++ } ++ /* 'name' alone didn't work, try libtss2-tcti-<name>.so.0 */ ++ size = snprintf(file_xfrm, ++ sizeof (file_xfrm), + "@PREFIX@" TCTI_NAME_TEMPLATE_0, - file); - if (size >= sizeof (file_xfrm)) { - LOG_ERROR("TCTI name truncated in transform."); -@@ -109,7 +117,7 @@ handle_from_name(const char *file, - /* libtss2-tcti-<name>.so.0 didn't work, try libtss2-tcti-<name>.so */ - size = snprintf(file_xfrm, - sizeof (file_xfrm), -- TCTI_NAME_TEMPLATE, ++ file); ++ if (size >= sizeof (file_xfrm)) { ++ LOG_ERROR("TCTI name truncated in transform."); ++ return TSS2_TCTI_RC_BAD_VALUE; ++ } ++ *handle = dlopen(file_xfrm, RTLD_NOW); ++ if (*handle != NULL) { ++ return TSS2_RC_SUCCESS; ++ } else { ++ LOG_DEBUG("Could not load TCTI file \"%s\": %s", file, dlerror()); ++ } ++ /* libtss2-tcti-<name>.so.0 didn't work, try libtss2-tcti-<name>.so */ ++ size = snprintf(file_xfrm, ++ sizeof (file_xfrm), + "@PREFIX@" TCTI_NAME_TEMPLATE, - file); - if (size >= sizeof (file_xfrm)) { - LOG_ERROR("TCTI name truncated in transform."); ++ file); ++ if (size >= sizeof (file_xfrm)) { ++ LOG_ERROR("TCTI name truncated in transform."); ++ return TSS2_TCTI_RC_BAD_VALUE; ++ } ++ *handle = dlopen(file_xfrm, RTLD_NOW); + if (*handle == NULL) { + LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); + return TSS2_TCTI_RC_NOT_SUPPORTED; +diff --git a/test/unit/tctildr-dl.c b/test/unit/tctildr-dl.c +index 873a4531..c17b939e 100644 +--- a/test/unit/tctildr-dl.c ++++ b/test/unit/tctildr-dl.c +@@ -223,6 +223,18 @@ test_get_info_default_success (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, HANDLE); +@@ -255,6 +267,18 @@ test_get_info_default_info_fail (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, HANDLE); +@@ -407,6 +431,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-tabrmd.so */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); +@@ -418,6 +451,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-tabrmd.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-device.so, /dev/tpmrm0 */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); +@@ -429,6 +471,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-device.so, /dev/tpm0 */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); +@@ -440,6 +491,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-swtpm.so */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-swtpm.so.0"); +@@ -451,6 +511,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-swtpm.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-mssim.so */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-mssim.so.0"); +@@ -462,6 +531,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-mssim.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-mssim.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + TSS2_RC r; + TSS2_TCTI_CONTEXT *tcti; +@@ -490,6 +568,15 @@ test_info_from_name_handle_fail (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + TSS2_RC rc = info_from_name ("foo", &info, &data); + assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED); +@@ -606,6 +693,15 @@ test_tctildr_get_info_from_name (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + TSS2_RC rc = tctildr_get_info ("foo", &info, &data); + assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED); diff --git a/nixpkgs/pkgs/development/libraries/vtk/7.x.nix b/nixpkgs/pkgs/development/libraries/vtk/7.x.nix index 860f17639454..615553f80f22 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/7.x.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/7.x.nix @@ -2,13 +2,21 @@ import ./generic.nix { majorVersion = "7.1"; minorVersion = "1"; sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; - patchesToFetch = [{ - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; - sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - } - { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; - sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; - } + patchesToFetch = [ + { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; + sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; + } + + { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; + sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + } + + # Add missing include required with recent Qt. + { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/797f28697d5ba50c1fa2bc5596af626a3c277826.diff"; + sha256 = "BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds="; + } ]; } diff --git a/nixpkgs/pkgs/development/libraries/vtk/9.x.nix b/nixpkgs/pkgs/development/libraries/vtk/9.x.nix index e99ba34999e7..b95bcb2b8693 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/9.x.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { majorVersion = "9.0"; - minorVersion = "1"; - sourceSha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v"; + minorVersion = "3"; + sourceSha256 = "vD65Ylsrjb/stgUqKrCR/JFAXeQzOw7GjzMjgVFU7Yo="; } diff --git a/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/nixpkgs/pkgs/development/libraries/vtk/generic.nix index 482e6be7bbcf..c180b05e9521 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -67,14 +67,17 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" - "-DVTK_USE_SYSTEM_PNG=ON" - "-DVTK_USE_SYSTEM_TIFF=1" + "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_PNG" else "VTK_MODULE_USE_EXTERNAL_vtkpng"}=ON" + "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_TIFF" else "VTK_MODULE_USE_EXTERNAL_vtktiff"}=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" + ] ++ optionals enableQt [ + "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" + ] ++ optionals (enableQt && lib.versionOlder version "8.0") [ + "-DVTK_QT_VERSION=5" ] - ++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ] ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" diff --git a/nixpkgs/pkgs/development/libraries/zimg/default.nix b/nixpkgs/pkgs/development/libraries/zimg/default.nix index 76334bb3532f..38b106d474b7 100644 --- a/nixpkgs/pkgs/development/libraries/zimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "19qim6vyfas0m09piiw0pw7i0xjzi8vs6bx716gz472nflsg1604"; + sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fn.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fn.nix new file mode 100644 index 000000000000..02e054b2f2c0 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fn.nix @@ -0,0 +1,26 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "fn"; + version = "20171019-git"; + + description = "Some macros for lambda brevity"; + + deps = [ args."named-readtables" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz"; + sha256 = "0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8"; + }; + + packageName = "fn"; + + asdFilesToKeep = ["fn.asd"]; + overrides = x: x; +} +/* (SYSTEM fn DESCRIPTION Some macros for lambda brevity SHA256 + 0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8 URL + http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz MD5 + 0e1cfe5f19ceec8966baa3037772d31e NAME fn FILENAME fn DEPS + ((NAME named-readtables FILENAME named-readtables)) DEPENDENCIES + (named-readtables) VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-docs.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-docs.nix new file mode 100644 index 000000000000..4679a62c0679 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-docs.nix @@ -0,0 +1,28 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "glsl-docs"; + version = "glsl-spec-release-quicklisp-f04476f7-git"; + + description = "The official docs for all the symbols in glsl-symbols"; + + deps = [ args."glsl-symbols" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; + }; + + packageName = "glsl-docs"; + + asdFilesToKeep = ["glsl-docs.asd"]; + overrides = x: x; +} +/* (SYSTEM glsl-docs DESCRIPTION + The official docs for all the symbols in glsl-symbols SHA256 + 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL + http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz + MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-docs FILENAME glsl-docs DEPS + ((NAME glsl-symbols FILENAME glsl-symbols)) DEPENDENCIES (glsl-symbols) + VERSION glsl-spec-release-quicklisp-f04476f7-git SIBLINGS + (glsl-spec glsl-symbols) PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-spec.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-spec.nix new file mode 100644 index 000000000000..08150c645f6f --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-spec.nix @@ -0,0 +1,26 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "glsl-spec"; + version = "release-quicklisp-f04476f7-git"; + + description = "The GLSL Spec as a datastructure"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; + }; + + packageName = "glsl-spec"; + + asdFilesToKeep = ["glsl-spec.asd"]; + overrides = x: x; +} +/* (SYSTEM glsl-spec DESCRIPTION The GLSL Spec as a datastructure SHA256 + 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL + http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz + MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-spec FILENAME glsl-spec DEPS + NIL DEPENDENCIES NIL VERSION release-quicklisp-f04476f7-git SIBLINGS + (glsl-docs glsl-symbols) PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-symbols.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-symbols.nix new file mode 100644 index 000000000000..fd22bfb6adf8 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-symbols.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "glsl-symbols"; + version = "glsl-spec-release-quicklisp-f04476f7-git"; + + description = "Lispy versions of all glsl names as symbols"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; + }; + + packageName = "glsl-symbols"; + + asdFilesToKeep = ["glsl-symbols.asd"]; + overrides = x: x; +} +/* (SYSTEM glsl-symbols DESCRIPTION Lispy versions of all glsl names as symbols + SHA256 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL + http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz + MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-symbols FILENAME + glsl-symbols DEPS NIL DEPENDENCIES NIL VERSION + glsl-spec-release-quicklisp-f04476f7-git SIBLINGS (glsl-docs glsl-spec) + PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit.nix new file mode 100644 index 000000000000..673ef0ee6342 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit.nix @@ -0,0 +1,26 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lisp-unit"; + version = "20170124-git"; + + description = "Common Lisp library that supports unit testing."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz"; + sha256 = "00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m"; + }; + + packageName = "lisp-unit"; + + asdFilesToKeep = ["lisp-unit.asd"]; + overrides = x: x; +} +/* (SYSTEM lisp-unit DESCRIPTION + Common Lisp library that supports unit testing. SHA256 + 00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m URL + http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz + MD5 2c55342cb8af18b290bb6a28c75deac5 NAME lisp-unit FILENAME lisp-unit DEPS + NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-float.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-float.nix new file mode 100644 index 000000000000..0ad2062417c9 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-float.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "parse-float"; + version = "20200218-git"; + + parasites = [ "parse-float-tests" ]; + + description = "Parse floating point values in strings."; + + deps = [ args."alexandria" args."lisp-unit" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; + sha256 = "02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw"; + }; + + packageName = "parse-float"; + + asdFilesToKeep = ["parse-float.asd"]; + overrides = x: x; +} +/* (SYSTEM parse-float DESCRIPTION Parse floating point values in strings. + SHA256 02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw URL + http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz + MD5 149e40a8c5fd6ab0e43242cb898d66bf NAME parse-float FILENAME parse-float + DEPS + ((NAME alexandria FILENAME alexandria) (NAME lisp-unit FILENAME lisp-unit)) + DEPENDENCIES (alexandria lisp-unit) VERSION 20200218-git SIBLINGS NIL + PARASITES (parse-float-tests)) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/varjo.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/varjo.nix new file mode 100644 index 000000000000..c69acab7ba20 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/varjo.nix @@ -0,0 +1,39 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "varjo"; + version = "release-quicklisp-92f9c75b-git"; + + description = "Common Lisp -> GLSL Compiler"; + + deps = [ args."alexandria" args."cl-ppcre" args."documentation-utils" args."fn" args."glsl-docs" args."glsl-spec" args."glsl-symbols" args."named-readtables" args."parse-float" args."trivial-indent" args."uiop" args."vas-string-metrics" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; + sha256 = "0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy"; + }; + + packageName = "varjo"; + + asdFilesToKeep = ["varjo.asd"]; + overrides = x: x; +} +/* (SYSTEM varjo DESCRIPTION Common Lisp -> GLSL Compiler SHA256 + 0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy URL + http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz + MD5 78a3b8021885ebfab4015e20b885cdcf NAME varjo FILENAME varjo DEPS + ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME documentation-utils FILENAME documentation-utils) + (NAME fn FILENAME fn) (NAME glsl-docs FILENAME glsl-docs) + (NAME glsl-spec FILENAME glsl-spec) + (NAME glsl-symbols FILENAME glsl-symbols) + (NAME named-readtables FILENAME named-readtables) + (NAME parse-float FILENAME parse-float) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop) + (NAME vas-string-metrics FILENAME vas-string-metrics)) + DEPENDENCIES + (alexandria cl-ppcre documentation-utils fn glsl-docs glsl-spec + glsl-symbols named-readtables parse-float trivial-indent uiop + vas-string-metrics) + VERSION release-quicklisp-92f9c75b-git SIBLINGS (varjo.import varjo.tests) + PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vas-string-metrics.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vas-string-metrics.nix new file mode 100644 index 000000000000..122bab4b3b3a --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vas-string-metrics.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "vas-string-metrics"; + version = "20160208-git"; + + description = "Jaro-Winkler and Levenshtein string distance algorithms."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/vas-string-metrics/2016-02-08/vas-string-metrics-20160208-git.tgz"; + sha256 = "1s9a9bgc2ibknjr6mlbr4gsxcwpjivz5hbl1wz57fsh4n0w8h7ch"; + }; + + packageName = "vas-string-metrics"; + + asdFilesToKeep = ["vas-string-metrics.asd"]; + overrides = x: x; +} +/* (SYSTEM vas-string-metrics DESCRIPTION + Jaro-Winkler and Levenshtein string distance algorithms. SHA256 + 1s9a9bgc2ibknjr6mlbr4gsxcwpjivz5hbl1wz57fsh4n0w8h7ch URL + http://beta.quicklisp.org/archive/vas-string-metrics/2016-02-08/vas-string-metrics-20160208-git.tgz + MD5 5f38d4ee241c11286be6147f481e7fd0 NAME vas-string-metrics FILENAME + vas-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20160208-git SIBLINGS + (test.vas-string-metrics) PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 6cbd7f4115a9..99ba08527072 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -11,7 +11,6 @@ blackbird bordeaux-threads calispel caveman -cl-custom-hash-table cffi cffi-grovel cffi-uffi-compat @@ -19,8 +18,7 @@ chanl chipz chunga circular-streams -clack -clack-v1-compat +cl+ssl cl-annot cl-ansi-text cl-async @@ -35,6 +33,7 @@ cl-containers cl-cookie cl-css cl-csv +cl-custom-hash-table cl-dbi cl-dot cl-emb @@ -44,8 +43,8 @@ cl-fuse-meta-fs cl-gobject-introspection cl-hooks cl-html-diff -cl-html5-parser cl-html-parse +cl-html5-parser cl-interpol cl-jpeg cl-json @@ -54,9 +53,6 @@ cl-libuv cl-locale cl-markup cl-mysql -closer-mop -closure-common -closure-html cl-paths-ttf cl-pdf cl-ppcre @@ -67,30 +63,34 @@ cl-protobufs cl-qprint cl-reexport cl-slice -cl-speedy-queue cl-smtp -cl-syslog -clsql -clsql-postgresql -clsql-postgresql-socket -clsql-sqlite3 -clss -cl+ssl +cl-speedy-queue cl-store cl-syntax cl-syntax-annot cl-syntax-anonfun cl-syntax-markup +cl-syslog cl-test-more cl-typesetting -clump cl-unicode cl-unification cl-utilities cl-vectors cl-webkit2 cl-who +clack +clack-v1-compat clfswm +closer-mop +closure-common +closure-html +clsql +clsql-postgresql +clsql-postgresql-socket +clsql-sqlite3 +clss +clump clx collectors command-line-arguments @@ -209,6 +209,7 @@ usocket utilities.print-items utilities.print-tree uuid +varjo woo wookie xembed diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index ed8e87162c84..820d589140a5 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,6 +6,14 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; + "lisp-unit" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-unit" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-unit.nix { + inherit fetchurl; + })); + + "pythonic-string-reader" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."pythonic-string-reader" or (x: {})) @@ -74,6 +82,58 @@ let quicklisp-to-nix-packages = rec { })); + "vas-string-metrics" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."vas-string-metrics" or (x: {})) + (import ./quicklisp-to-nix-output/vas-string-metrics.nix { + inherit fetchurl; + })); + + + "parse-float" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parse-float" or (x: {})) + (import ./quicklisp-to-nix-output/parse-float.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "lisp-unit" = quicklisp-to-nix-packages."lisp-unit"; + })); + + + "glsl-symbols" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."glsl-symbols" or (x: {})) + (import ./quicklisp-to-nix-output/glsl-symbols.nix { + inherit fetchurl; + })); + + + "glsl-spec" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."glsl-spec" or (x: {})) + (import ./quicklisp-to-nix-output/glsl-spec.nix { + inherit fetchurl; + })); + + + "glsl-docs" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."glsl-docs" or (x: {})) + (import ./quicklisp-to-nix-output/glsl-docs.nix { + inherit fetchurl; + "glsl-symbols" = quicklisp-to-nix-packages."glsl-symbols"; + })); + + + "fn" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fn" or (x: {})) + (import ./quicklisp-to-nix-output/fn.nix { + inherit fetchurl; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + "mgl-pax" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mgl-pax" or (x: {})) @@ -709,14 +769,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-aa" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-aa" or (x: {})) - (import ./quicklisp-to-nix-output/cl-aa.nix { - inherit fetchurl; - })); - - "clump-binary-tree" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clump-binary-tree" or (x: {})) @@ -735,14 +787,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-anonfun" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-anonfun" or (x: {})) - (import ./quicklisp-to-nix-output/cl-anonfun.nix { - inherit fetchurl; - })); - - "clsql-uffi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clsql-uffi" or (x: {})) @@ -753,6 +797,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-aa" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-aa" or (x: {})) + (import ./quicklisp-to-nix-output/cl-aa.nix { + inherit fetchurl; + })); + + "global-vars" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."global-vars" or (x: {})) @@ -761,6 +813,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-anonfun" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-anonfun" or (x: {})) + (import ./quicklisp-to-nix-output/cl-anonfun.nix { + inherit fetchurl; + })); + + "clunit" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clunit" or (x: {})) @@ -1476,6 +1536,26 @@ let quicklisp-to-nix-packages = rec { })); + "varjo" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."varjo" or (x: {})) + (import ./quicklisp-to-nix-output/varjo.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "fn" = quicklisp-to-nix-packages."fn"; + "glsl-docs" = quicklisp-to-nix-packages."glsl-docs"; + "glsl-spec" = quicklisp-to-nix-packages."glsl-spec"; + "glsl-symbols" = quicklisp-to-nix-packages."glsl-symbols"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "parse-float" = quicklisp-to-nix-packages."parse-float"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "vas-string-metrics" = quicklisp-to-nix-packages."vas-string-metrics"; + })); + + "uuid" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uuid" or (x: {})) @@ -3060,6 +3140,105 @@ let quicklisp-to-nix-packages = rec { })); + "clump" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clump" or (x: {})) + (import ./quicklisp-to-nix-output/clump.nix { + inherit fetchurl; + "acclimation" = quicklisp-to-nix-packages."acclimation"; + "clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree"; + "clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree"; + })); + + + "clss" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clss" or (x: {})) + (import ./quicklisp-to-nix-output/clss.nix { + inherit fetchurl; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + + "clsql-sqlite3" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-sqlite3" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-sqlite3.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql-postgresql-socket" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql-socket" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "md5" = quicklisp-to-nix-packages."md5"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql-postgresql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql.nix { + inherit fetchurl; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "closure-html" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-html" or (x: {})) + (import ./quicklisp-to-nix-output/closure-html.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "closure-common" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-common" or (x: {})) + (import ./quicklisp-to-nix-output/closure-common.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "closer-mop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closer-mop" or (x: {})) + (import ./quicklisp-to-nix-output/closer-mop.nix { + inherit fetchurl; + })); + + "clfswm" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clfswm" or (x: {})) @@ -3069,6 +3248,88 @@ let quicklisp-to-nix-packages = rec { })); + "clack-v1-compat" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-v1-compat" or (x: {})) + (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "clack" = quicklisp-to-nix-packages."clack"; + "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; + "clack-test" = quicklisp-to-nix-packages."clack-test"; + "dexador" = quicklisp-to-nix-packages."dexador"; + "dissect" = quicklisp-to-nix-packages."dissect"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "marshal" = quicklisp-to-nix-packages."marshal"; + "md5" = quicklisp-to-nix-packages."md5"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "quri" = quicklisp-to-nix-packages."quri"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; + "rove" = quicklisp-to-nix-packages."rove"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + })); + + + "clack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack" or (x: {})) + (import ./quicklisp-to-nix-output/clack.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "cl-who" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-who" or (x: {})) @@ -3138,17 +3399,6 @@ let quicklisp-to-nix-packages = rec { })); - "clump" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clump" or (x: {})) - (import ./quicklisp-to-nix-output/clump.nix { - inherit fetchurl; - "acclimation" = quicklisp-to-nix-packages."acclimation"; - "clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree"; - "clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree"; - })); - - "cl-typesetting" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-typesetting" or (x: {})) @@ -3176,6 +3426,22 @@ let quicklisp-to-nix-packages = rec { })); + "cl-syslog" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syslog" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syslog.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "global-vars" = quicklisp-to-nix-packages."global-vars"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "cl-syntax-markup" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-syntax-markup" or (x: {})) @@ -3232,92 +3498,11 @@ let quicklisp-to-nix-packages = rec { })); - "cl_plus_ssl" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl_plus_ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "uiop" = quicklisp-to-nix-packages."uiop"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "clss" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clss" or (x: {})) - (import ./quicklisp-to-nix-output/clss.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; - "plump" = quicklisp-to-nix-packages."plump"; - "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; - })); - - - "clsql-sqlite3" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-sqlite3" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-sqlite3.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql-postgresql-socket" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-postgresql-socket" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "md5" = quicklisp-to-nix-packages."md5"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql-postgresql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-postgresql" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-postgresql.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql" or (x: {})) - (import ./quicklisp-to-nix-output/clsql.nix { - inherit fetchurl; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "cl-syslog" = buildLispPackage + "cl-speedy-queue" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl-syslog" or (x: {})) - (import ./quicklisp-to-nix-output/cl-syslog.nix { + (qlOverrides."cl-speedy-queue" or (x: {})) + (import ./quicklisp-to-nix-output/cl-speedy-queue.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "global-vars" = quicklisp-to-nix-packages."global-vars"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -3341,14 +3526,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-speedy-queue" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-speedy-queue" or (x: {})) - (import ./quicklisp-to-nix-output/cl-speedy-queue.nix { - inherit fetchurl; - })); - - "cl-slice" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-slice" or (x: {})) @@ -3460,40 +3637,6 @@ let quicklisp-to-nix-packages = rec { })); - "closure-html" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closure-html" or (x: {})) - (import ./quicklisp-to-nix-output/closure-html.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "closure-common" = quicklisp-to-nix-packages."closure-common"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - - "closure-common" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closure-common" or (x: {})) - (import ./quicklisp-to-nix-output/closure-common.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - - "closer-mop" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closer-mop" or (x: {})) - (import ./quicklisp-to-nix-output/closer-mop.nix { - inherit fetchurl; - })); - - "cl-mysql" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-mysql" or (x: {})) @@ -3603,14 +3746,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-html-parse" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-html-parse" or (x: {})) - (import ./quicklisp-to-nix-output/cl-html-parse.nix { - inherit fetchurl; - })); - - "cl-html5-parser" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html5-parser" or (x: {})) @@ -3623,6 +3758,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html-parse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html-parse.nix { + inherit fetchurl; + })); + + "cl-html-diff" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html-diff" or (x: {})) @@ -3744,6 +3887,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-custom-hash-table" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-custom-hash-table" or (x: {})) + (import ./quicklisp-to-nix-output/cl-custom-hash-table.nix { + inherit fetchurl; + })); + + "cl-csv" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-csv" or (x: {})) @@ -3943,83 +4094,20 @@ let quicklisp-to-nix-packages = rec { })); - "clack-v1-compat" = buildLispPackage + "cl_plus_ssl" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."clack-v1-compat" or (x: {})) - (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; - "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; - "chipz" = quicklisp-to-nix-packages."chipz"; - "chunga" = quicklisp-to-nix-packages."chunga"; - "circular-streams" = quicklisp-to-nix-packages."circular-streams"; - "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-base64" = quicklisp-to-nix-packages."cl-base64"; - "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; - "clack" = quicklisp-to-nix-packages."clack"; - "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; - "clack-socket" = quicklisp-to-nix-packages."clack-socket"; - "clack-test" = quicklisp-to-nix-packages."clack-test"; - "dexador" = quicklisp-to-nix-packages."dexador"; - "dissect" = quicklisp-to-nix-packages."dissect"; - "fast-http" = quicklisp-to-nix-packages."fast-http"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "http-body" = quicklisp-to-nix-packages."http-body"; - "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "jonathan" = quicklisp-to-nix-packages."jonathan"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "marshal" = quicklisp-to-nix-packages."marshal"; - "md5" = quicklisp-to-nix-packages."md5"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "proc-parse" = quicklisp-to-nix-packages."proc-parse"; - "quri" = quicklisp-to-nix-packages."quri"; - "rfc2388" = quicklisp-to-nix-packages."rfc2388"; - "rove" = quicklisp-to-nix-packages."rove"; - "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "static-vectors" = quicklisp-to-nix-packages."static-vectors"; - "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - "uiop" = quicklisp-to-nix-packages."uiop"; - "usocket" = quicklisp-to-nix-packages."usocket"; - "xsubseq" = quicklisp-to-nix-packages."xsubseq"; - })); - - - "clack" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clack" or (x: {})) - (import ./quicklisp-to-nix-output/clack.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "uiop" = quicklisp-to-nix-packages."uiop"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -4109,14 +4197,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-custom-hash-table" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-custom-hash-table" or (x: {})) - (import ./quicklisp-to-nix-output/cl-custom-hash-table.nix { - inherit fetchurl; - })); - - "caveman" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."caveman" or (x: {})) diff --git a/nixpkgs/pkgs/development/lua-modules/default.nix b/nixpkgs/pkgs/development/lua-modules/default.nix index 091b94f58f51..e4927ee30464 100644 --- a/nixpkgs/pkgs/development/lua-modules/default.nix +++ b/nixpkgs/pkgs/development/lua-modules/default.nix @@ -1,7 +1,7 @@ # inspired by pkgs/development/haskell-modules/default.nix { pkgs, lib , lua -, overrides ? (self: super: {}) +, overrides ? (final: prev: {}) }: let @@ -15,7 +15,7 @@ let overridenPackages = import ./overrides.nix { inherit pkgs; }; generatedPackages = if (builtins.pathExists ./generated-packages.nix) then - pkgs.callPackage ./generated-packages.nix { } else (self: super: {}); + pkgs.callPackage ./generated-packages.nix { } else (final: prev: {}); extensible-self = lib.makeExtensible (extends overrides @@ -24,7 +24,6 @@ let initialPackages ) ) - ) - ; + ); in extensible-self diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index c5a1a41cbd3c..06020551513f 100644 --- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -160,10 +160,10 @@ busted = buildLuarocksPackage { cassowary = buildLuarocksPackage { pname = "cassowary"; - version = "2.3.1-1"; + version = "2.3.1-2"; knownRockspec = (fetchurl { - url = "https://luarocks.org/cassowary-2.3.1-1.rockspec"; - sha256 = "1rgs0rmlmhghml0gi4dn0rg2iq7rqnn8w8dcy9r3qsbkpyylbajc"; + url = "https://luarocks.org/cassowary-2.3.1-2.rockspec"; + sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/sile-typesetter/cassowary.lua", @@ -171,7 +171,7 @@ cassowary = buildLuarocksPackage { "date": "2021-07-19T14:37:34+03:00", "path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua", "sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq", - "fetchSubmodules": true, + "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false } @@ -179,6 +179,10 @@ cassowary = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; + checkInputs = [ busted ]; + # Avoid circular dependency issue with busted / penlight, see: + # https://github.com/NixOS/nixpkgs/pull/136453/files#r700982255 + doCheck = false; meta = { homepage = "https://github.com/sile-typesetter/cassowary.lua"; @@ -1953,15 +1957,18 @@ nvim-client = buildLuarocksPackage { penlight = buildLuarocksPackage { pname = "penlight"; - version = "dev-1"; - + version = "1.11.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/penlight-1.11.0-1.rockspec"; + sha256 = "1sjhnywvamyi9fadhra5pw2an1rhy2hk2byfxmr3n5wi0xrqv004"; + }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", "rev": "e3712f00fae09a166dd62540b677600165d5bcd7", "date": "2021-08-18T21:37:47+02:00", "path": "/nix/store/i70ndw8qhvcm828ifb3vyj08y22xp0ka-penlight", "sha256": "19n9xqkb4hlak0k7hamk4ixwjvyxslsnyh1zjazdzrl8n736xhkl", - "fetchSubmodules": true, + "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false } @@ -1969,12 +1976,13 @@ penlight = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; - checkInputs = [ busted busted ]; + checkInputs = [ busted ]; doCheck = false; meta = { homepage = "https://lunarmodules.github.io/penlight"; description = "Lua utility libraries loosely based on the Python standard libraries"; + maintainers = with lib.maintainers; [ alerque ]; license.fullName = "MIT/X11"; }; }; diff --git a/nixpkgs/pkgs/development/lua-modules/lib.nix b/nixpkgs/pkgs/development/lua-modules/lib.nix new file mode 100644 index 000000000000..9c31f9a5c53c --- /dev/null +++ b/nixpkgs/pkgs/development/lua-modules/lib.nix @@ -0,0 +1,63 @@ +{ pkgs, lib, lua }: +let + requiredLuaModules = drvs: with lib; let + modules = filter hasLuaModule drvs; + in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); + # Check whether a derivation provides a lua module. + hasLuaModule = drv: drv ? luaModule; +in +rec { + inherit hasLuaModule requiredLuaModules; + + luaPathList = [ + "share/lua/${lua.luaversion}/?.lua" + "share/lua/${lua.luaversion}/?/init.lua" + ]; + luaCPathList = [ + "lib/lua/${lua.luaversion}/?.so" + ]; + + /* generate paths without a prefix + */ + luaPathRelStr = lib.concatStringsSep ";" luaPathList; + luaCPathRelStr = lib.concatStringsSep ";" luaCPathList; + + /* generate LUA_(C)PATH value for a specific derivation, i.e., with absolute paths + */ + genLuaPathAbsStr = drv: lib.concatMapStringsSep ";" (x: "${drv}/${x}") luaPathList; + genLuaCPathAbsStr = drv: lib.concatMapStringsSep ";" (x: "${drv}/${x}") luaCPathList; + + /* Generate a LUA_PATH with absolute paths + */ + # genLuaPathAbs = drv: + # lib.concatStringsSep ";" (map (x: "${drv}/x") luaPathList); + + luaAtLeast = lib.versionAtLeast lua.luaversion; + luaOlder = lib.versionOlder lua.luaversion; + isLua51 = (lib.versions.majorMinor lua.version) == "5.1"; + isLua52 = (lib.versions.majorMinor lua.version) == "5.2"; + isLua53 = lua.luaversion == "5.3"; + isLuaJIT = lib.getName lua == "luajit"; + + /* generates the relative path towards the folder where + seems stable even when using lua_modules_path = "" + + Example: + getDataFolder luaPackages.stdlib + => stdlib-41.2.2-1-rocks/stdlib/41.2.2-1/doc + */ + getDataFolder = drv: + "${drv.pname}-${drv.version}-rocks/${drv.pname}/${drv.version}"; + + /* Convert derivation to a lua module. + so that luaRequireModules can be run later + */ + toLuaModule = drv: + drv.overrideAttrs( oldAttrs: { + # Use passthru in order to prevent rebuilds when possible. + passthru = (oldAttrs.passthru or {}) // { + luaModule = lua; + requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs; + }; + }); +} diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index a15bd6e53663..247cf89f3945 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -363,6 +363,12 @@ with super; ''; }); + # TODO just while testing, remove afterwards + # toVimPlugin should do it instead + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs(oa: { + nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ pkgs.vimUtils.vimGenDocHook ]; + }); + # aliases cjson = super.lua-cjson; } diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix index 83be06a31419..ef803779ad64 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" - # Create a virtual android device for testing if it does not exists + # Create a virtual android device for testing if it does not exist ${sdk}/libexec/android-sdk/tools/bin/avdmanager list target if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index c7115baa422a..3904e6acf98a 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -5,7 +5,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (6.1.4) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -18,10 +18,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.11.0.beta.2) + cocoapods (1.11.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.0.beta.2) + cocoapods-core (= 1.11.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -36,7 +36,7 @@ GEM nap (~> 1.0) ruby-macho (>= 1.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.0.beta.2) + cocoapods-core (1.11.0) activesupport (>= 5.0, < 7) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -47,11 +47,11 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.4.0) + cocoapods-downloader (1.5.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) - cocoapods-trunk (1.5.0) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) @@ -60,7 +60,7 @@ GEM escape (0.0.4) ethon (0.14.0) ffi (>= 1.15.0) - ffi (1.15.3) + ffi (1.15.4) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -90,7 +90,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - arm64-darwin-20 + ruby DEPENDENCIES cocoapods (>= 1.7.0.beta.1)! diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock index c29ad34d4efd..2cc06eac2737 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -5,11 +5,12 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.6) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) @@ -17,10 +18,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.2) - addressable (~> 2.6) + cocoapods (1.11.0) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.2) + cocoapods-core (= 1.11.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,26 +32,26 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.2) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.0) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.4.0) + cocoapods-downloader (1.5.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) - cocoapods-trunk (1.5.0) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) @@ -59,7 +60,7 @@ GEM escape (0.0.4) ethon (0.14.0) ffi (>= 1.15.0) - ffi (1.15.3) + ffi (1.15.4) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -68,18 +69,17 @@ GEM concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) - molinillo (0.6.6) + molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) rexml (3.2.5) - ruby-macho (1.4.0) - thread_safe (0.3.6) + ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) @@ -87,9 +87,10 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) + zeitwerk (2.4.2) PLATFORMS - arm64-darwin-20 + ruby DEPENDENCIES cocoapods! diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index b64d6b189ad5..e1f573b89c31 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvmvxday0fg1p1ardmqc62xam212c6iaaf1djahvz70631grprq"; + sha256 = "1b8773v98vkcr55yx5ydc28wq8ya53ya1v51cj7fxg5n3aa5h0cz"; type = "gem"; }; - version = "1.11.0.beta.2"; + version = "1.11.0"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnnmbajllp3mw2w2b2bs2y42cnh1y1zbq63m3asg097z4d1a9h1"; + sha256 = "19bik6yj125vhq0vxb6fsb41b3i2bi4437l7dkhgrw317gx3wf9b"; type = "gem"; }; - version = "1.11.0.beta.2"; + version = "1.11.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -99,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz"; + sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -131,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; + sha256 = "0cgdx7z9psxxrsa13fk7qc9i6jskrwcafhrdz94avzia2y6dlnsz"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; cocoapods-try = { groups = ["default"]; @@ -192,10 +192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; type = "gem"; }; - version = "1.15.3"; + version = "1.15.4"; }; fourflusher = { groups = ["default"]; diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix index 7a6b63200281..7d74b857cf5c 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "5.2.6"; + version = "6.1.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg"; + sha256 = "1b8773v98vkcr55yx5ydc28wq8ya53ya1v51cj7fxg5n3aa5h0cz"; type = "gem"; }; - version = "1.10.2"; + version = "1.11.0"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5"; + sha256 = "19bik6yj125vhq0vxb6fsb41b3i2bi4437l7dkhgrw317gx3wf9b"; type = "gem"; }; - version = "1.10.2"; + version = "1.11.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -97,10 +97,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz"; + sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -127,10 +127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; + sha256 = "0cgdx7z9psxxrsa13fk7qc9i6jskrwcafhrdz94avzia2y6dlnsz"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; cocoapods-try = { groups = ["default"]; @@ -184,10 +184,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; type = "gem"; }; - version = "1.15.3"; + version = "1.15.4"; }; fourflusher = { groups = ["default"]; @@ -257,12 +257,14 @@ version = "5.14.4"; }; molinillo = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; type = "gem"; }; - version = "0.6.6"; + version = "0.8.0"; }; nanaimo = { groups = ["default"]; @@ -315,18 +317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; - type = "gem"; - }; - version = "1.4.0"; - }; - thread_safe = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch"; type = "gem"; }; - version = "0.3.6"; + version = "2.5.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -340,15 +334,15 @@ version = "1.4.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; @@ -361,4 +355,14 @@ }; version = "1.21.0"; }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + type = "gem"; + }; + version = "2.4.2"; + }; } diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/update b/nixpkgs/pkgs/development/mobile/cocoapods/update index 309142e0e1d2..66f6f7b66fd4 100755 --- a/nixpkgs/pkgs/development/mobile/cocoapods/update +++ b/nixpkgs/pkgs/development/mobile/cocoapods/update @@ -6,7 +6,10 @@ set -e cd "$(dirname "${BASH_SOURCE[0]}")" rm -f Gemfile.lock Gemfile-beta.lock + +export BUNDLE_FORCE_RUBY_PLATFORM=1 bundler lock BUNDLE_GEMFILE=Gemfile-beta bundler lock --lockfile=Gemfile-beta.lock + bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix bundix --gemfile=Gemfile-beta --lockfile=Gemfile-beta.lock --gemset=gemset-beta.nix diff --git a/nixpkgs/pkgs/development/node-packages/default.nix b/nixpkgs/pkgs/development/node-packages/default.nix index ddbf2b50baad..2ecda487920f 100644 --- a/nixpkgs/pkgs/development/node-packages/default.nix +++ b/nixpkgs/pkgs/development/node-packages/default.nix @@ -177,36 +177,6 @@ let meta.mainProgram = "markdownlint"; }; - mirakurun = super.mirakurun.override rec { - nativeBuildInputs = with pkgs; [ makeWrapper ]; - postInstall = let - runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l-utils ]); - in - '' - substituteInPlace $out/lib/node_modules/mirakurun/processes.json \ - --replace "/usr/local" "" - - # XXX: Files copied from the Nix store are non-writable, so they need - # to be given explicit write permissions - substituteInPlace $out/lib/node_modules/mirakurun/lib/Mirakurun/config.js \ - --replace 'fs.copyFileSync("config/server.yml", path);' \ - 'fs.copyFileSync("config/server.yml", path); fs.chmodSync(path, 0o644);' \ - --replace 'fs.copyFileSync("config/tuners.yml", path);' \ - 'fs.copyFileSync("config/tuners.yml", path); fs.chmodSync(path, 0o644);' \ - --replace 'fs.copyFileSync("config/channels.yml", path);' \ - 'fs.copyFileSync("config/channels.yml", path); fs.chmodSync(path, 0o644);' - - # XXX: The original mirakurun command uses PM2 to manage the Mirakurun - # server. However, we invoke the server directly and let systemd - # manage it to avoid complication. This is okay since no features - # unique to PM2 is currently being used. - makeWrapper ${nodejs}/bin/npm $out/bin/mirakurun \ - --add-flags "start" \ - --run "cd $out/lib/node_modules/mirakurun" \ - --prefix PATH : ${pkgs.lib.makeBinPath runtimeDeps} - ''; - }; - node-gyp = super.node-gyp.override { nativeBuildInputs = [ pkgs.makeWrapper ]; # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. @@ -306,6 +276,18 @@ let meta.mainProgram = "postcss"; }; + prisma = super.prisma.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = with pkgs; '' + wrapProgram "$out/bin/prisma" \ + --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \ + --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \ + --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node" + --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \ + --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt" + ''; + }; + pulp = super.pulp.override { # tries to install purescript npmFlags = "--ignore-scripts"; diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index ce86ebe5e6b1..dcab9c832e64 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -133,6 +133,7 @@ , "hs-airdrop" , "hs-client" , "hueadm" +, "hyperpotamus" , "ijavascript" , "inliner" , "imapnotify" @@ -173,7 +174,6 @@ , "mathjax" , "meat" , "@mermaid-js/mermaid-cli" -, "mirakurun" , "mocha" , "multi-file-swagger" , "musescore-downloader" @@ -206,6 +206,7 @@ , "postcss-cli" , "prettier" , "prettier-plugin-toml" +, "prisma" , "pscid" , "pulp" , "purescript-language-server" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index d0a78354592a..f6529ab7f5be 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1202.3" = { + "@angular-devkit/architect-0.1202.5" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.3"; + version = "0.1202.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.3.tgz"; - sha512 = "AwLdofKggAiv0hThYe0v3MWOl94XJdJlgq/MXnYU/Ma/IeJDLlRa9WJuajL9AB//x5G+uH06smD3E4Ni8mv2ag=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.5.tgz"; + sha512 = "HiF8RceDrvP7m8Qm53KWVpekESX0UIK4/tOg9mgFMcS/2utRnPzuu4WbfrcY9DRrsoMWLXQs6j/UVXqf8PzXJw=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -67,13 +67,13 @@ let sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; - "@angular-devkit/core-12.2.3" = { + "@angular-devkit/core-12.2.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.2.3"; + version = "12.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.3.tgz"; - sha512 = "qt1hcX5zydGmCI9gEFcqTyJDcFEScSHPRqx0dlm61hCtBF75C2g7erSgb35zE3kZ7UE9UQY28JffFnwCj6uJhQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.5.tgz"; + sha512 = "UBo0Q9nVGPxC+C1PONSzaczPLv5++5Q7PC2orZepDbWmY0jUDwe9VVJrmp8EhLZbzVKFpyCIs1ZE8h0s0LP1zA=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -94,13 +94,13 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-12.2.3" = { + "@angular-devkit/schematics-12.2.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.2.3"; + version = "12.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.3.tgz"; - sha512 = "pbYOK8DK1V7YCzt8C3OckjQDGvCQqrLmg5kH+nLLAYOlkToRk3DBPIocuF9tCflNt6tEIkRJM4lPeDyy/z/GjQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.5.tgz"; + sha512 = "8WAdZ39FZqbU1/ZQQrK+7PeRuj6QUGlxFUgoVXk5nzRbpZo/OSaKhPoC7sC1A0EU+7udLp5vT7R12sDz7Mr9vQ=="; }; }; "@angular-devkit/schematics-cli-12.1.4" = { @@ -229,13 +229,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.9" = { + "@apollo/client-3.4.10" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.9"; + version = "3.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.9.tgz"; - sha512 = "1AlYjRJ/ktDApEUEP2DqHI38tqSyhSlsF/Q3fFb/aCbLHQfcSZ1dCv7ZlC9UXRyDwQYc0w23gYJ7wZde6W8P4A=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.10.tgz"; + sha512 = "b+8TT3jBM2BtEJi+V2FuLpvoYDZCY3baNYrgAgEyw4fjnuBCSRPY7qVjqriZAwMaGiTLtyVifGhmdeICQs4Eow=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.14.8" = { + "@babel/cli-7.15.4" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.14.8"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.8.tgz"; - sha512 = "lcy6Lymft9Rpfqmrqdd4oTDdUx9ZwaAhAfywVrHG4771Pa6PPT0danJ1kDHBXYqh4HHSmIdA+nlmfxfxSDPtBg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.15.4.tgz"; + sha512 = "9RhhQ7tgKRcSO/jI3rNLxalLSk30cHqeM8bb+nGOJTyYBDpkoXw/A9QHZ2SYjlslAt4tr90pZQGIEobwWHSIDw=="; }; }; "@babel/code-frame-7.10.4" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.15.0" = { + "@babel/core-7.15.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.15.0"; + version = "7.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz"; - sha512 = "tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz"; + sha512 = "pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg=="; }; }; "@babel/core-7.9.0" = { @@ -382,49 +382,49 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.15.0" = { + "@babel/generator-7.15.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz"; - sha512 = "eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz"; + sha512 = "d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw=="; }; }; - "@babel/helper-annotate-as-pure-7.14.5" = { + "@babel/helper-annotate-as-pure-7.15.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz"; - sha512 = "EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz"; + sha512 = "QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz"; - sha512 = "YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz"; + sha512 = "P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q=="; }; }; - "@babel/helper-compilation-targets-7.15.0" = { + "@babel/helper-compilation-targets-7.15.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz"; - sha512 = "h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz"; + sha512 = "rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.15.0" = { + "@babel/helper-create-class-features-plugin-7.15.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz"; - sha512 = "MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz"; + sha512 = "7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw=="; }; }; "@babel/helper-create-regexp-features-plugin-7.14.5" = { @@ -445,76 +445,76 @@ let sha512 = "RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew=="; }; }; - "@babel/helper-explode-assignable-expression-7.14.5" = { + "@babel/helper-explode-assignable-expression-7.15.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz"; - sha512 = "Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz"; + sha512 = "J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g=="; }; }; - "@babel/helper-function-name-7.14.5" = { + "@babel/helper-function-name-7.15.4" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; - sha512 = "Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz"; + sha512 = "Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw=="; }; }; - "@babel/helper-get-function-arity-7.14.5" = { + "@babel/helper-get-function-arity-7.15.4" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; - sha512 = "I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz"; + sha512 = "1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA=="; }; }; - "@babel/helper-hoist-variables-7.14.5" = { + "@babel/helper-hoist-variables-7.15.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; - sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz"; + sha512 = "VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA=="; }; }; - "@babel/helper-member-expression-to-functions-7.15.0" = { + "@babel/helper-member-expression-to-functions-7.15.4" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz"; - sha512 = "Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz"; + sha512 = "cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA=="; }; }; - "@babel/helper-module-imports-7.14.5" = { + "@babel/helper-module-imports-7.15.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; - sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; + sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; }; }; - "@babel/helper-module-transforms-7.15.0" = { + "@babel/helper-module-transforms-7.15.4" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz"; - sha512 = "RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz"; + sha512 = "9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw=="; }; }; - "@babel/helper-optimise-call-expression-7.14.5" = { + "@babel/helper-optimise-call-expression-7.15.4" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; - sha512 = "IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz"; + sha512 = "E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw=="; }; }; "@babel/helper-plugin-utils-7.10.4" = { @@ -535,49 +535,49 @@ let sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.14.5" = { + "@babel/helper-remap-async-to-generator-7.15.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz"; - sha512 = "rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz"; + sha512 = "v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ=="; }; }; - "@babel/helper-replace-supers-7.15.0" = { + "@babel/helper-replace-supers-7.15.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz"; - sha512 = "6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz"; + sha512 = "/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw=="; }; }; - "@babel/helper-simple-access-7.14.8" = { + "@babel/helper-simple-access-7.15.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.14.8"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"; - sha512 = "TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz"; + sha512 = "UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.14.5" = { + "@babel/helper-skip-transparent-expression-wrappers-7.15.4" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz"; - sha512 = "dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz"; + sha512 = "BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A=="; }; }; - "@babel/helper-split-export-declaration-7.14.5" = { + "@babel/helper-split-export-declaration-7.15.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; - sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz"; + sha512 = "HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw=="; }; }; "@babel/helper-validator-identifier-7.14.9" = { @@ -598,22 +598,22 @@ let sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.14.5" = { + "@babel/helper-wrap-function-7.15.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz"; - sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz"; + sha512 = "Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw=="; }; }; - "@babel/helpers-7.15.3" = { + "@babel/helpers-7.15.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.15.3"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz"; - sha512 = "HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz"; + sha512 = "V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ=="; }; }; "@babel/highlight-7.14.5" = { @@ -625,6 +625,15 @@ let sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; + "@babel/node-7.15.4" = { + name = "_at_babel_slash_node"; + packageName = "@babel/node"; + version = "7.15.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/node/-/node-7.15.4.tgz"; + sha512 = "UZue+j8p5aKTaVjvy5psYmqLHqmz+9cIboAFoa97S1xeZyUr0gT6KzXB8ZkfBIsP/u79biOdjGHVXBXnW3rVfw=="; + }; + }; "@babel/parser-7.13.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -634,22 +643,22 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.15.3" = { + "@babel/parser-7.15.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.3"; + version = "7.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz"; - sha512 = "O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz"; + sha512 = "2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz"; - sha512 = "ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz"; + sha512 = "eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -661,13 +670,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.14.9" = { + "@babel/plugin-proposal-async-generator-functions-7.15.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.14.9"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz"; - sha512 = "d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz"; + sha512 = "2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw=="; }; }; "@babel/plugin-proposal-class-properties-7.14.5" = { @@ -679,13 +688,13 @@ let sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; }; }; - "@babel/plugin-proposal-class-static-block-7.14.5" = { + "@babel/plugin-proposal-class-static-block-7.15.4" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz"; - sha512 = "KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz"; + sha512 = "M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.14.5" = { @@ -796,13 +805,13 @@ let sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.14.5" = { + "@babel/plugin-proposal-private-property-in-object-7.15.4" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz"; - sha512 = "62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz"; + sha512 = "X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { @@ -1039,13 +1048,13 @@ let sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; }; }; - "@babel/plugin-transform-classes-7.14.9" = { + "@babel/plugin-transform-classes-7.15.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.14.9"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz"; - sha512 = "NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz"; + sha512 = "Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg=="; }; }; "@babel/plugin-transform-computed-properties-7.14.5" = { @@ -1102,13 +1111,13 @@ let sha512 = "KhcolBKfXbvjwI3TV7r7TkYm8oNXHNBqGOy6JDVwtecFaRoKYsUUqJdS10q0YDKW1c6aZQgO+Ys3LfGkox8pXA=="; }; }; - "@babel/plugin-transform-for-of-7.14.5" = { + "@babel/plugin-transform-for-of-7.15.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz"; - sha512 = "CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz"; + sha512 = "DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA=="; }; }; "@babel/plugin-transform-function-name-7.14.5" = { @@ -1147,22 +1156,22 @@ let sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.15.0" = { + "@babel/plugin-transform-modules-commonjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz"; - sha512 = "3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz"; + sha512 = "qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.14.5" = { + "@babel/plugin-transform-modules-systemjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz"; - sha512 = "mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz"; + sha512 = "fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw=="; }; }; "@babel/plugin-transform-modules-umd-7.14.5" = { @@ -1210,13 +1219,13 @@ let sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; }; }; - "@babel/plugin-transform-parameters-7.14.5" = { + "@babel/plugin-transform-parameters-7.15.4" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz"; - sha512 = "Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz"; + sha512 = "9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ=="; }; }; "@babel/plugin-transform-property-literals-7.14.5" = { @@ -1354,13 +1363,13 @@ let sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-typescript-7.15.0" = { + "@babel/plugin-transform-typescript-7.15.4" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz"; - sha512 = "WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz"; + sha512 = "sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA=="; }; }; "@babel/plugin-transform-unicode-escapes-7.14.5" = { @@ -1381,13 +1390,13 @@ let sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.15.0" = { + "@babel/preset-env-7.15.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz"; - sha512 = "FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz"; + sha512 = "4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1462,13 +1471,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.15.3" = { + "@babel/runtime-7.15.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.15.3"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; - sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz"; + sha512 = "99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw=="; }; }; "@babel/runtime-7.9.0" = { @@ -1480,40 +1489,40 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.15.3" = { + "@babel/runtime-corejs3-7.15.4" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.15.3"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz"; - sha512 = "30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz"; + sha512 = "lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg=="; }; }; - "@babel/standalone-7.15.3" = { + "@babel/standalone-7.15.5" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.15.3"; + version = "7.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.3.tgz"; - sha512 = "Bst2YWEyQ2ROyO0+jxPVnnkSmUh44/x54+LSbe5M4N5LGfOkxpajEUKVE4ndXtIVrLlHCyuiqCPwv3eC1ItnCg=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.5.tgz"; + sha512 = "rho2fzDGLrdYVbl0S71I8z6AREWnVvADzv7Gb4TLKhqpE6cJAvno0ALMuF253+wqhN8futx4ELWQpBYMxi4jmA=="; }; }; - "@babel/template-7.14.5" = { + "@babel/template-7.15.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.14.5"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz"; - sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz"; + sha512 = "UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg=="; }; }; - "@babel/traverse-7.15.0" = { + "@babel/traverse-7.15.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz"; - sha512 = "392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz"; + sha512 = "W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA=="; }; }; "@babel/types-7.13.12" = { @@ -1525,40 +1534,40 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.15.0" = { + "@babel/types-7.15.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.15.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz"; - sha512 = "OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz"; + sha512 = "0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw=="; }; }; - "@blueprintjs/colors-1.0.0" = { + "@blueprintjs/colors-3.0.0" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "1.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-1.0.0.tgz"; - sha512 = "eJh111ucz8HYxLBON6ADkAGQQBACqdbX6Zws/GpuiTkeCFJ3IAjZdBpk7IM7/Y5XuGuSS1ujwjnLDOEtyywtKw=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-3.0.0.tgz"; + sha512 = "8rRkIcnnOwMEMAGDciKFdVQ3dZXvCkSGcgEzVR2ijopCvLZrrHf+ySzn8v7Y2d60A2Q2A3Of8NDrYbV32sBssg=="; }; }; - "@blueprintjs/core-3.48.0" = { + "@blueprintjs/core-3.49.1" = { name = "_at_blueprintjs_slash_core"; packageName = "@blueprintjs/core"; - version = "3.48.0"; + version = "3.49.1"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.48.0.tgz"; - sha512 = "tuAL3dZrNaTq36RRy6O86wjmkiLt8LwHkleZ1zUcn/DC3cXsM3dSsRpV3f662bcEiAXMPeGemSC3tqv6uZCeLg=="; + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.49.1.tgz"; + sha512 = "H6UAYZeBZcGDQb24vEkFps0eKlkyKvy/B/OJ2elZjHC1B1Regv7TwIDjju9wgzZvzKCcCVZzUg9OqtH43V+1yA=="; }; }; - "@blueprintjs/icons-3.28.0" = { + "@blueprintjs/icons-3.29.0" = { name = "_at_blueprintjs_slash_icons"; packageName = "@blueprintjs/icons"; - version = "3.28.0"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.28.0.tgz"; - sha512 = "gDvvU2ljV4NXsY5ofKcs1ChXAgmqNp/DIMu2uJIJmXhSXfP6JDd4qbnbGMsP3FmLTaqQP3E9oBZqAG/FRB8VmQ=="; + url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.29.0.tgz"; + sha512 = "FDpPsEBwzsFBsxDXNsea+u+bU+iFWcVTbKH05+jtGEpvDEOrpOsOwUYvkBvVaReR0DORREVye2/NL0/uvLCRrg=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1642,22 +1651,13 @@ let sha512 = "3E4/6sCLEcoPUk6FJHOpLGqBNSE2AHrIrErXKRFU3je/MZotxvWrfrZY3IsENJgjJ69Zv0dxMxTZo/l+BVNa3w=="; }; }; - "@chemzqm/neovim-5.3.5" = { + "@chemzqm/neovim-5.4.0" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.3.5.tgz"; - sha512 = "khqF4y0Z1WLPJR3LPJRgTAAZHQYTxHFXw3Nzr799aRsKXummSX85SS7ZLnVDyDjzd3x4yonYdWk89K2ZpJslnQ=="; - }; - }; - "@chinachu/aribts-1.3.5-mirakurun.3" = { - name = "_at_chinachu_slash_aribts"; - packageName = "@chinachu/aribts"; - version = "1.3.5-mirakurun.3"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@chinachu/aribts/-/aribts-1.3.5-mirakurun.3.tgz"; - sha512 = "JQPzfaYF7swQwKp2OsoRGZEjyrIo2muHQbwCKhfigqQrA3gCyGf3run+xCjNqKlI4wF9qjfgJpxfc1J56aIvog=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.4.0.tgz"; + sha512 = "BjOAR5sliE2kp3EGZsyUmrYwTMRrxvXe6WBQTxL0m5uRIvfxShRaWyKOGbqoe0+sHCfgT67QsMevUAjB1Ovskw=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -1930,166 +1930,166 @@ let sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.59" = { + "@electron-forge/async-ora-6.0.0-beta.60" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.59.tgz"; - sha512 = "vF60XyjHCyoyXHgkDi/tZy+OB9K6oSBio2at7B4pwZLO6nqstofkeAB+Gz/XUsVj9Nim+vHKtyXPzE0BTXQkZQ=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.60.tgz"; + sha512 = "MGRAfcxHkBVstgoZl/vk35IufNCu+xEYyZwaBk94w7NicIcW69z2VnP/W/v35sP3ekhqjpDCc0QGSQP5S1Zmuw=="; }; }; - "@electron-forge/core-6.0.0-beta.59" = { + "@electron-forge/core-6.0.0-beta.60" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.59.tgz"; - sha512 = "DRls31VQdVqGlna9EviHGKPchTkcbYPsRjOHSTrpksyOBQGck7for/hD1sxFREQ0r1qfKMR4xtmXbpXqzD8AyQ=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.60.tgz"; + sha512 = "JOUcO+PNdSeA623Y38zBJYvGnR6eIGNs+GA15ba9X/BKwX4zNjXDubc2tct+tiMNudTdSIAA/dwlzCJw9hTF9g=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.59" = { + "@electron-forge/installer-base-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.59.tgz"; - sha512 = "rmayhhJXj5aXed8xrkqOPTGF4J1DqZdTGo05RAVKoCmXv0iGBPUp0VvkiQinOvoBopr/5XorZTzCxgqps0UC6w=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.60.tgz"; + sha512 = "WnU7LEw98Lew1/5Kv/DzvqW19BNPPXxPTtTfpHnhOybm5g9uJ2sEjol4We5bgK0UFbCCORmwgbZYZsMCN/mx4A=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.59" = { + "@electron-forge/installer-darwin-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.59.tgz"; - sha512 = "2bssItA6CWgdL0G0/opG5usUdpCurCptdrA1bC8el6hlgv/v+hhRxalkPX9A38cWTB3w8VMhesDti+PpEYnniw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.60.tgz"; + sha512 = "qAbPhr5Dt+aALmwC47cjNKR70hj+spNKRkMYSJMxD6tpbG4JDS+UQaHeuQAWY50XGgBWdialN6Hvr+y+d+QgGg=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.59" = { + "@electron-forge/installer-deb-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.59.tgz"; - sha512 = "z2095DHbNm81gClIn+fkid/Z8FKlBnAySIodDRFKNjNDaGcWcg2Wurv3vV32Xq4kBlsHRduhxA31IqnGY1zOvA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.60.tgz"; + sha512 = "Wma/FqochMopLeQTxW2/3uRt69JkkL7xq91P5PDJzIgEXEjlU0SyR8LKvNC8VMPQ7/cBDHowpI79cMBVjif25g=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.59" = { + "@electron-forge/installer-dmg-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.59.tgz"; - sha512 = "QAYJ0H31hVMiTQDQ9ngBkAFBbSTb9Okj3mKNsym+Yw4RlQJQEc9XWWOmiTjPHCB1LR/NmaescT06sJ6Kh0wtQw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.60.tgz"; + sha512 = "N0rXYeMA4qcsDH9WadJU4RT/HmveO8ggNw3zDVmuvvV1y0nt1OGU3kHaJuslDYAUY6DNpwdHoz6wd7XLsBzDrw=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.59" = { + "@electron-forge/installer-exe-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.59.tgz"; - sha512 = "FJ0vu65K6wBz8gY5RJNfLanXJEGMs2w/WrawSLh5xGH5GzOkWwq3RRD5AdN1CFRrkXSCBbgkdF6x+F1kdwH7OQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.60.tgz"; + sha512 = "YZ8V5DGTRgKB1+97t9wOtJh1T7yo7ea9CWK899yodGxYmFh1Xtc4hwfszOhnnXCoy5LyQhjvnrHWA3lRffOInA=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.59" = { + "@electron-forge/installer-linux-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.59.tgz"; - sha512 = "dB1A8j6oubCnAOQQzmtFWQWTMMSijeiClaGMricNOlC0wC2U3BHiBwrU2jJqxvy4M401kfgR9UiMs6mQNSPdPg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.60.tgz"; + sha512 = "yi78aQvFtpyOe0WynsuJOOIXh2BSwrHPoufVgQpqicyAF8Ql/cteL5bZAbP7YNapWRBC/dI7XjxhUl5MbbEGTg=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.59" = { + "@electron-forge/installer-rpm-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.59.tgz"; - sha512 = "h/S5uMl8Vvg+Euv5xIhynjB8Q6biaBauJJoPtlALxSgSNuKnWWIuc4edwqY5F0cBIw3WO4tnmA/CE6gVWgGJMg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.60.tgz"; + sha512 = "JKP2ZefoC4mi3nCFXt6Md82QdEFn0A2WEW5q5R1xTOLbYm0SuYYX34S0Mo+6EZgBQYqot2ExA/l6C0beq1+GRQ=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.59" = { + "@electron-forge/installer-zip-6.0.0-beta.60" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.59.tgz"; - sha512 = "sTYv2NR0liFUUa9snpQs+SCWPMOUddVNK/sNBNkwU1q5jrO+ZjfTF22u5C5RawIWKgTrwxc3dFUYDYXh8753og=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.60.tgz"; + sha512 = "MMnCESVjn1nCVBGHHd1fD+4pBEgKj/aKCwAxYP9VmZdR/EcxpcFo+yjYEHtf39gFXHAKtVtJTO/FF7m7peUz+g=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.59" = { + "@electron-forge/maker-base-6.0.0-beta.60" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.59.tgz"; - sha512 = "S/Qdu2kwio5PdZgoDDxZPo6JSf2YwcuXi3sy9Tw2Qj58+ZT9nOHn0C+JBHI8sREv3IRK52Axu1/RYkwtX9+V8w=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.60.tgz"; + sha512 = "z31j1tWMQunHpy9tCvbwEIFaF8/3ip13NAerTOSdABj1ngH1Wj+wdGm05iIeRQVcCrGSn/IIj/u7RGZ5CIRE6g=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.59" = { + "@electron-forge/plugin-base-6.0.0-beta.60" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.59.tgz"; - sha512 = "S30s/hfuIjKhCI2U4DwChjTx1ulGouqyorXpkHn3hlyfIXiC35T6fJ4Baw4Ng1W4BJrnZTmkVnglEHriFyV+Lg=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.60.tgz"; + sha512 = "tNRGBmh/kFr/S/EXLvuyIRZYeu8axwt4IhJem/26rSe7byJ4ynjDYvhWBhT4S+//3w/fMmuJJX47cPKPfHxjgg=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.59" = { + "@electron-forge/publisher-base-6.0.0-beta.60" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.59.tgz"; - sha512 = "W+fKf8ehtHU6GQLZnpnyy1XS+9o2dw8PJcRBU+pQNEUcbFqBxcAJhLkfh6cGE2tQQ/rN+N77RMWEnLh9GjZMCQ=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.60.tgz"; + sha512 = "x7Zm/mukxPnvrJzP8mvhT1hohaIrAnGrDx4AKR8P2wxvz/lejU4VOJ6uRo+7w3OIi07IYJIrG52qhSyipEspqQ=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.59" = { + "@electron-forge/shared-types-6.0.0-beta.60" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.59.tgz"; - sha512 = "3tRCgfHqn5/8LijlVZsLb2xHm9W3qgzQ+KZNWXdYhb0Wj1+h6/sXn8rlxw10Mmb2mlYJEBW/NvIhpUDHgrGPXA=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.60.tgz"; + sha512 = "ZAD7Aj+FpdKSrVvxnY54G8GsZKQYIbFtYmVljOgwV9hRaSt70uCMME60yBv6gbKeX+FYk0UopiU5Txrna2EeKA=="; }; }; - "@electron-forge/template-base-6.0.0-beta.59" = { + "@electron-forge/template-base-6.0.0-beta.60" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.59.tgz"; - sha512 = "PHPSHlJ72fYlk8hrEj6+6ok0Xlxz3EeFkn2DSO4ol7fjFJI7cqbaSdNuDL55CmsWsWr/3RUqk/44pn5ywmvoOg=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.60.tgz"; + sha512 = "+/BM7QMljccaBFVq5wGUuf6vi1/UJt9gJq32TRlc4srZGjKarwmr393agedXYUkej85ns2dXK3mexF2ehIh4qQ=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.59" = { + "@electron-forge/template-typescript-6.0.0-beta.60" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.59.tgz"; - sha512 = "GD+KyNv9y1ga6RbbXwlTNVsBeg055E/92Q5+1Y/dM+f2LLx0El0whXEwBf8eJ1+AXzrBsD0JQzAFkAIFyECLkQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.60.tgz"; + sha512 = "FN0mbNg4jyRSbrr1+hpx7JV6wyWwclDjB6X9vItrTc9IXz+xCWWrvTDvEfziwm5GMqNZ7u7/yWyJZnehre2k6A=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.59" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.60" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.59.tgz"; - sha512 = "OPYA8eVbkFZFIpXCVTmDJntPTatzgaESyF2+eKwN1f6/j00kvHCbREL9zbXbji3gryt0a59bT+GKigWXldln5g=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.60.tgz"; + sha512 = "UKGeLuq9Ds9/DBsu3c/99q8/6aBpFNENPjZI6kZ5CWq1wXXg+6QZaZLD+D6JAEYs3QJgAVT2bYMyvjysLglNoQ=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.59" = { + "@electron-forge/template-webpack-6.0.0-beta.60" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.59.tgz"; - sha512 = "ScPVUQ//zqqnpr53/WY8pVygs6KVTpXsPlAoo0ZeYfOjuTRh2uSMPN0+2UnUUD5FGjLm3hkpIibUH4ZMtLu8aw=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.60.tgz"; + sha512 = "RyYLOzuQXKQ2mFV2d2DiUObWVe99rHXZ+d+PmOcysJWnNHjuEuLc8OOQQskRjFBy1pUkVCuv530Q1d1ufwY8lg=="; }; }; "@electron/get-1.13.0" = { @@ -2416,15 +2416,6 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; - "@fluentui/date-time-utilities-8.2.2" = { - name = "_at_fluentui_slash_date-time-utilities"; - packageName = "@fluentui/date-time-utilities"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz"; - sha512 = "djHrX/38ty+F93qLQjzmRzPzK598CW9g/RPhQH6GyrFBLPSWM1swYKB5TP6E7FrIf+fT4pVqrNUSYZhgi2rrOQ=="; - }; - }; "@fluentui/dom-utilities-1.1.2" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; @@ -2434,33 +2425,6 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; - "@fluentui/dom-utilities-2.1.4" = { - name = "_at_fluentui_slash_dom-utilities"; - packageName = "@fluentui/dom-utilities"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz"; - sha512 = "+gsAnEjgoKB37o+tsMdSLtgqZ9z2PzpvnHx/2IqhRWjQQd7Xc7MbQsbZaQ5qfkioFHLnWGc/+WORpqKPy/sWrg=="; - }; - }; - "@fluentui/font-icons-mdl2-8.1.10" = { - name = "_at_fluentui_slash_font-icons-mdl2"; - packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.10.tgz"; - sha512 = "oxAErjUx8xqlk81lxClEqdpF05Fy+5tKndYKm27k7cRD0f6CKLjT5Hu5oWDLwcYqa1eScXZV1I5IVHKjChsBSA=="; - }; - }; - "@fluentui/foundation-legacy-8.1.10" = { - name = "_at_fluentui_slash_foundation-legacy"; - packageName = "@fluentui/foundation-legacy"; - version = "8.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.10.tgz"; - sha512 = "IhDS3OajyHHi+QmZlOhlXbVGFQ5TJNt2HFV6sy005jxw0xiBghG1niqjKjB09n3MfcmMdWNEkOFDpQuuyRWDjg=="; - }; - }; "@fluentui/keyboard-key-0.2.17" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; @@ -2470,67 +2434,22 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/keyboard-key-0.3.4" = { - name = "_at_fluentui_slash_keyboard-key"; - packageName = "@fluentui/keyboard-key"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz"; - sha512 = "pVY2m3IC5+LLmMzsaPApX9eKTzpOzdgQwrR3FNTE6mGx3N/+QWYM7fdF+T1ldZQt87dCRSeQnmAo5kqjtxeA/w=="; - }; - }; - "@fluentui/merge-styles-8.1.5" = { - name = "_at_fluentui_slash_merge-styles"; - packageName = "@fluentui/merge-styles"; - version = "8.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.5.tgz"; - sha512 = "hmEb5LnOxCTpM/6oJQJI0w5AlYzwrceozPgsMdOF5BuT5MkXPlXLK3L2auzXGNYHkoGiouH61ImsS/TSM0mV/g=="; - }; - }; - "@fluentui/react-7.174.1" = { + "@fluentui/react-7.175.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.174.1"; + version = "7.175.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.174.1.tgz"; - sha512 = "c6OF4iMImss6a+8NODme85Ekrvq6AV1jzW6BUGJ3Gc11pMuvxJsQwg5NCHzy8cXWsK7DbPP11JAM1cFNU2kG8w=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.175.2.tgz"; + sha512 = "jikYyizEWUEkXISiYKA5/bmV0Am1480rmct2nTMQZgWxnZGh00NG8jTPpr+rQKRENTyBvvpE8wZVp4/f5XKzAg=="; }; }; - "@fluentui/react-8.27.0" = { - name = "_at_fluentui_slash_react"; - packageName = "@fluentui/react"; - version = "8.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.27.0.tgz"; - sha512 = "5LSh5XVU3qy6nY949jxS3BwF7UZA6jGjcH9JOTosgtxuHZUIXkzfZlT7fyt5xp+27B1B5ro9K9u2pDjItDHVHg=="; - }; - }; - "@fluentui/react-focus-7.17.6" = { - name = "_at_fluentui_slash_react-focus"; - packageName = "@fluentui/react-focus"; - version = "7.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.6.tgz"; - sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; - }; - }; - "@fluentui/react-focus-8.2.1" = { + "@fluentui/react-focus-7.18.0" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.2.1.tgz"; - sha512 = "kPGlyc8sj/1OjY/juaOG/CATc0GPsAkbFj8JNbPGPkcxdSkr1hVN4AQq34E8ddVe5d/t+Nevftl9kkYAAxfnoA=="; - }; - }; - "@fluentui/react-hooks-8.3.1" = { - name = "_at_fluentui_slash_react-hooks"; - packageName = "@fluentui/react-hooks"; - version = "8.3.1"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.3.1.tgz"; - sha512 = "fgkL4/4m8ds7dK6+o6qfk9Ok1ssbTV3dA7k1w5xZgw/FE4AWTt6zfLx9HhGpxF71l0X+R0DCWWb6W/LqE7+Ylg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.18.0.tgz"; + sha512 = "+ykERyl/Cah9ixBqYtA4DWG5UDg61oNd0T78xKZ/ZeKzAUk2LanEQd2QQ/VX6/UFqWrHsK3IiEUFmZCQhp4wfQ=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2542,33 +2461,6 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; - "@fluentui/react-window-provider-2.1.4" = { - name = "_at_fluentui_slash_react-window-provider"; - packageName = "@fluentui/react-window-provider"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz"; - sha512 = "RztmJ7ol2eMDr3NCs2OcAA1cQjZdPPUEa4aurgh4Aq+JM/BiY0aK6S4SeFtVD7F8Q7PBOz/xwOG4HlnSMQtlsg=="; - }; - }; - "@fluentui/set-version-8.1.4" = { - name = "_at_fluentui_slash_set-version"; - packageName = "@fluentui/set-version"; - version = "8.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.4.tgz"; - sha512 = "2otMyJ+s+W+hjBD4BKjwYKKinJUDeIKYKz93qKrrJS0i3fKfftNroy9dHFlIblZ7n747L334plLi3bzQO1bnvA=="; - }; - }; - "@fluentui/style-utilities-8.3.1" = { - name = "_at_fluentui_slash_style-utilities"; - packageName = "@fluentui/style-utilities"; - version = "8.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.3.1.tgz"; - sha512 = "EEaol+tIgTwEI8iHQfJHA7w2xtl7B+ofkheyMIK/97ONVqD4onf42p5r34rmuBhgIo4pXQsEQDPb5b5ClSzDFw=="; - }; - }; "@fluentui/theme-1.7.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; @@ -2578,24 +2470,6 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.3.1" = { - name = "_at_fluentui_slash_theme"; - packageName = "@fluentui/theme"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.3.1.tgz"; - sha512 = "S+AM8+Jg5/KMQYcxcN6LcZPA51pXVVapnkk1eMGKQYDdJ4KS4r50L2OkIPVfbFn3uiW8VZOesHMsvBTnvZfdng=="; - }; - }; - "@fluentui/utilities-8.3.1" = { - name = "_at_fluentui_slash_utilities"; - packageName = "@fluentui/utilities"; - version = "8.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.3.1.tgz"; - sha512 = "V/6bokboB7J1di6XWnS2AuT1A2x0N8BvfCbdaTqvrmCarmViaY/3cawO8shV91d+ahiR2ZzN0CqOMkIDvjr4tA=="; - }; - }; "@gar/promisify-1.1.2" = { name = "_at_gar_slash_promisify"; packageName = "@gar/promisify"; @@ -2605,40 +2479,40 @@ let sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; }; }; - "@google-cloud/paginator-3.0.5" = { + "@google-cloud/paginator-3.0.6" = { name = "_at_google-cloud_slash_paginator"; packageName = "@google-cloud/paginator"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.5.tgz"; - sha512 = "N4Uk4BT1YuskfRhKXBs0n9Lg2YTROZc6IMpkO/8DIHODtm5s3xY8K5vVBo23v/2XulY3azwITQlYWgT4GdLsUw=="; + url = "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.6.tgz"; + sha512 = "XCTm/GfQIlc1ZxpNtTSs/mnZxC2cePNhxU3X8EzHXKIJ2JFncmJj2Fcd2IP+gbmZaSZnY0juFxbUCkIeuu/2eQ=="; }; }; - "@google-cloud/precise-date-2.0.3" = { + "@google-cloud/precise-date-2.0.4" = { name = "_at_google-cloud_slash_precise-date"; packageName = "@google-cloud/precise-date"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-2.0.3.tgz"; - sha512 = "+SDJ3ZvGkF7hzo6BGa8ZqeK3F6Z4+S+KviC9oOK+XCs3tfMyJCh/4j93XIWINgMMDIh9BgEvlw4306VxlXIlYA=="; + url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-2.0.4.tgz"; + sha512 = "nOB+mZdevI/1Si0QAfxWfzzIqFdc7wrO+DYePFvgbOoMtvX+XfFTINNt7e9Zg66AbDbWCPRnikU+6f5LTm9Wyg=="; }; }; - "@google-cloud/projectify-2.1.0" = { + "@google-cloud/projectify-2.1.1" = { name = "_at_google-cloud_slash_projectify"; packageName = "@google-cloud/projectify"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.0.tgz"; - sha512 = "qbpidP/fOvQNz3nyabaVnZqcED1NNzf7qfeOlgtAZd9knTwY+KtsGRkYpiQzcATABy4gnGP2lousM3S0nuWVzA=="; + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz"; + sha512 = "+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="; }; }; - "@google-cloud/promisify-2.0.3" = { + "@google-cloud/promisify-2.0.4" = { name = "_at_google-cloud_slash_promisify"; packageName = "@google-cloud/promisify"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.3.tgz"; - sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; + url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz"; + sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; "@google-cloud/pubsub-2.17.0" = { @@ -2695,13 +2569,13 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.3.1" = { + "@graphql-tools/import-6.4.0" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.3.1.tgz"; - sha512 = "1szR19JI6WPibjYurMLdadHKZoG9C//8I/FZ0Dt4vJSbrMdVNp8WFxg4QnZrDeMG4MzZc90etsyF5ofKjcC+jw=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.4.0.tgz"; + sha512 = "jfE01oPcmc4vzAcYLs6xT7XC4jJWrM1HNtIwc7HyyHTxrC3nf36XrF3txEZ2l20GT53+OWnMgYx1HhauLGdJmA=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -2740,22 +2614,22 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.0.3" = { + "@graphql-tools/merge-8.1.2" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.0.3"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.3.tgz"; - sha512 = "lVMyW9cREs+nQYbUvMaaqSl+pRCezl2RafNMFi/04akjvOtjVefdi7n3pArpSqPhLHPJDyQRlI8CK8cmOZ9jTA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.1.2.tgz"; + sha512 = "kFLd4kKNJXYXnKIhM8q9zgGAtbLmsy3WmGdDxYq3YHBJUogucAxnivQYyRIseUq37KGmSAIWu3pBQ23TKGsGOw=="; }; }; - "@graphql-tools/mock-8.2.2" = { + "@graphql-tools/mock-8.3.1" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.2.2"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.2.2.tgz"; - sha512 = "3cUJi14UHW1/8mebbXlAqfZl78IxeKzF2QlcJV5PSRQe27Dp/UnkHyid1UH/iwBdA98J7l0uw8NU1MRRVjhjIA=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.3.1.tgz"; + sha512 = "iJ3GeQ10Vqa0Tg4QJHiulxUUI4r84RAvltM3Sc+XPj07QlrLzMHOHO/goO7FC4TN2/HVncj7pWHwrmLPT9du/Q=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2767,13 +2641,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.1.2" = { + "@graphql-tools/schema-8.2.0" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.1.2"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.2.tgz"; - sha512 = "rX2pg42a0w7JLVYT+f/yeEKpnoZL5PpLq68TxC3iZ8slnNBNjfVfvzzOn8Q8Q6Xw3t17KP9QespmJEDfuQe4Rg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.2.0.tgz"; + sha512 = "ufmI5mJQa8NJczzfkh0pUttKvspqDcT5LLakA3jUmOrrE4d4NVj6onZlazdTzF5sAepSNqanFnwhrxZpCAJMKg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -2812,13 +2686,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.1.2" = { + "@graphql-tools/utils-8.2.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.1.2"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.2.tgz"; - sha512 = "3G+NIBR5mHjPm78jAD0l07JRE0XH+lr9m7yL/wl69jAzK0Jr/H+/Ok4ljEolI70iglz+ZhIShVPAwyesF6rnFg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.2.2.tgz"; + sha512 = "29FFY5U4lpXuBiW9dRvuWnBVwGhWbGLa2leZcAMU/Pz47Cr/QLZGVgpLBV9rt+Gbs7wyIJM7t7EuksPs0RDm3g=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -3271,22 +3145,22 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.33" = { + "@joplin/fork-htmlparser2-4.1.34" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.33"; + version = "4.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.33.tgz"; - sha512 = "Q5GR6mVKS/1JgNTHtS0hc08YexfVZIq9RAj9j33Zm9SXEDstXn0WP4UpULCWLYOen3ffJ2z4uv9a2vLKcvbbIg=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.34.tgz"; + sha512 = "1/tQZEDnI36RaEJte0eumw1/c8OhmJOpgFyW+Nxsk2u/vvcgnEvjFjauiH2ZxtO5FTJB3BMQ4M23+Y5dw2cnnw=="; }; }; - "@joplin/fork-sax-1.2.37" = { + "@joplin/fork-sax-1.2.38" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.37"; + version = "1.2.38"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.37.tgz"; - sha512 = "3S71WcFLsZQ4tlZ7LNZRBoEE0LJJL8gxhqwAKZXKYTF5syShZDNWwSpntB4AoFWry3L0I+HnjXm2psQfQzo15Q=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.38.tgz"; + sha512 = "XRwYieoXtTdjwOT4J1FpWVnOZe1f2KSNK2KXe7s4UiLxhVKQWPQrqgP8xoNyHH5/Y78fqwajU4pYvRgctNqdfw=="; }; }; "@joplin/lib-2.3.1" = { @@ -3307,22 +3181,22 @@ let sha512 = "wOxuScEao2f3kIs+A0qroWe6CiWs1LeZqwBz/w869Qi8MW8wvy2aeyirpnb7yEYh9aCevfiQcUMUvYZ9ekMskg=="; }; }; - "@joplin/turndown-4.0.55" = { + "@joplin/turndown-4.0.56" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.55"; + version = "4.0.56"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.55.tgz"; - sha512 = "9IgtCAQXzCtkXNE+/4q6dWnbt90kvZIefTLFXLxE+w/gLbBDxSmTCfhCCFPzUA1ORp3LkAJZIiE710fRM0O3gg=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.56.tgz"; + sha512 = "5odtgBk4u1c+IehuvS7/C3yxCY96UMiUdVdoSpyk5m11nLupEr5LA1oQ1JAJTehUk5cuJR+rofD67m+XgZt+tQ=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.37" = { + "@joplin/turndown-plugin-gfm-1.0.38" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.37"; + version = "1.0.38"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.37.tgz"; - sha512 = "LRiIezmtnJSdczIT3mPuCvUIdFT01lDYTBDdSNGwBheNt7R9tYIj0nh87OnpBGztktIIsOH/66nbB8KQjVtisQ=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.38.tgz"; + sha512 = "STRS9Y1YkxmKO2pEEkbUAp8KxLW+41rm3Dom0uGMw4kAYLDcxbOscu6XScLRvRtleftU6YS7aZd+4/9SBx75Zw=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -4135,13 +4009,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.203" = { + "@microsoft/load-themed-styles-1.10.208" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.203"; + version = "1.10.208"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.203.tgz"; - sha512 = "9UV+1kIAEdV1a8JI58iOpDc7mmFdgTW5qI4pAyL4Drk468ZCPmg/tHPbgAM/Pg8EtkWyIJm5E6KVofo+meavQQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.208.tgz"; + sha512 = "lOJQ/FOFiZJ+LIOUnVKu2StmB3DKIg50XTlm6DwBXpgUowAFhJ188mck8j4POpZtzQf/DfmOlQLqPEZXzM/6/A=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4189,22 +4063,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@msgpack/msgpack-2.7.0" = { + "@msgpack/msgpack-2.7.1" = { name = "_at_msgpack_slash_msgpack"; packageName = "@msgpack/msgpack"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.0.tgz"; - sha512 = "mlRYq9FSsOd4m+3wZWatemn3hGFZPWNJ4JQOdrir4rrMK2PyIk26idKBoUWrqF3HJJHl+5GpRU+M0wEruJwecg=="; - }; - }; - "@napi-rs/triples-1.0.3" = { - name = "_at_napi-rs_slash_triples"; - packageName = "@napi-rs/triples"; - version = "1.0.3"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@napi-rs/triples/-/triples-1.0.3.tgz"; - sha512 = "jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA=="; + url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.1.tgz"; + sha512 = "ApwiSL2c9ObewdOE/sqt788P1C5lomBOHyO8nUBCr4ofErBCnYQ003NtJ8lS9OQZc11ximkbmgAZJjB8y6cCdA=="; }; }; "@nestjs/schematics-8.0.3" = { @@ -4225,13 +4090,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.6.0" = { + "@netlify/build-18.8.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.6.0"; + version = "18.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.6.0.tgz"; - sha512 = "rUkJp68Q7Of6nWflbVRKhD/ZqAu3LGcxSYPX28Y94Q6LVnvz27dwF0gufkdDJX6cQk8P5OvIZJVYzfPQITfYow=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.8.0.tgz"; + sha512 = "6xU3mGfkSPJlhK5r0y9fMgBRmQFzs6UxPB4MLQ6hmufL/Tj4vFx56hCXX5+fADpThe0uMw+ubNbMr0L44b5gzQ=="; }; }; "@netlify/cache-utils-2.0.3" = { @@ -4243,13 +4108,13 @@ let sha512 = "820dYhacTHXKxpYm81VlmCJ48ySGj+6GZi1oPLevdTSkMXGM1BphBKUjM/r9+GUE1ocGOh8Vdt3PsDp8f7gS4w=="; }; }; - "@netlify/config-15.5.0" = { + "@netlify/config-15.6.2" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.5.0"; + version = "15.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.5.0.tgz"; - sha512 = "c+ICajSGQ7gD6O1V0wsl9SFxSC+owzg5JQyW9SBKV68nDxQBMwn31QHOHijopWeDPMQnp+gIHc2/wgwwtQ2YMQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.6.2.tgz"; + sha512 = "wFZ2sLg/NaU0kQC8EnxdMUrr3rMWC8CQnBedQsxRW2dmQKQgW4tsCqUVy2U++iu2FTZkh8CwYo8W0qCPoel4lA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4423,13 +4288,13 @@ let sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; - "@netlify/plugins-list-3.5.0" = { + "@netlify/plugins-list-3.6.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.5.0.tgz"; - sha512 = "qBJC80fWY1T/UrvOsr/54ftfBoL2uybjzWuTZY8uYG2DnlJ4OaWjM3O9Srf7LXxHL3pdwV7kfdr9fQ6gbmARKg=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.6.0.tgz"; + sha512 = "yRgsmBw8Wzk6/I/afcerhC+3XtVxXUF0xrSMOYgxV0bmaKJmB/0StJG4FY9TOAmb/IzCp82mR/63ZpzwIvpVzw=="; }; }; "@netlify/routing-local-proxy-0.31.0" = { @@ -4459,184 +4324,58 @@ let sha512 = "+wo8rupUJbrfw/lEBPccVP+GhFEJEbzx7M67eSEWxqwQkUKtZIHbBc6Ile+iVXqFnLyM2ryfxLTcSIm1pc797g=="; }; }; - "@node-red/editor-api-2.0.5" = { + "@node-red/editor-api-2.0.6" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.5.tgz"; - sha512 = "efiWLuNk/lwpIULt4Bu8WycW9+v6xVx0VHAK+j1y8Kl5S6u6sbfkTlmDDpaN2NqPHGdMT+roF9EHKHISTmVN9g=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.6.tgz"; + sha512 = "jSC00TetcU1sQHR5SNo+R8IxEKbJWmBAeCcHd0EWDMb4ikcN1wwteQfYPOr2ID8HnsSEIBlpN8K3Hrezo3+KcQ=="; }; }; - "@node-red/editor-client-2.0.5" = { + "@node-red/editor-client-2.0.6" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.5.tgz"; - sha512 = "C/Vu7NZX3VGTU/LEXxDUTxEEDu/NFIbAOCAJAcvJKdNPEL4InwTF75PRRiWsfeDu8DhBnvFqFe9XTS4fr+nrPA=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.6.tgz"; + sha512 = "uhQJcKGX7Ypa1eaebrWM6rneEkn4FniEo3zZqTzwD+VZf4rAwNeE0ZV7Z85DL4xmmPKfUmuA4Fte7TYcjqk80g=="; }; }; - "@node-red/nodes-2.0.5" = { + "@node-red/nodes-2.0.6" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.5.tgz"; - sha512 = "o9hdie+2YtjoMFFe+vAcIkkHPJIO5pkPrRUNQcx7EHzXPEMP0uxhhr/DpC/J6AQ0tOlfS6shWKge0E4bBKfJDQ=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.6.tgz"; + sha512 = "KBUEUdJ89zRb1v1x+ZGrAv3MWfDJx+b+ClH83h1Ibqn2haJ+jfTBE1kZUEJaNP0Dm0CC/n4Ll9lrWnEoSSI8aQ=="; }; }; - "@node-red/registry-2.0.5" = { + "@node-red/registry-2.0.6" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.5.tgz"; - sha512 = "UVM1UFuyNGtyLIL3Fjme67uvlxiiQlYVrabFwzUa0u2zHWf0YpzIQgcwtFY9kIuj3h0rVIN+EzuPZIbQZVISNw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.6.tgz"; + sha512 = "EhxxmUnCpYXztMlalVYkzaIi5eRGMM1rJvdFgQBIx5WWUkZ1h40a4KgnbbJ/VUthKaQLqbq62P0SX5ZU8RCtww=="; }; }; - "@node-red/runtime-2.0.5" = { + "@node-red/runtime-2.0.6" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.5.tgz"; - sha512 = "eK55TQ+iTX0xZy8k4eW3JJCHywgnxpszuKg1aXurKD1sBURGa9qNztB/IW+0T0upnRYgQSTTI8j//msG6s76LQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.6.tgz"; + sha512 = "AdEYjEKl4wVFjV2Xhx2BBJCDVZVMer/9PmSaUQJVFjYKkn7ouazGjtHPxowcSeAYF0WpRfb66ceRe7ZHaRbqXw=="; }; }; - "@node-red/util-2.0.5" = { + "@node-red/util-2.0.6" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.5.tgz"; - sha512 = "+RF8i+LxgyXcAIKjKyht3rRZFBEhrvgXKN2/HlkMWerADwiDTNfBL8JjQZoMKlFKl1cgapp8vp4P1Xf3glH+fQ=="; - }; - }; - "@node-rs/crc32-1.2.1" = { - name = "_at_node-rs_slash_crc32"; - packageName = "@node-rs/crc32"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.2.1.tgz"; - sha512 = "Hw9QJPisg1ZR9Rj6w3sQLcEZkPanu1RLb4yk0Wq0cT4RNYssw35RtOkN/x/tW9iIMLq2YjHUyb6tun82dLVTPQ=="; - }; - }; - "@node-rs/crc32-android-arm64-1.2.1" = { - name = "_at_node-rs_slash_crc32-android-arm64"; - packageName = "@node-rs/crc32-android-arm64"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.2.1.tgz"; - sha512 = "SWz9X44WQzZqzURYz4DY3DccB97T+aKJl+i6rvREwf1Y5suWiPdxU4xqg9zZ66aG6XeE3ts+WeqKH26bVbZTQA=="; - }; - }; - "@node-rs/crc32-darwin-arm64-1.2.1" = { - name = "_at_node-rs_slash_crc32-darwin-arm64"; - packageName = "@node-rs/crc32-darwin-arm64"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.2.1.tgz"; - sha512 = "JKKYEc5YKrZZ0CQ0nXSLCraU+6b9SldGU3/Wf3s4WCzYGkkB4XtMwjx3t7bGZAGmZ2ZcRy9M2EGJ8tUfV8cOOg=="; - }; - }; - "@node-rs/crc32-darwin-x64-1.2.1" = { - name = "_at_node-rs_slash_crc32-darwin-x64"; - packageName = "@node-rs/crc32-darwin-x64"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.2.1.tgz"; - sha512 = "BaWeOdzJ73MyrChWQqQkJEKM9jRUjb19tE7PbFhG8cZPVxBFyxgTFNuBrR0xHOByCHI4QXSBvNCLEfawHbsscQ=="; - }; - }; - "@node-rs/crc32-freebsd-x64-1.2.1" = { - name = "_at_node-rs_slash_crc32-freebsd-x64"; - packageName = "@node-rs/crc32-freebsd-x64"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.2.1.tgz"; - sha512 = "ZzAJS9EwUwvclfhvDT6vn0CYpU4CAvDYpPjXb+e0bsFbvqoh8mQcXvzK1myU3fSjjKUU47Pp5wLe68vW+2Q0Pw=="; - }; - }; - "@node-rs/crc32-linux-arm-gnueabihf-1.2.1" = { - name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; - packageName = "@node-rs/crc32-linux-arm-gnueabihf"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.2.1.tgz"; - sha512 = "6nRDyFgGsLc9bqaiK21KANqAdeh+9ZOHf3MY9HWvZoGQnxj2/LwvSHyaeG9ut+TvkL+Ic2hMtjLDNYYBaUcImw=="; - }; - }; - "@node-rs/crc32-linux-arm64-gnu-1.2.1" = { - name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; - packageName = "@node-rs/crc32-linux-arm64-gnu"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.2.1.tgz"; - sha512 = "ZNluh2Wse68JgLGRl75fkLmVkAPSb1LE/2OdPXKZ85ExGYB5/3el2nE1CnysbqxqzL/Cc6kJ7UnsI/cxSe/D4Q=="; - }; - }; - "@node-rs/crc32-linux-arm64-musl-1.2.1" = { - name = "_at_node-rs_slash_crc32-linux-arm64-musl"; - packageName = "@node-rs/crc32-linux-arm64-musl"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.2.1.tgz"; - sha512 = "e490eNo9GB57koS4gabDeZ+f7wB3/SNtPbdXPk7bBNSFAB0gPdrqxiVUzLkY6AALVPR/juQGRb+geJOp1Oja/g=="; - }; - }; - "@node-rs/crc32-linux-x64-gnu-1.2.1" = { - name = "_at_node-rs_slash_crc32-linux-x64-gnu"; - packageName = "@node-rs/crc32-linux-x64-gnu"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.2.1.tgz"; - sha512 = "laJ7cAzYfNk+h3OOSwYsDdxfp1bXnpWqXVObXvylwHZQwIqUqTC5GCOa6kMMz2ElzJ9gDBgVvLplI8QX7BQnwA=="; - }; - }; - "@node-rs/crc32-linux-x64-musl-1.2.1" = { - name = "_at_node-rs_slash_crc32-linux-x64-musl"; - packageName = "@node-rs/crc32-linux-x64-musl"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.2.1.tgz"; - sha512 = "d6DyJMgIg4E2E+GHeIYMImqDd+iaGQjwGrzLDqO1TaC08yE63chlvCMNNoQ5k2c8mzdWH2VX72IapWT5nArR0A=="; - }; - }; - "@node-rs/crc32-win32-arm64-msvc-1.2.1" = { - name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; - packageName = "@node-rs/crc32-win32-arm64-msvc"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.2.1.tgz"; - sha512 = "qwDzpv/9oZcK6SrFomALjYDMkEhtjfxNmjhCYKDgeXvAkTAdwzpVdj+8PDyyBN63afpVndDnBqGhSEwHJPB6aQ=="; - }; - }; - "@node-rs/crc32-win32-ia32-msvc-1.2.1" = { - name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; - packageName = "@node-rs/crc32-win32-ia32-msvc"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.2.1.tgz"; - sha512 = "g/3UVw8LBmsTn+DUD39WDhfcL+S0pILBz/3+HM9QxbY2ptPxI8QtEK0sTIBAKTcRjq6dS8MmtcDWBFsDTs+/mQ=="; - }; - }; - "@node-rs/crc32-win32-x64-msvc-1.2.1" = { - name = "_at_node-rs_slash_crc32-win32-x64-msvc"; - packageName = "@node-rs/crc32-win32-x64-msvc"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.2.1.tgz"; - sha512 = "BGTEFRdIk6Vq9BSC3VuBVYKadZXOhhtPT8LUfz4s9cK3k8ba6nFzKIbOm5UsPIUSz2lRqlWdHQQWVaCoGAAvbQ=="; - }; - }; - "@node-rs/helper-1.2.1" = { - name = "_at_node-rs_slash_helper"; - packageName = "@node-rs/helper"; - version = "1.2.1"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-rs/helper/-/helper-1.2.1.tgz"; - sha512 = "R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.6.tgz"; + sha512 = "ZyUIAyZwtxdBOFiFRIBQZieP+ahviAGfXZowA9KOWTFp3BRZIq3OLWldlS/tQk29PaqZmt8MK94/DSqEsZNN0A=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -4675,13 +4414,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.8.2" = { + "@npmcli/arborist-2.8.3" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.2.tgz"; - sha512 = "6E1XJ0YXBaI9J+25gcTF110MGNx3jv6npr4Rz1U0UAqkuVV7bbDznVJvNqi6F0p8vgrE+Smf9jDTn1DR+7uBjQ=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.8.3.tgz"; + sha512 = "miFcxbZjmQqeFTeRSLLh+lc/gxIKDO5L4PVCp+dp+kmcwJmYsEJmF7YvHR2yi3jF+fxgvLf3CCFzboPIXAuabg=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4819,13 +4558,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/core-0.5.32" = { + "@oclif/core-0.5.35" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "0.5.32"; + version = "0.5.35"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.32.tgz"; - sha512 = "ZRGh/9IccLT/iyJ9FiTK2KdqPmxewkCkdFXkNhTVgtzQXI3ZFhDba3pFjxfI+nbhbrVRLfGzTnHXV6c4rka6pw=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.35.tgz"; + sha512 = "5nTd+lOcDh1QPa9mM74qFChmApp5oHnP3EqYGYwqhfA3ad4qIfyYEn8pKxf0MlrYoPA8j2PrmceuRZThstKssA=="; }; }; "@oclif/errors-1.3.5" = { @@ -4936,22 +4675,22 @@ let sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; }; }; - "@octokit/graphql-4.6.4" = { + "@octokit/graphql-4.8.0" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "4.6.4"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.4.tgz"; - sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz"; + sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/openapi-types-9.7.0" = { + "@octokit/openapi-types-10.1.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.7.0"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.7.0.tgz"; - sha512 = "TUJ16DJU8mekne6+KVcMV5g6g/rJlrnIKn7aALG9QrNpnEipFc1xjoarh0PKaAWf2Hf+HwthRKYt+9mCm5RsRg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.1.1.tgz"; + sha512 = "ygp/6r25Ezb1CJuVMnFfOsScEtPF0zosdTJDZ7mZ+I8IULl7DP1BS5ZvPRwglcarGPXOvS5sHdR0bjnVDDfQdQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4963,13 +4702,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.15.1" = { + "@octokit/plugin-paginate-rest-2.16.0" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.15.1"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz"; - sha512 = "47r52KkhQDkmvUKZqXzA1lKvcyJEfYh3TKAIe5+EzMeyDM3d+/s5v11i2gTk8/n6No6DPi3k5Ind6wtDbo/AEg=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.0.tgz"; + sha512 = "8YYzALPMvEZ35kgy5pdYvQ22Roz+BIuEaedO575GwE2vb/ACDqQn0xQrTJR4tnZCJn7pi8+AWPVjrFDaERIyXQ=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4981,13 +4720,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.8.0" = { + "@octokit/plugin-rest-endpoint-methods-5.10.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz"; - sha512 = "qeLZZLotNkoq+it6F+xahydkkbnvSK0iDjlXFo3jNTB+Ss0qIbYQb9V/soKLMkgGw8Q2sHjY5YEXiA47IVPp4A=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.10.1.tgz"; + sha512 = "Rf1iMl40I0dIxjh1g32qZ6Ym/uT8QWZMm2vYGG5Vi8SX1MwZvbuxEGXYgmzTUWSD3PYWSLilE2+4L8kmdLGTMg=="; }; }; "@octokit/request-5.6.1" = { @@ -5008,22 +4747,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.9.1" = { + "@octokit/rest-18.10.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.9.1"; + version = "18.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.1.tgz"; - sha512 = "idZ3e5PqXVWOhtZYUa546IDHTHjkGZbj3tcJsN0uhCy984KD865e8GB2WbYDc2ZxFuJRiyd0AftpL2uPNhF+UA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.10.0.tgz"; + sha512 = "esHR5OKy38bccL/sajHqZudZCvmv4yjovMJzyXlphaUo7xykmtOdILGJ3aAm0mFHmMLmPFmDMJXf39cAjNJsrw=="; }; }; - "@octokit/types-6.25.0" = { + "@octokit/types-6.27.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.25.0"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.25.0.tgz"; - sha512 = "bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.27.0.tgz"; + sha512 = "ha27f8DToxXBPEJdzHCCuqpw7AgKfjhWGdNf3yIlBAhAsaexBXTfWw36zNSsncALXGvJq4EjLy1p3Wz45Aqb4A=="; }; }; "@opencensus/core-0.0.8" = { @@ -5053,13 +4792,13 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-1.0.2" = { + "@opentelemetry/api-1.0.3" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.2.tgz"; - sha512 = "DCF9oC89ao8/EJUqrp/beBlDR8Bp2R43jqtzayqCoomIvkwTuPfLcHdVhIGRR69GFlkykFjcDW+V92t0AS7Tww=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.3.tgz"; + sha512 = "puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ=="; }; }; "@opentelemetry/semantic-conventions-0.24.0" = { @@ -5467,6 +5206,15 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; + "@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" = { + name = "_at_prisma_slash_engines"; + packageName = "@prisma/engines"; + version = "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz"; + sha512 = "Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg=="; + }; + }; "@protobufjs/aspromise-1.1.2" = { name = "_at_protobufjs_slash_aspromise"; packageName = "@protobufjs/aspromise"; @@ -5611,13 +5359,13 @@ let sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.55" = { + "@redocly/openapi-core-1.0.0-beta.58" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.55"; + version = "1.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.55.tgz"; - sha512 = "n/uukofKgqLdF1RyaqIOz+QneonKudV77M8j8SnGxP+bg7ujn+lmjcLy96ECtLvom0+BTbbzSMQpJeEix6MGuQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.58.tgz"; + sha512 = "aHohzi5PCBJd47cXXLD1sigVWEs4Xs9E5MOMq2RZ3FNmufiRxY+u1b4oPYGfcr4n3mBnG2qH1mFiTue6Levq7w=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5710,13 +5458,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.2.3" = { + "@schematics/angular-12.2.5" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.3"; + version = "12.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.3.tgz"; - sha512 = "MyInM0/Dg1geP5eYx370IX6l70ZTtGq7QIt9CFBViHlX4BWNmXq5bbJIPYJ/FWwT+zhSK7zp5AcyDKg6PWqh/Q=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.5.tgz"; + sha512 = "Ln2GyO7Y00PrQKjqCONCDb4dwGzGboH3zIJvicWzFO+ZgkNLr/dsitGKm8b8OfR/UEiBcnK72xwPj9FWfXA4EQ=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5746,13 +5494,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.16.0" = { + "@serverless/components-3.17.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.16.0"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.16.0.tgz"; - sha512 = "vgsfR0V4dierB97GKgtfFp/s5XN3zmEQlhRfshWLHjoXvJe2HvWOZXy5Bqyzb1WMr6S0dp/wXQzcnVStbiyBaw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.0.tgz"; + sha512 = "F0ReVFmwnbSDyH9PaifjrxvR0HvnKS37VyoEOCagj/31vGrksyrvuwI8BxC0YwPReRDb4n99+CtGkDsdGb9AQg=="; }; }; "@serverless/core-1.1.2" = { @@ -5791,13 +5539,13 @@ let sha512 = "q2CMqCkKeBaKA/UwfJAZLkdUsbghSbiYPvAX4rl9rsR5APm4KWtjKQP9CTOtVO5JRMWYoysK6jF0d5VJOABRzQ=="; }; }; - "@serverless/platform-client-china-2.2.3" = { + "@serverless/platform-client-china-2.2.6" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.2.3"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.3.tgz"; - sha512 = "MoDxI0d3HMesHwdyk7gzwLNU0wuJk/ovL9+XD/gAZgnrdZpFFq9kwnJAm2midL7jdhpnEFu/aoGJ0eE+xtQJ7w=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.6.tgz"; + sha512 = "CRQi3vi1iqWF8qeMNjU5lq+V7ztdVY3pUf6qNhCwcxM1TAOFncM3lsbIc4yf9gsKkOThHDmltf686u/KqDGgJg=="; }; }; "@serverless/template-1.1.4" = { @@ -5827,13 +5575,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.7.0" = { + "@serverless/utils-5.10.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.7.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.7.0.tgz"; - sha512 = "4/9lTag4NNMtgoK7qRSoP//VplnKUTqgKMJ5pjvuXHFTBNoGYbdi5Cr1UmbHwnG8FfYBUy95jNUHjSEeUXDqgg=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.10.0.tgz"; + sha512 = "bRv5o+uR2/o6PCvRI+9mAe6quhqAyJIybI3RH/UXiRzP3qNtbt9RnZDhAe2wjNidf+8iA5UYeLRt2MG3Mb9X3w=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -6403,13 +6151,13 @@ let sha512 = "pkPtJUUY+Vwv6B1inAz55rQvivClHJxc9aVEPPmaq2cbyeMLCiDpbKpcKyX4LAwpNGi+SHBv0tHv6+0gXv0P2A=="; }; }; - "@types/babel__core-7.1.15" = { + "@types/babel__core-7.1.16" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.15"; + version = "7.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz"; - sha512 = "bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz"; + sha512 = "EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ=="; }; }; "@types/babel__generator-7.6.3" = { @@ -6763,15 +6511,6 @@ let sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; }; }; - "@types/fast-json-stable-stringify-2.1.0" = { - name = "_at_types_slash_fast-json-stable-stringify"; - packageName = "@types/fast-json-stable-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "IyNhGHu71jH1jCXTHmafuoAAdsbBON3kDh7u/UUhLmjYgN5TYB54e1R8ckTCiIevl2UuZaCsi9XRxineY5yUjw=="; - }; - }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -6781,15 +6520,6 @@ let sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; }; }; - "@types/fs-extra-8.1.2" = { - name = "_at_types_slash_fs-extra"; - packageName = "@types/fs-extra"; - version = "8.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.2.tgz"; - sha512 = "SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg=="; - }; - }; "@types/fs-extra-9.0.12" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; @@ -7006,13 +6736,13 @@ let sha512 = "GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw=="; }; }; - "@types/keyv-3.1.2" = { + "@types/keyv-3.1.3" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz"; - sha512 = "/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg=="; + url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz"; + sha512 = "FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg=="; }; }; "@types/koa-2.13.4" = { @@ -7204,6 +6934,15 @@ let sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; + "@types/node-12.20.24" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.20.24"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz"; + sha512 = "yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ=="; + }; + }; "@types/node-14.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7213,13 +6952,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.12" = { + "@types/node-14.17.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.12"; + version = "14.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.12.tgz"; - sha512 = "vhUqgjJR1qxwTWV5Ps5txuy2XMdf7Fw+OrdChRboy8BmWUPkckOhphaohzFG6b8DW7CrxaBMdrdJ47SYFq1okw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.15.tgz"; + sha512 = "D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA=="; }; }; "@types/node-15.12.5" = { @@ -7267,13 +7006,31 @@ let sha512 = "Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw=="; }; }; - "@types/node-16.7.2" = { + "@types/node-16.7.3" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.7.3.tgz"; + sha512 = "S6gm2sm9xIRWTxD7Ttj8N1ZrYfqdqZEU38Nwnrhd6krk7zf8vdgMgzz8hpAX9CfmXaJfP+Vqy2EhJpVavNEocg=="; + }; + }; + "@types/node-16.7.6" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.7.6.tgz"; + sha512 = "VESVNFoa/ahYA62xnLBjo5ur6gPsgEE5cNRy8SrdnkZ2nwJSW0kJ4ufbFr2zuU9ALtHM8juY53VcRoTA7htXSg=="; + }; + }; + "@types/node-16.9.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.7.2"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.7.2.tgz"; - sha512 = "TbG4TOx9hng8FKxaVrCisdaxKxqEwJ3zwHoCWXZ0Jw6mnvTInpaB99/2Cy4+XxpXtjNv9/TgfGSvZFyfV/t8Fw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz"; + sha512 = "nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag=="; }; }; "@types/node-6.14.13" = { @@ -7420,13 +7177,13 @@ let sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; - "@types/react-16.14.14" = { + "@types/react-16.14.15" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.14"; + version = "16.14.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.14.tgz"; - sha512 = "uwIWDYW8LznHzEMJl7ag9St1RsK0gw/xaFZ5+uI1ZM1HndwUgmPH3/wQkSb87GkOVg7shUxnpNW8DcN0AzvG5Q=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.15.tgz"; + sha512 = "jOxlBV9RGZhphdeqJTCv35VZOkjY+XIEY2owwSk84BNDdDv2xS6Csj6fhi+B/q30SR9Tz8lDNt/F2Z5RF3TrRg=="; }; }; "@types/react-dom-16.9.14" = { @@ -7438,13 +7195,22 @@ let sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A=="; }; }; - "@types/react-virtualized-9.21.13" = { - name = "_at_types_slash_react-virtualized"; - packageName = "@types/react-virtualized"; - version = "9.21.13"; + "@types/react-window-1.8.5" = { + name = "_at_types_slash_react-window"; + packageName = "@types/react-window"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.5.tgz"; + sha512 = "V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw=="; + }; + }; + "@types/react-window-infinite-loader-1.0.5" = { + name = "_at_types_slash_react-window-infinite-loader"; + packageName = "@types/react-window-infinite-loader"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-virtualized/-/react-virtualized-9.21.13.tgz"; - sha512 = "tCIQ5wDKj+QJ3sMzjPKSLY0AXsznt+ovAUcq+JCLjPBOcAHbPt4FraGT9HKYEFfmp9E6+ELuN49i5bWtuBmi3w=="; + url = "https://registry.npmjs.org/@types/react-window-infinite-loader/-/react-window-infinite-loader-1.0.5.tgz"; + sha512 = "3v45+4oBNJpSroULtb2EgTJyyK4pCjOMCg+RT/HnA3or5zY4jYufv6uH9NWPyLv0nx8dqt1s4nJqHilfthwKSw=="; }; }; "@types/request-2.48.5" = { @@ -7681,15 +7447,6 @@ let sha512 = "KtQLad12+4T/NfSxpoDhmr22+fig3T7/08QCgmutYA6QSznSRmEtuL95GrhVV40/0otTEdFc+etRcCTqhh1q5Q=="; }; }; - "@types/uuid-3.4.10" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "3.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.10.tgz"; - sha512 = "BgeaZuElf7DEYZhWYDTc/XcLZXdVgFkVSTa13BqKvbnmUrxr3TJFKofUxCtDO9UQOdhnV+HPOESdHiHKZOJV1A=="; - }; - }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -7708,22 +7465,22 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vinyl-2.0.5" = { + "@types/vinyl-2.0.6" = { name = "_at_types_slash_vinyl"; packageName = "@types/vinyl"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.5.tgz"; - sha512 = "1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg=="; + url = "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz"; + sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g=="; }; }; - "@types/vscode-1.59.0" = { + "@types/vscode-1.60.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.59.0"; + version = "1.60.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.59.0.tgz"; - sha512 = "Zg38rusx2nU6gy6QdF7v4iqgxNfxzlBlDhrRCjOiPQp+sfaNrp3f9J6OHIhpGNN1oOAca4+9Hq0+8u3jwzPMlQ=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.60.0.tgz"; + sha512 = "wZt3VTmzYrgZ0l/3QmEbCq4KAJ71K3/hmMQ/nfpv84oH8e81KKwPEoQ5v8dNCxfHFVJ1JabHKmCvqdYOoVm1Ow=="; }; }; "@types/webpack-4.41.30" = { @@ -7753,15 +7510,6 @@ let sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; - "@types/ws-6.0.4" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; - sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; - }; - }; "@types/ws-7.4.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -7834,13 +7582,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.29.3" = { + "@typescript-eslint/eslint-plugin-4.31.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.29.3"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz"; - sha512 = "tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz"; + sha512 = "iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7852,13 +7600,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.29.3" = { + "@typescript-eslint/experimental-utils-4.31.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.29.3"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz"; - sha512 = "ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz"; + sha512 = "Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7870,22 +7618,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.29.3" = { + "@typescript-eslint/parser-4.31.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.29.3"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.3.tgz"; - sha512 = "jrHOV5g2u8ROghmspKoW7pN8T/qUzk0+DITun0MELptvngtMrwUJ1tv5zMI04CYVEUsSrN4jV7AKSv+I0y0EfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz"; + sha512 = "oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w=="; }; }; - "@typescript-eslint/scope-manager-4.29.3" = { + "@typescript-eslint/scope-manager-4.31.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.29.3"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz"; - sha512 = "x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz"; + sha512 = "LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7897,13 +7645,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.29.3" = { + "@typescript-eslint/types-4.31.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.29.3"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.3.tgz"; - sha512 = "s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz"; + sha512 = "9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7915,13 +7663,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.29.3" = { + "@typescript-eslint/typescript-estree-4.31.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.29.3"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz"; - sha512 = "45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz"; + sha512 = "QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7933,31 +7681,31 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.29.3" = { + "@typescript-eslint/visitor-keys-4.31.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.29.3"; + version = "4.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz"; - sha512 = "MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz"; + sha512 = "HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w=="; }; }; - "@uifabric/foundation-7.9.26" = { + "@uifabric/foundation-7.10.0" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.26"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.26.tgz"; - sha512 = "1FLTb+jlH/Tuel2L9wT/zLl5ZW6W4Lbjrs5VUVjv81vWxzznvPnTf8+Ew0qkzaH7xDuMNMl7okswhV0IfJyheg=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.10.0.tgz"; + sha512 = "rUVRSNvzWPUpWPJINpogsk01m4dzIDf9CbIbJNAq+SLsVvxk9yRoLfnPwX0ZYVpFqUQxYxnII8lmWdEQzoExmQ=="; }; }; - "@uifabric/icons-7.5.23" = { + "@uifabric/icons-7.6.0" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.23"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.23.tgz"; - sha512 = "eIvUbH0EWgFgdfgFfINgqS2ZVZTyJ/9n5nR4bmcyAe75wsKxm4ser4WIT9IvaBF6+HFVfjUF/v6+VMD7y2LBng=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.6.0.tgz"; + sha512 = "Xx+CVMYOafJDijllYYkgE22lvKpKaodrB9XUgVSI77QveGcOV+x9z5FVa5CzwERb6Zjoafyj7q7SmH/EOi+AZw=="; }; }; "@uifabric/merge-styles-7.19.2" = { @@ -7987,13 +7735,13 @@ let sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg=="; }; }; - "@uifabric/styling-7.19.0" = { + "@uifabric/styling-7.19.1" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.19.0"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.19.0.tgz"; - sha512 = "fXComDtGV7dHF4rP4cLHwI6fC+1f/nvPavpMBz4IQdySwixta9TVMKbzt0OA6i0mJztqZCVAd27F/sl9R/JmcQ=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.19.1.tgz"; + sha512 = "1yvfVJ9HSB7TVUKocjs/ij3bsVHtfBRbhnhDtdMS9Fw13abf1IBOpwx8LPMGMt1nbeAmWbzlBI+Deoyij9lstA=="; }; }; "@uifabric/utilities-7.33.5" = { @@ -8122,31 +7870,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.6" = { + "@vue/compiler-core-3.2.11" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.6"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.6.tgz"; - sha512 = "vbwnz7+OhtLO5p5i630fTuQCL+MlUpEMTKHuX+RfetQ+3pFCkItt2JUH+9yMaBG2Hkz6av+T9mwN/acvtIwpbw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz"; + sha512 = "bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg=="; }; }; - "@vue/compiler-dom-3.2.6" = { + "@vue/compiler-dom-3.2.11" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.6"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.6.tgz"; - sha512 = "+a/3oBAzFIXhHt8L5IHJOTP4a5egzvpXYyi13jR7CUYOR1S+Zzv7vBWKYBnKyJLwnrxTZnTQVjeHCgJq743XKg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz"; + sha512 = "DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw=="; }; }; - "@vue/shared-3.2.6" = { + "@vue/shared-3.2.11" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.6"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.6.tgz"; - sha512 = "uwX0Qs2e6kdF+WmxwuxJxOnKs/wEkMArtYpHSm7W+VY/23Tl8syMRyjnzEeXrNCAP0/8HZxEGkHJsjPEDNRuHw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz"; + sha512 = "ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8707,22 +8455,265 @@ let sha512 = "WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw=="; }; }; - "@xmldom/xmldom-0.7.2" = { + "@xmldom/xmldom-0.7.4" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.7.2"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.4.tgz"; + sha512 = "wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw=="; + }; + }; + "@xmpp/base64-0.12.1" = { + name = "_at_xmpp_slash_base64"; + packageName = "@xmpp/base64"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/base64/-/base64-0.12.1.tgz"; + sha512 = "CpPQdhEAveROH5q7GkCMryCMsqIDu4RJOaYi5GJ7oxyrWpgv6bi5225hAD50kAOC4q+NWyksWiLnUwf2+C3kDA=="; + }; + }; + "@xmpp/client-0.12.1" = { + name = "_at_xmpp_slash_client"; + packageName = "@xmpp/client"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/client/-/client-0.12.1.tgz"; + sha512 = "M9VsUd3wnZHrskHCGAPUbabH+6zIVAqlE5gmV1gTgzM+TwXY3Sz6q3k9Yfz0ERWF9qbOT6+hY3G7spNs9NNVyw=="; + }; + }; + "@xmpp/client-core-0.12.1" = { + name = "_at_xmpp_slash_client-core"; + packageName = "@xmpp/client-core"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/client-core/-/client-core-0.12.1.tgz"; + sha512 = "Gml+Z4qlWgHfFVB2ALfhOkKr9YD5X7NT8JgwXq0xk+P8TbUleGgmrkAaX2fzQbnntuG6puFk3+9C2a7Q71pwXQ=="; + }; + }; + "@xmpp/connection-0.12.1" = { + name = "_at_xmpp_slash_connection"; + packageName = "@xmpp/connection"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/connection/-/connection-0.12.1.tgz"; + sha512 = "AdOt/fMjuCT+ru6v6tYKdvP42AH2P+pqyL4M71VI9kprifDV03L/Ud8jzCqSVpJUEXDFEAukDG1KNwUkBEIaXw=="; + }; + }; + "@xmpp/connection-tcp-0.12.1" = { + name = "_at_xmpp_slash_connection-tcp"; + packageName = "@xmpp/connection-tcp"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/connection-tcp/-/connection-tcp-0.12.1.tgz"; + sha512 = "axoxsyyDifNEaKK3gVoVMsCtKm1VsXOdzbGwtvMHwRxiArlbSxLpHLFWv6hjH63BJvNSet1txzHt/0+rrVLWVg=="; + }; + }; + "@xmpp/debug-0.12.1" = { + name = "_at_xmpp_slash_debug"; + packageName = "@xmpp/debug"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/debug/-/debug-0.12.1.tgz"; + sha512 = "nQ9w+lkholzAvDKBvPTbKLDAyq5LhTjQ5Qf7vWPqgP56JHvDDAFdQ/YPRJVOFFB5L08/c3+/6AjEz0TD8iSXYA=="; + }; + }; + "@xmpp/error-0.12.1" = { + name = "_at_xmpp_slash_error"; + packageName = "@xmpp/error"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/error/-/error-0.12.1.tgz"; + sha512 = "n5UyU25Pl6x1GMAX5tuJPmY9I+cM03iQF06ENOPxPHHLf3TBnoCtpJRP/oONHXK84vpxU9uJBuMAMHWIaWprrQ=="; + }; + }; + "@xmpp/events-0.12.1" = { + name = "_at_xmpp_slash_events"; + packageName = "@xmpp/events"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/events/-/events-0.12.1.tgz"; + sha512 = "8kSwhY4ZxuXVG9QCAdQZijJvde0+/VBHZJw0Ase1ZcrBjlL46UfRwVNpru7SBZMIZB8CLav4AaArzlTFDRJljg=="; + }; + }; + "@xmpp/id-0.12.1" = { + name = "_at_xmpp_slash_id"; + packageName = "@xmpp/id"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/id/-/id-0.12.1.tgz"; + sha512 = "tIPSDyYn1Ah2JPmaD9gSHqHYG3nWKzxISGJf0EMeAQ1Hd4pldNv4pKv+mO2ZVrHQie0oc3KC409QASmYfVP7xA=="; + }; + }; + "@xmpp/iq-0.12.1" = { + name = "_at_xmpp_slash_iq"; + packageName = "@xmpp/iq"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/iq/-/iq-0.12.1.tgz"; + sha512 = "XlYnbCUWS6CgWrLUb9aWl0IJ7FfHbTxSlBybQb9zsOJEHb9J3FBV6SZwNUgmtnTwYtgIt6RTSvZtpGDX7Q5Xcw=="; + }; + }; + "@xmpp/jid-0.12.1" = { + name = "_at_xmpp_slash_jid"; + packageName = "@xmpp/jid"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/jid/-/jid-0.12.1.tgz"; + sha512 = "PdXJy17Os5ADr03I+JXIWYLExEZjTW7AH23CwvbS8kLQh/CNrfhbFynW9krUZ4Lf4YAFn88oOsFsQRNgsAj/Vw=="; + }; + }; + "@xmpp/middleware-0.12.1" = { + name = "_at_xmpp_slash_middleware"; + packageName = "@xmpp/middleware"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/middleware/-/middleware-0.12.1.tgz"; + sha512 = "XZTXKuV3xre9tQe2X2bX20jChagp4hrL83LRgpRHsp3V4SzKsiBWDXb+0rNmyhKrWAeJOxUNPZ7HlV/1ZD5fvA=="; + }; + }; + "@xmpp/reconnect-0.12.1" = { + name = "_at_xmpp_slash_reconnect"; + packageName = "@xmpp/reconnect"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/reconnect/-/reconnect-0.12.1.tgz"; + sha512 = "uORfO/iY2VC4ZK3/dJSd4meU0j96+qeybj62K7sexxJtcw/qM8GAFfpWDsIu/6MhQZ0dOweQ2iZn3gSk66WjMg=="; + }; + }; + "@xmpp/resolve-0.12.1" = { + name = "_at_xmpp_slash_resolve"; + packageName = "@xmpp/resolve"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/resolve/-/resolve-0.12.1.tgz"; + sha512 = "1enBxGpt/0frifKjwkHxsVHOCKC3B1BdcFbrQCc+FQEcVLIsFgAKLAFOp18p0Y1pxqT+O/4IZ4CUUqNFpfyXKg=="; + }; + }; + "@xmpp/resource-binding-0.12.1" = { + name = "_at_xmpp_slash_resource-binding"; + packageName = "@xmpp/resource-binding"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/resource-binding/-/resource-binding-0.12.1.tgz"; + sha512 = "AV3NGIyNBnArvwShNYdsTVHcLPDDXDzDoRk07ZxztN/D5sYQAzhbHK/5BIIkIEOeR91h4qXpSv69QLEYmWj0Ug=="; + }; + }; + "@xmpp/sasl-0.12.1" = { + name = "_at_xmpp_slash_sasl"; + packageName = "@xmpp/sasl"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/sasl/-/sasl-0.12.1.tgz"; + sha512 = "KuxuiEX2bhZCB9aYYJjVpVT1MmQHv8BPZGEyRA6YjVqhWCQUSP+OtKV9zy6hLBDBVfd45ybYVC+sMM0i9Y2R9Q=="; + }; + }; + "@xmpp/sasl-anonymous-0.12.1" = { + name = "_at_xmpp_slash_sasl-anonymous"; + packageName = "@xmpp/sasl-anonymous"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/sasl-anonymous/-/sasl-anonymous-0.12.1.tgz"; + sha512 = "9A5y9FdwhT8cmTEVkJGl6UV+iYmgPqgbitnFI6DdkS4HzTLQVjV7SjXayrLoOjVniKHnxHOBEbjcQG/H5iHW4w=="; + }; + }; + "@xmpp/sasl-plain-0.12.1" = { + name = "_at_xmpp_slash_sasl-plain"; + packageName = "@xmpp/sasl-plain"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/sasl-plain/-/sasl-plain-0.12.1.tgz"; + sha512 = "Ym6qCPA86vssLVvt/noiA/YgT6T/IxA5281xinOsZP9wtP/csqbjcBDRD7pk3HAmHhEGwUH61eydbIKHHw7o5w=="; + }; + }; + "@xmpp/sasl-scram-sha-1-0.12.1" = { + name = "_at_xmpp_slash_sasl-scram-sha-1"; + packageName = "@xmpp/sasl-scram-sha-1"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.12.1.tgz"; + sha512 = "h9OenKiaJDYZCxv2FyMBpoTdmYu2oxy/FIM8FXMgnPJrCru7kBepksIb8lOfcyTyFxbQJk/Vrf8zyBUdAm6Jyg=="; + }; + }; + "@xmpp/session-establishment-0.12.1" = { + name = "_at_xmpp_slash_session-establishment"; + packageName = "@xmpp/session-establishment"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/session-establishment/-/session-establishment-0.12.1.tgz"; + sha512 = "6+uffTA/Wy5JmoZIs3uk0oPKuLrb4MEzwo6J6QZYPHC5pwKH9dYaQ+Xjw03qaac8i73HREhK5p2cA5zpxPZoRw=="; + }; + }; + "@xmpp/starttls-0.12.1" = { + name = "_at_xmpp_slash_starttls"; + packageName = "@xmpp/starttls"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/starttls/-/starttls-0.12.1.tgz"; + sha512 = "AZPXppxar9n1J1IOG39xkZf/eoPQXhq3y5/tVOEyeG+WRcJGddeYJleXUm4Jwol+PTc0l0F6tlThPlhrIt/8vA=="; + }; + }; + "@xmpp/stream-features-0.12.1" = { + name = "_at_xmpp_slash_stream-features"; + packageName = "@xmpp/stream-features"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/stream-features/-/stream-features-0.12.1.tgz"; + sha512 = "OautwK8DMSZSeAU9YFt6wdmHutbi7I/Gy5bzR12UYgtjFcgZ2FUNhj4kYOFcwOhCG8hKyGgMvv0V7/0iDr40QA=="; + }; + }; + "@xmpp/stream-management-0.12.1" = { + name = "_at_xmpp_slash_stream-management"; + packageName = "@xmpp/stream-management"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/stream-management/-/stream-management-0.12.1.tgz"; + sha512 = "3fsSGFAKZ+SpdvQQ+cgPUdZcekI66rpMeUMDJMiWG5hGTicp2PfoDVjAvlPlgsTmIudm2UdNVW62MMZxnRnjbQ=="; + }; + }; + "@xmpp/tcp-0.12.1" = { + name = "_at_xmpp_slash_tcp"; + packageName = "@xmpp/tcp"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/tcp/-/tcp-0.12.1.tgz"; + sha512 = "sILbQli4EpqfsTmeVj/INlhA0ZYUYdRkp9wtKbDaIv53QAUaD62L37TYXFCUEnyIxOpxdecNAMbgpnarv15bcg=="; + }; + }; + "@xmpp/tls-0.12.1" = { + name = "_at_xmpp_slash_tls"; + packageName = "@xmpp/tls"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/tls/-/tls-0.12.1.tgz"; + sha512 = "KMMEzRQCdSTN7uCL2CmRcxvlfKcRSGwHrqKuGflvYAzvuQEJaRS2vAzvXmP2derEnJzG1Jb4Fle888MRjifWbg=="; + }; + }; + "@xmpp/websocket-0.12.1" = { + name = "_at_xmpp_slash_websocket"; + packageName = "@xmpp/websocket"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.2.tgz"; - sha512 = "t/Zqo0ewes3iq6zGqEqJNUWI27Acr3jkmSUNp6E3nl0Z2XbtqAG5XYqPNLdYonILmhcxANsIidh69tHzjXtuRg=="; + url = "https://registry.npmjs.org/@xmpp/websocket/-/websocket-0.12.1.tgz"; + sha512 = "r1R2uzqSc5uFEImWZCI43oduha0jZqTS8iCmryB4aSDsaevQgeZgOOSpv8y4Jui5v5C1asnQzFb7H164SUcGkw=="; }; }; - "@xstate/fsm-1.6.1" = { + "@xmpp/xml-0.12.1" = { + name = "_at_xmpp_slash_xml"; + packageName = "@xmpp/xml"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmpp/xml/-/xml-0.12.1.tgz"; + sha512 = "3SIr/jmyHDMkCzOtcH03YG9qTAJeE7auPg/V7e9tJrhiW329hNMhg8+VAO72Tp1AOi5bMhma09ACRS2Y9bMOKA=="; + }; + }; + "@xstate/fsm-1.6.2" = { name = "_at_xstate_slash_fsm"; packageName = "@xstate/fsm"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.1.tgz"; - sha512 = "xYKDNuPR36/fUK+jmhM+oauBmbdUAfuJKnDjg3/7NbN+Pj03TX7e94LXnzkwGgAR+U/HWoMqM5UPTuGIYfIx9g=="; + url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.2.tgz"; + sha512 = "vOfiFVQu9mQceA8oJ3PcA4vwhtyo/j/mbVDVIlHDOh3iuiTqMnp805zZ3QsouRdO2Ie3B7n3jMw8BntI74fZxg=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -9004,6 +8995,15 @@ let sha512 = "asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="; }; }; + "acorn-8.5.0" = { + name = "acorn"; + packageName = "acorn"; + version = "8.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz"; + sha512 = "yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -9706,6 +9706,15 @@ let sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; }; }; + "ansi-html-community-0.0.8" = { + name = "ansi-html-community"; + packageName = "ansi-html-community"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"; + sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; + }; + }; "ansi-red-0.1.1" = { name = "ansi-red"; packageName = "ansi-red"; @@ -10336,13 +10345,22 @@ let sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; }; }; - "are-we-there-yet-1.1.5" = { + "are-we-there-yet-1.1.7" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.5"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + }; + }; + "are-we-there-yet-2.0.0" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; + sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; "arg-2.0.0" = { @@ -11281,13 +11299,13 @@ let sha512 = "zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw=="; }; }; - "async-mutex-0.3.1" = { + "async-mutex-0.3.2" = { name = "async-mutex"; packageName = "async-mutex"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.1.tgz"; - sha512 = "vRfQwcqBnJTLzVQo72Sf7KIUbcSUP5hNchx6udI1U6LuPQpfePgdjJzlCe76yFZ8pxlLjn9lwcl/Ya0TSOv0Tw=="; + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz"; + sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA=="; }; }; "async-retry-1.3.3" = { @@ -11497,13 +11515,13 @@ let sha512 = "XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg=="; }; }; - "available-typed-arrays-1.0.4" = { + "available-typed-arrays-1.0.5" = { name = "available-typed-arrays"; packageName = "available-typed-arrays"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz"; - sha512 = "SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA=="; + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; }; }; "await-lock-2.1.0" = { @@ -11542,22 +11560,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.976.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.976.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.976.0.tgz"; - sha512 = "LWVh3nko6yGDfGcDW9nIClaukthkTueq7I/dXVNv4g9kuy2VOl5fVTPMACgTibWINAM29wZCM+gVQSSZu/Veow=="; - }; - }; - "aws-sdk-2.977.0" = { + "aws-sdk-2.985.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.977.0"; + version = "2.985.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.977.0.tgz"; - sha512 = "LU0ityBR3w28Ewwr+V0xu4KyQr8i4C1ypafmBNttYm3FHVUDDPQ/hLHASnGq1zGp6rBxBxO1ZE6meFqpKXIaug=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.985.0.tgz"; + sha512 = "Al1oFENrrDeKRpxlklk5sONqzCgEkrhaJ1vtIfpLYYqhNlAY+ku/z1hG1+qSlvgmljGyn7T6/zAb2EcbbAFZLQ=="; }; }; "aws-sign2-0.6.0" = { @@ -11605,6 +11614,15 @@ let sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; }; }; + "axios-0.21.4" = { + name = "axios"; + packageName = "axios"; + version = "0.21.4"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; + }; + }; "axios-retry-3.1.9" = { name = "axios-retry"; packageName = "axios-retry"; @@ -11785,6 +11803,15 @@ let sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g=="; }; }; + "babel-plugin-jsx-pragmatic-1.0.2" = { + name = "babel-plugin-jsx-pragmatic"; + packageName = "babel-plugin-jsx-pragmatic"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-1.0.2.tgz"; + sha1 = "41e2beb8642235f34b2a7ab12ca39e07201b8e59"; + }; + }; "babel-plugin-macros-2.8.0" = { name = "babel-plugin-macros"; packageName = "babel-plugin-macros"; @@ -12271,6 +12298,15 @@ let sha1 = "780a99c84e7d600260361511c4877613bf24f6bb"; }; }; + "base-64-1.0.0" = { + name = "base-64"; + packageName = "base-64"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz"; + sha512 = "kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="; + }; + }; "base-x-3.0.8" = { name = "base-x"; packageName = "base-x"; @@ -12946,13 +12982,13 @@ let sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; - "bit-field-1.5.2" = { + "bit-field-1.5.3" = { name = "bit-field"; packageName = "bit-field"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/bit-field/-/bit-field-1.5.2.tgz"; - sha512 = "CYS3HRGgIlm7A6/zqGFd/KPSUIv4EoEQVQ8mWcvBEdlf0db1q3j/fj5W/PXJasBfsvN2jM0Tzw3w1C7HUoR/fg=="; + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.5.3.tgz"; + sha512 = "bSrkdGpRwPWWi9WOrrMV9xcF1PQAKGG5HnNgVUntIaL1OFND2n7LBM4p1VGXF6OYMKap0vB/OmzOhneDfSgIpg=="; }; }; "bitcoin-ops-1.4.1" = { @@ -13063,13 +13099,22 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.18.0" = { + "bittorrent-tracker-9.18.2" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.18.0"; + version = "9.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.0.tgz"; - sha512 = "bZhW94TOExkRhn9g67SLWjGfT6seSlT//+oG7+AFve0wQP6DMNSnu7ued6McsTMaL+XivNFCE9YVWPbQ4moTYA=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.2.tgz"; + sha512 = "r4v+gIi/aQP4h0rvx7WVjnEFvu7Vw2ePPFzoyQjdPfyoJaV/JTdD3kFTZBaVO/Egj5y2O2Y+bTCdPIgD2MzT+A=="; + }; + }; + "bitwise-xor-0.0.0" = { + name = "bitwise-xor"; + packageName = "bitwise-xor"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitwise-xor/-/bitwise-xor-0.0.0.tgz"; + sha1 = "040a8172b5bb8cc562b0b7119f230b2a1a780e3d"; }; }; "bl-1.2.3" = { @@ -13171,13 +13216,13 @@ let sha512 = "S3jE7riCbWnAK8OT+ta4Z8RX/X6nfISxzn0SDIMFYuY90qUwqx7w7e9fIsc2m2ODwma7dFcXNwGSjyayfKd1DQ=="; }; }; - "blgr-0.1.8" = { + "blgr-0.1.9" = { name = "blgr"; packageName = "blgr"; - version = "0.1.8"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/blgr/-/blgr-0.1.8.tgz"; - sha512 = "9AvDK+lc92q//63S8cHtkaB060YOZqoqd0DkMwn35mR1SrcY0FXnCHePHZFx6Oe1d/6wj8Lw7mKEGoShCUf3Yw=="; + url = "https://registry.npmjs.org/blgr/-/blgr-0.1.9.tgz"; + sha512 = "ikJQoiQlhbJVIqcJ+CZxXXLD/et4bQ47/pdGpjdTq1p43qF5jfXtbWygZyWm05MInFruUicnw+U0oaoDgLx3PA=="; }; }; "blob-0.0.2" = { @@ -13801,15 +13846,6 @@ let sha512 = "TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g=="; }; }; - "browserify-17.0.0" = { - name = "browserify"; - packageName = "browserify"; - version = "17.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-17.0.0.tgz"; - sha512 = "SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w=="; - }; - }; "browserify-aes-1.2.0" = { name = "browserify-aes"; packageName = "browserify-aes"; @@ -13918,13 +13954,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.8" = { + "browserslist-4.17.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.8"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz"; - sha512 = "sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz"; + sha512 = "g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g=="; }; }; "brq-0.1.8" = { @@ -14423,13 +14459,13 @@ let sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng=="; }; }; - "bull-3.29.1" = { + "bull-3.29.2" = { name = "bull"; packageName = "bull"; - version = "3.29.1"; + version = "3.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/bull/-/bull-3.29.1.tgz"; - sha512 = "ASNnorakKCV4hmgHABfn8Ir+gy24a4gaGnXH/0bm1Msq+djOnNfM5XW7Igzsa5iTjpboWXhY9dHFVjiWRKsSGw=="; + url = "https://registry.npmjs.org/bull/-/bull-3.29.2.tgz"; + sha512 = "zWHyza/ElwVvJUqIEDJdUhGKd1V9EHjituUL7sJAmJoxS9Z7QMhYcMOWcgbUlWPgtiKN1g9ZlOtFAoq7C4/SQw=="; }; }; "bunyan-1.5.1" = { @@ -14936,13 +14972,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001252" = { + "caniuse-lite-1.0.30001255" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001252"; + version = "1.0.30001255"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz"; - sha512 = "I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"; + sha512 = "F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ=="; }; }; "canvas-2.8.0" = { @@ -15350,6 +15386,15 @@ let sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; + "chardet-1.3.0" = { + name = "chardet"; + packageName = "chardet"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-1.3.0.tgz"; + sha512 = "cyTQGGptIjIT+CMGT5J/0l9c6Fb+565GCFjjeUTKxUO7w3oR+FcNCMEKTn5xtVKaLFmladN7QF68IiQsv5Fbdw=="; + }; + }; "charenc-0.0.2" = { name = "charenc"; packageName = "charenc"; @@ -16043,6 +16088,15 @@ let sha512 = "J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg=="; }; }; + "cli-progress-footer-2.0.0" = { + name = "cli-progress-footer"; + packageName = "cli-progress-footer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.0.0.tgz"; + sha512 = "+MWvSb0KGFOetUptNubegAYWj9NyDwI1XPrfvYE+YWOsufBinF/M7G3VLMjBEGvqSnLYM2nnAX76cHHh0eXsBg=="; + }; + }; "cli-spinner-0.2.10" = { name = "cli-spinner"; packageName = "cli-spinner"; @@ -16070,6 +16124,15 @@ let sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; }; }; + "cli-sprintf-format-1.1.0" = { + name = "cli-sprintf-format"; + packageName = "cli-sprintf-format"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-sprintf-format/-/cli-sprintf-format-1.1.0.tgz"; + sha512 = "t3LcCdPvrypZovStadWdRS4a186gsq9aoHJYTIer55VY20YdVjGVHDV4uPWcWCXTw1tPjfwlRGE7zKMWJ663Sw=="; + }; + }; "cli-table-0.3.6" = { name = "cli-table"; packageName = "cli-table"; @@ -16790,6 +16853,15 @@ let sha512 = "ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="; }; }; + "colorette-1.4.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; + }; + }; "colornames-1.1.1" = { name = "colornames"; packageName = "colornames"; @@ -17672,13 +17744,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.133" = { + "constructs-3.3.147" = { name = "constructs"; packageName = "constructs"; - version = "3.3.133"; + version = "3.3.147"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.133.tgz"; - sha512 = "f0HgM9tmmR66A9XrzDXS7kXRbB9Gazb+KPldP9RRIkrFGhHuGeII+2YyTxxzY15cDgU58NrLrac+gynhrLy6Uw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.147.tgz"; + sha512 = "xTSA87W5hscsHdFC2NcbJWALeMt8QWoCvVXRHPIuoBDDXdvBuNoqL2a5kY1yEWSMLQvBPnrDyinfz3twTX6dAw=="; }; }; "consume-http-header-1.0.0" = { @@ -17754,22 +17826,22 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.33.0" = { + "contentful-management-7.36.2" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.33.0"; + version = "7.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.33.0.tgz"; - sha512 = "Q6Y0peBdmZUkQyrKP5rRuv2IbVpt5LflYfRdWstTQ9sERyAOgYJWBtvDCupXKw3g1oBXUxLXXU7vZY2M5jnTpQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.36.2.tgz"; + sha512 = "pOyHyIuOygqQPDfF9C1MQKTAKAJcounClp4R5afhKkXDdh8jUPc34Ej9BACCtseo99Q9BftLQn49nmk9xJHylQ=="; }; }; - "contentful-sdk-core-6.8.0" = { + "contentful-sdk-core-6.8.5" = { name = "contentful-sdk-core"; packageName = "contentful-sdk-core"; - version = "6.8.0"; + version = "6.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.8.0.tgz"; - sha512 = "X45uNrcbQ2qY2p4G/Wx2EFUdnLnoDXjw29i+d0JVTUXqCG58p3q4GHuAPzTX+uafJL4h0ZY2xPOn4nvJ83eRBQ=="; + url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.8.5.tgz"; + sha512 = "Efmv/Jf0zeTdRNqCW6y+iMsNbDa/+KpxYOaYYz0z1qVd4q88qtZDJrvLdjPHtYvrcrvkhYtucVRFr9oe2b+cAA=="; }; }; "continuable-1.1.8" = { @@ -17844,13 +17916,13 @@ let sha512 = "ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg=="; }; }; - "conventional-changelog-angular-5.0.12" = { + "conventional-changelog-angular-5.0.13" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.12"; + version = "5.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz"; - sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz"; + sha512 = "i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA=="; }; }; "conventional-changelog-atom-2.0.8" = { @@ -17880,13 +17952,13 @@ let sha512 = "sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A=="; }; }; - "conventional-changelog-core-4.2.3" = { + "conventional-changelog-core-4.2.4" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.3.tgz"; - sha512 = "MwnZjIoMRL3jtPH5GywVNqetGILC7g6RQFvdb8LRU/fA/338JbeWAku3PZ8yQ+mtVRViiISqJlb0sOz0htBZig=="; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz"; + sha512 = "gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg=="; }; }; "conventional-changelog-ember-2.0.9" = { @@ -17961,13 +18033,13 @@ let sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA=="; }; }; - "conventional-commits-parser-3.2.1" = { + "conventional-commits-parser-3.2.2" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz"; - sha512 = "OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.2.tgz"; + sha512 = "Jr9KAKgqAkwXMRHjxDwO/zOCDKod1XdAESHAGuJX38iZ7ZzVti/tvVoysO0suMsdAObp9NQ2rHSsSbnAqZ5f5g=="; }; }; "conventional-recommended-bump-6.1.0" = { @@ -18267,31 +18339,31 @@ let sha512 = "5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="; }; }; - "core-js-3.16.3" = { + "core-js-3.17.3" = { name = "core-js"; packageName = "core-js"; - version = "3.16.3"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.16.3.tgz"; - sha512 = "lM3GftxzHNtPNUJg0v4pC2RC6puwMd6VZA7vXUczi+SKmCWSf4JwO89VJGMqbzmB7jlK7B5hr3S64PqwFL49cA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.17.3.tgz"; + sha512 = "lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw=="; }; }; - "core-js-compat-3.16.3" = { + "core-js-compat-3.17.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.16.3"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.3.tgz"; - sha512 = "A/OtSfSJQKLAFRVd4V0m6Sep9lPdjD8bpN8v3tCCGwE0Tmh0hOiVDm9tw6mXmWOKOSZIyr3EkywPo84cJjGvIQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.3.tgz"; + sha512 = "+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA=="; }; }; - "core-js-pure-3.16.3" = { + "core-js-pure-3.17.3" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.16.3"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.3.tgz"; - sha512 = "6In+2RwN0FT5yK0ZnhDP5rco/NnuuFZhHauQizZiHo5lDnqAvq8Phxcpy3f+prJOqtKodt/cftBl/GTOW0kiqQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.17.3.tgz"; + sha512 = "YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ=="; }; }; "core-util-is-1.0.2" = { @@ -18303,6 +18375,15 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + }; "core_d-3.2.0" = { name = "core_d"; packageName = "core_d"; @@ -18528,13 +18609,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.12.0" = { + "create-gatsby-1.13.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.12.0.tgz"; - sha512 = "d8wlwgNgKrmd6J+cr4z1Hsis+sCwr9LoxnqSFqFzXcWowlODS5NP8gUZdCZ54hHd+0qIuAA77Wp67GAyhkFlCA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.13.0.tgz"; + sha512 = "ypJeb+nj5uZybFeic+ab5myxGh21oZQ+OeCRkKHPL9NPZbzcvQE/y5lWXgVXHqy2/xf2IBnotkImrmiQiqPOxg=="; }; }; "create-graphback-1.0.1" = { @@ -19203,13 +19284,13 @@ let sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; - "csv-parse-4.16.0" = { + "csv-parse-4.16.3" = { name = "csv-parse"; packageName = "csv-parse"; - version = "4.16.0"; + version = "4.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.0.tgz"; - sha512 = "Zb4tGPANH4SW0LgC9+s9Mnequs9aqn7N3/pCqNbVjs2XhEF6yWNU2Vm4OGl1v2Go9nw8rXt87Cm2QN/o6Vpqgg=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz"; + sha512 = "cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg=="; }; }; "csv-parser-1.12.1" = { @@ -20949,13 +21030,13 @@ let sha1 = "9ced65ea0bc0b09f42a6d79c1b1903f9d913cc18"; }; }; - "deep-is-0.1.3" = { + "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; "deepcopy-2.1.0" = { @@ -21264,13 +21345,13 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "deltachat-node-1.56.2" = { + "deltachat-node-1.60.0" = { name = "deltachat-node"; packageName = "deltachat-node"; - version = "1.56.2"; + version = "1.60.0"; src = fetchurl { - url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.56.2.tgz"; - sha512 = "bM/fVTM1GVgXpvGZFiMB1qKxhnJvFx4ssqZVddsTjGTlzQ+9dRIZmkWIFvUzIGCyLWMcfNJZcUZgLgKdbz+liw=="; + url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.60.0.tgz"; + sha512 = "ONDEN3IM2F2XPs2G/6Cc3MeZnyRicm4sa/Sm/J0xxVA9ApGORMQF2v4X5pwMt4liYD84De2P95R85VhwSM4GVA=="; }; }; "denodeify-1.2.1" = { @@ -21768,13 +21849,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.9" = { + "diff2html-3.4.11" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.9"; + version = "3.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.9.tgz"; - sha512 = "33x45h6Xgfasjt49e0ldfLnUdCjLjHIdablpAlrKnQyyG1RA7w+4cbp9+bUfNLxfFj584BookXqh5KJEt4+MLA=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.11.tgz"; + sha512 = "FBW74QVkbVqbqM36NbSsmStU3mAovluM3Zg6QuuPtn26nzdfoVgnG2axKnbEbiHffM+CCQwrcpCBcDZhkN9VSw=="; }; }; "diff3-0.0.3" = { @@ -22047,31 +22128,31 @@ let sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ=="; }; }; - "dockerfile-ast-0.3.0" = { + "dockerfile-ast-0.3.1" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.0.tgz"; - sha512 = "wEbFtqeHZffyOYP2pMfMLQ0m2wdHUzty0UTDoAMNa6/nvLfDRSEaPkszIWFy86tuWwHucBtcczIHQlFATJ54eA=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.1.tgz"; + sha512 = "sxFv+wY4TNC68+JkbZ4kPn3pAfnfvbFBUcvYAA9KFg7Es58FgWr+trskeDRWFkCFeuM1QIXeBC5exMeiAeW96Q=="; }; }; - "dockerfile-language-service-0.4.0" = { + "dockerfile-language-service-0.5.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.4.0.tgz"; - sha512 = "P4yj9in7PMLeN3StBn5e+Ofiju+nfs5ZdDv4EqfK91mYx/+U7wm8QipyP05iUXaVKFh6I9tn9Qmi1tpt5jj2hw=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.5.0.tgz"; + sha512 = "63B8rASoOz69NI4a3ftC64mVTDnQhd6xXdu5J6PN53+2wEm6vhO+zf6R4A5/ssxB3nSnckV25OtHCdBX2CYluQ=="; }; }; - "dockerfile-utils-0.5.0" = { + "dockerfile-utils-0.7.0" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.5.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.5.0.tgz"; - sha512 = "a12B6qAwLpl7D9Y6Zxt0AhW74g0k5NarpWF+NUb66A6la5vs1igI/KfdXZbFoQtpTOsv1T+OfKmhlE982Ars1w=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.7.0.tgz"; + sha512 = "27Qh1oT1yjbAPbV/VheDZICoSOYfb9pEgkZSiQMbGQOXw0a4ZObDRNxqYQ2o9udVOTbb/HS4y/hm+reCpz8i9g=="; }; }; "doctoc-2.0.1" = { @@ -22110,13 +22191,13 @@ let sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; }; }; - "doipjs-0.11.2" = { + "doipjs-0.13.0" = { name = "doipjs"; packageName = "doipjs"; - version = "0.11.2"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/doipjs/-/doipjs-0.11.2.tgz"; - sha512 = "UZJegmUvMBJS5luh2a64JOVMGO80KdkGY7I9noxr5rmwuiSNzhSy5571DY1z2vacYOrZ1xpxUnlzB0bC9+NiNg=="; + url = "https://registry.npmjs.org/doipjs/-/doipjs-0.13.0.tgz"; + sha512 = "PgLmVcrSAfIZk/Tb9xvmDQ2S9dkHd+o7i2NBI0mEI0rTWk6p2TvpWSPyrupaPeAmNDSbKwmmBmXH/+ThdWqHMg=="; }; }; "dom-converter-0.2.0" = { @@ -22137,15 +22218,6 @@ let sha512 = "LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA=="; }; }; - "dom-helpers-5.2.1" = { - name = "dom-helpers"; - packageName = "dom-helpers"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz"; - sha512 = "nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="; - }; - }; "dom-serialize-2.2.1" = { name = "dom-serialize"; packageName = "dom-serialize"; @@ -22308,13 +22380,13 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.2.0" = { + "domhandler-4.2.2" = { name = "domhandler"; packageName = "domhandler"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz"; - sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; + sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; }; }; "domino-2.1.6" = { @@ -22362,13 +22434,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.7.0" = { + "domutils-2.8.0" = { name = "domutils"; packageName = "domutils"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"; - sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; }; "dot-case-3.0.4" = { @@ -22812,22 +22884,22 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.2.2" = { + "electron-13.3.0" = { name = "electron"; packageName = "electron"; - version = "13.2.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.2.2.tgz"; - sha512 = "thGq2YaZqQWK1HexRghxdb26a8hA7ZSebukUSHlnHrY9+Sx9rW7e3uEHbibk/seRXVoXO76HndjKdHyObP9/Kw=="; + url = "https://registry.npmjs.org/electron/-/electron-13.3.0.tgz"; + sha512 = "d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA=="; }; }; - "electron-notarize-1.1.0" = { + "electron-notarize-1.1.1" = { name = "electron-notarize"; packageName = "electron-notarize"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.0.tgz"; - sha512 = "Dmp/jm2y3PTcjmjVe+jCT0sjsbBfbNuk7GOPtduZce2iae1hgAPnlNErk6x70TalsGIL5Ip3liSryqde/6eB5w=="; + url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz"; + sha512 = "kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw=="; }; }; "electron-osx-sign-0.5.0" = { @@ -22848,22 +22920,22 @@ let sha512 = "PHcykXinmjPyJcYoNGbOWNsOU25nIbMLHBAfg4caazWzYELFL14FshDZEqqrvVOMEUnqjx/Ktc1NmMIN5ZRomQ=="; }; }; - "electron-rebuild-2.3.5" = { + "electron-rebuild-3.2.3" = { name = "electron-rebuild"; packageName = "electron-rebuild"; - version = "2.3.5"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-2.3.5.tgz"; - sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; + url = "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.3.tgz"; + sha512 = "9oxNmKlDCaf651c+yJWCDIBpF6A9aY+wQtasLEeR5AsPYPuOKEX6xHnC2+WgCLOC94JEpCZznecyC84fbwZq4A=="; }; }; - "electron-to-chromium-1.3.818" = { + "electron-to-chromium-1.3.833" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.818"; + version = "1.3.833"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.818.tgz"; - sha512 = "c/Z9gIr+jDZAR9q+mn40hEc1NharBT+8ejkarjbCDnBNFviI6hvcC5j2ezkAXru//bTnQp5n6iPi0JA83Tla1Q=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.833.tgz"; + sha512 = "h+9aVaUHjyunLqtCjJF2jrJ73tYcJqo2cCGKtVAXH9WmnBsb8hiChRQ0P1uXjdxR6Wcfxibephy41c1YlZA/pA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23219,6 +23291,15 @@ let sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; }; }; + "engine.io-5.2.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-5.2.0.tgz"; + sha512 = "d1DexkQx87IFr1FLuV+0f5kAm1Hk1uOVijLOb+D1sDO2QMb7YjE02VHtZtxo7xIXMgcWLb+vl3HRT0rI9tr4jQ=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -23264,13 +23345,13 @@ let sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; }; }; - "engine.io-parser-4.0.2" = { + "engine.io-parser-4.0.3" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz"; - sha512 = "sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.3.tgz"; + sha512 = "xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA=="; }; }; "enhanced-resolve-2.3.0" = { @@ -23525,13 +23606,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.18.5" = { + "es-abstract-1.18.6" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.5"; + version = "1.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz"; - sha512 = "DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz"; + sha512 = "kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ=="; }; }; "es-get-iterator-1.1.2" = { @@ -23903,13 +23984,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.16.0" = { + "eslint-plugin-vue-7.17.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.16.0"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.16.0.tgz"; - sha512 = "0E2dVvVC7I2Xm1HXyx+ZwPj9CNX4NJjs4K4r+GVsHWyt5Pew3JLD4fI7A91b2jeL0TXE7LlszrwLSTJU9eqehw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.17.0.tgz"; + sha512 = "Rq5R2QetDCgC+kBFQw1+aJ5B93tQ4xqZvoCUxuIzwTonngNArsdP8ChM8PowIzsJvRtWl4ltGh/bZcN3xhFWSw=="; }; }; "eslint-scope-3.7.3" = { @@ -24884,15 +24965,6 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; - "express-openapi-8.0.0" = { - name = "express-openapi"; - packageName = "express-openapi"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-8.0.0.tgz"; - sha512 = "MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg=="; - }; - }; "express-session-1.17.2" = { name = "express-session"; packageName = "express-session"; @@ -24920,6 +24992,15 @@ let sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f"; }; }; + "express-validator-6.12.1" = { + name = "express-validator"; + packageName = "express-validator"; + version = "6.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-validator/-/express-validator-6.12.1.tgz"; + sha512 = "olpTAv0ZB5IhNuDQ2rodKAuJsewgFgLIsczJMAWD6T0Yvxsa+j/Hk61jl8e26lAq+oJr6hUqPRjdlOBKhFlWeQ=="; + }; + }; "express-ws-2.0.0" = { name = "express-ws"; packageName = "express-ws"; @@ -25388,13 +25469,13 @@ let sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8"; }; }; - "fast-redact-3.0.1" = { + "fast-redact-3.0.2" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.0.1.tgz"; - sha512 = "kYpn4Y/valC9MdrISg47tZOpYBNoTXKgT9GYXFpHN/jYFs+lFkPoisY+LcBODdKVMY96ATzvzsWv+ES/4Kmufw=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.0.2.tgz"; + sha512 = "YN+CYfCVRVMUZOUPeinHNKgytM1wPI/C/UCLEi56EsY2dwwvI00kIJHJoI7pMVqGoMew8SMZ2SSfHKHULHXDsg=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -25406,13 +25487,13 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; - "fast-safe-stringify-2.0.8" = { + "fast-safe-stringify-2.1.1" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; - version = "2.0.8"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz"; - sha512 = "lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag=="; + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz"; + sha512 = "W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="; }; }; "fast-text-encoding-1.0.3" = { @@ -25487,13 +25568,13 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "faunadb-4.3.0" = { + "faunadb-4.4.1" = { name = "faunadb"; packageName = "faunadb"; - version = "4.3.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-4.3.0.tgz"; - sha512 = "H5ZnInUNLAvrjqDHYXmYX+S55HP8Ib85QbF/UK1fV/bz125unl7J7LbjqKvMGcREYqOvIrpQCaniK1LwAkXHTw=="; + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.4.1.tgz"; + sha512 = "1V2ve22T4Q45C3PBB+LD7Fpk4lVajbtxDXDpENsujC+LMe88LqBQ9brl5v5uB3sCTSVAX0fsGtuZ+N5x15vdoQ=="; }; }; "faye-websocket-0.10.0" = { @@ -25910,13 +25991,13 @@ let sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; - "filesize-7.0.0" = { + "filesize-8.0.0" = { name = "filesize"; packageName = "filesize"; - version = "7.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-7.0.0.tgz"; - sha512 = "Wsstw+O1lZ9gVmOI1thyeQvODsaoId2qw14lCqIzUhoHKXX7T2hVpB7BR6SvgodMBgWccrx/y2eyV8L7tDmY6A=="; + url = "https://registry.npmjs.org/filesize/-/filesize-8.0.0.tgz"; + sha512 = "sb690gQx3y/5KZIztgWAKM/r4Hf1V3R8mkAE0OhasMw2FDYduFTYCji8YN9BVpsGoMxrHPFvia1BMxwfLHX+fQ=="; }; }; "filestream-5.0.0" = { @@ -26018,13 +26099,13 @@ let sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; - "find-cache-dir-3.3.1" = { + "find-cache-dir-3.3.2" = { name = "find-cache-dir"; packageName = "find-cache-dir"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; + sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; "find-replace-1.0.3" = { @@ -26360,13 +26441,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.158.0" = { + "flow-parser-0.159.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.158.0"; + version = "0.159.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.158.0.tgz"; - sha512 = "0hMsPkBTRrkII/0YiG9ehOxFXy4gOWdk8RSRze5WbfeKAQpL5kC2K4BmumyTfU9o5gr7/llgElF3UpSSrjzQAA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.159.0.tgz"; + sha512 = "/AFSLMSbqictmgPm+vrXBD0rLTsVRrlKfiGRoDjt/WhhUxqy5ZMuLVHbRD/g3C3JRnJgDrKSb3+piQoM1dzVGw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26531,13 +26612,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.14.2" = { + "follow-redirects-1.14.3" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz"; - sha512 = "yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz"; + sha512 = "3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="; }; }; "follow-redirects-1.5.10" = { @@ -27125,15 +27206,6 @@ let sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; }; }; - "fs-routes-8.0.0" = { - name = "fs-routes"; - packageName = "fs-routes"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-8.0.0.tgz"; - sha512 = "EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ=="; - }; - }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -27341,31 +27413,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.12.0" = { + "gatsby-core-utils-2.13.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.12.0.tgz"; - sha512 = "aN9fub3XX/uEqAstxG3mr8BH6hMGhTmAzANZH3HSV4tyG1Y4a4FKisZA0ggmy/dKOy5cyeuoMHmzAr8+qtHcAw=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.13.0.tgz"; + sha512 = "fkMAxiWFY8N26Iui/Wq8yfE2FY2b31bGJVtlIlSwLgfsoO7fpta64lxeivRtfpNLbAoywmWY/L8TC74GFlnuWg=="; }; }; - "gatsby-recipes-0.23.0" = { + "gatsby-recipes-0.24.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.23.0.tgz"; - sha512 = "dR/u2mFiWhPf+0O8MuFfnl5JTbjOChYKG9+CIhubLwAjJN0cDbvleSJEQ7K32quKd56dqNf1psXqpZ+UUlx8vA=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.24.0.tgz"; + sha512 = "azDY4tnOCy5/CK+Kv53CBIgzmEroAGe/mLaiW2PuizTQIdhoY3lg63ZXK6kPQHAq1F4qAYHGkBM4ECgSfaq5HA=="; }; }; - "gatsby-telemetry-2.12.0" = { + "gatsby-telemetry-2.13.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.12.0.tgz"; - sha512 = "W27oKt7/ThrNz12lPiclb9J7v/Q6ZM5Eh+JQ5w/TRFs4vqLOsfJZxmYG2HzFvAZtoFUB1JsbvmHZDMxUtR84Uw=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.13.0.tgz"; + sha512 = "PN9kKbZd0i2QkoVvHyCa3VjuRVIvBwjXTyZHwL+se5yrbYufZQXoyMiMMXFV48FvxMgE53ON1U2vtzeRvE8U2w=="; }; }; "gauge-1.2.7" = { @@ -27395,13 +27467,13 @@ let sha512 = "6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ=="; }; }; - "gaxios-4.3.0" = { + "gaxios-4.3.1" = { name = "gaxios"; packageName = "gaxios"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.0.tgz"; - sha512 = "pHplNbslpwCLMyII/lHPWFQbJWOX0B3R1hwBEOvzYi1GmdKZruuEHK4N9V6f7tf1EaPYyF80mui1+344p6SmLg=="; + url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.1.tgz"; + sha512 = "9qXV7yrMCGzTrphl9/YGMVH41oSg0rhn1j3wJWed4Oqk45/hXDD2wBT5J1NjQcqTCcv4g3nFnyQ7reSRHNgBgw=="; }; }; "gaze-1.1.3" = { @@ -27422,13 +27494,13 @@ let sha512 = "4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA=="; }; }; - "gcp-metadata-4.3.0" = { + "gcp-metadata-4.3.1" = { name = "gcp-metadata"; packageName = "gcp-metadata"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.0.tgz"; - sha512 = "L9XQUpvKJCM76YRSmcxrR4mFPzPGsgZUH+GgHMxAET8qc6+BhRJq63RLhWakgEO2KKVgeSDVfyiNjkGSADwNTA=="; + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz"; + sha512 = "x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A=="; }; }; "gelf-stream-1.1.1" = { @@ -27593,13 +27665,13 @@ let sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; }; - "get-pkg-repo-4.1.2" = { + "get-pkg-repo-4.2.1" = { name = "get-pkg-repo"; packageName = "get-pkg-repo"; - version = "4.1.2"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.1.2.tgz"; - sha512 = "/FjamZL9cBYllEbReZkxF2IMh80d8TJoC4e3bmLNif8ibHw95aj0N/tzqK0kZz9eU/3w3dL6lF4fnnX/sDdW3A=="; + url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz"; + sha512 = "2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA=="; }; }; "get-port-3.2.0" = { @@ -27728,6 +27800,15 @@ let sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; }; + "get-symbol-description-1.0.0" = { + name = "get-symbol-description"; + packageName = "get-symbol-description"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; + sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + }; + }; "get-uri-3.0.2" = { name = "get-uri"; packageName = "get-uri"; @@ -27935,13 +28016,13 @@ let sha512 = "YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA=="; }; }; - "git-url-parse-11.5.0" = { + "git-url-parse-11.6.0" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.5.0"; + version = "11.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.5.0.tgz"; - sha512 = "TZYSMDeM37r71Lqg1mbnMlOqlHd7BSij9qN7XwTkRqSAYFMihGLGhfHwgqQob3GUhEneKnV4nskN9rbQw2KGxA=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz"; + sha512 = "WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g=="; }; }; "gitconfiglocal-1.0.0" = { @@ -28512,6 +28593,15 @@ let sha512 = "TDwMwK7j0vU/aOlQIkL6WqrYoFBOAYnJ9l2ueK3d60IHspycYKPyO9yBaX1bzsaS7nBH5YjuXBYncZK+12TSZQ=="; }; }; + "goldengate-10.4.0" = { + name = "goldengate"; + packageName = "goldengate"; + version = "10.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.4.0.tgz"; + sha512 = "GWQgk3aaev6LVJbaRHZVWKSE7l+mAkcN9dMwdWgC1LU36CdA7Z/5n2LmdZvkmi2M47+Eog3/4rQfnK1r1I0vQA=="; + }; + }; "gonzales-pe-4.3.0" = { name = "gonzales-pe"; packageName = "gonzales-pe"; @@ -28530,13 +28620,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.6.2" = { + "google-auth-library-7.9.1" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.6.2"; + version = "7.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.6.2.tgz"; - sha512 = "yvEnwVsvgH8RXTtpf6e84e7dqIdUEKJhmQvTJwzYP+RDdHjLrDp9sk2u2ZNDJPLKZ7DJicx/+AStcQspJiq+Qw=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.1.tgz"; + sha512 = "cWGykH2WBR+UuYPGRnGVZ6Cjq2ftQiEIFjQWNIRIauZH7hUWoYTr/lkKUqLTYt5dex77nlWWVQ8aPV80mhfp5w=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -28548,13 +28638,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.24.2" = { + "google-gax-2.25.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.24.2"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.24.2.tgz"; - sha512 = "4OtyEIt/KAXRX5o2W/6DGf8MnMs1lMXwcGoPHR4PwXfTUVKjK7ywRe2/yRIMkYEDzAwu/kppPgfpX+kCG2rWfw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.25.1.tgz"; + sha512 = "wvirrn34kKe42NRF9uy68ukM/2CWT2ce3abS2SOJaMe7Ecdya1Zcd54WAX9WAWnD0WoAfieeibD4o1Ijue8iJw=="; }; }; "google-p12-pem-3.1.2" = { @@ -28755,13 +28845,13 @@ let sha512 = "h5mJWgZXpuZQzBAMWhVIOluGNIYUP043eh7BHcecRWhSkD4eiZAh+uM4XX2rGL1vig9XQ3JVYl9gmK+ajy+JPA=="; }; }; - "graphology-types-0.19.3" = { + "graphology-types-0.19.4" = { name = "graphology-types"; packageName = "graphology-types"; - version = "0.19.3"; + version = "0.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.3.tgz"; - sha512 = "N9zuoXkhoEhx/7FaMlMTgHqPl17Mcub67YHLk0d+i8mOSsxpD9kLzvUwUo5v39xeoOUqRb3rC0Y2h9zTssZUGg=="; + url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.4.tgz"; + sha512 = "jBRgWBKCVzoSMmQh7I5KsPQcOai4FJLNdhPBtSTRfVcyafGZHxwt80z5EftRB6ZSyTiBqiolzu7n1CZEnRkAHA=="; }; }; "graphql-0.11.7" = { @@ -28800,13 +28890,13 @@ let sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; - "graphql-15.5.1" = { + "graphql-15.5.3" = { name = "graphql"; packageName = "graphql"; - version = "15.5.1"; + version = "15.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-15.5.1.tgz"; - sha512 = "FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw=="; + url = "https://registry.npmjs.org/graphql/-/graphql-15.5.3.tgz"; + sha512 = "sM+jXaO5KinTui6lbK/7b7H/Knj9BpjGxZ+Ki35v7YbUJxxdBCUqNM0h3CRVU1ZF9t5lNiBzvBCSYPvIwxPOQA=="; }; }; "graphql-compose-7.25.1" = { @@ -29232,6 +29322,15 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; + "has-ansi-4.0.1" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-4.0.1.tgz"; + sha512 = "Qr4RtTm30xvEdqUXbSBVWDu+PrTokJOwe/FU+VdfJPk+MXAPoeOzKpRyrDTnZIJwAkQ4oBLTU53nu0HrkF/Z2A=="; + }; + }; "has-bigints-1.0.1" = { name = "has-bigints"; packageName = "has-bigints"; @@ -30601,13 +30700,13 @@ let sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; }; }; - "hyperbee-1.6.2" = { + "hyperbee-1.6.3" = { name = "hyperbee"; packageName = "hyperbee"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.6.2.tgz"; - sha512 = "0pn4srJRD8edAOfJpSsdYGO9bwteD+A9OzHjjZZrfIdWZXXwtg862Wi/6L6JZhJ9ITfhlkEZTYJnOwi+wNwWqA=="; + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.6.3.tgz"; + sha512 = "Jn3i5IUrW/8Qv6xKCIJI38omFSZFhv8xnPk7YTlW90zBQJtwfA8qx3NSK27idrl11iXtmCAETnZRDZrmjlMywQ=="; }; }; "hypercore-7.7.1" = { @@ -30619,13 +30718,13 @@ let sha512 = "boEiPCK848pNGACW1j111tJApu530e/UPpwbHytJZlrVf3YdgUIP1KL3aSi5xJFLUnuO8GLGl4lIsSeH8TaQQA=="; }; }; - "hypercore-9.10.0" = { + "hypercore-9.11.0" = { name = "hypercore"; packageName = "hypercore"; - version = "9.10.0"; + version = "9.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-9.10.0.tgz"; - sha512 = "vMaUNcYvtiiXbnjjhj3YbBK/KZEofXfrajiJxJ8rlWVXSyh2fIJcyxTJewfh58IW5bVYNrBPui/CpPyBZiXuZQ=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-9.11.0.tgz"; + sha512 = "/HwisY6gwkdMkEtn0vHkxrdJt6C0TK2YrnN59fCjSL3msfGLWOJ4lQxG39n0Ehd1dRdDWCj27MaTMI8krLU/Cw=="; }; }; "hypercore-byte-stream-1.0.12" = { @@ -31897,13 +31996,13 @@ let sha512 = "UnU0bS3+cMA2UvYrF5RXp/Hm7v/nYiA3F0GVCOeRmDiZmXAt/eO7KdqyRzewopvhBlev7F7t7GZzRRYY1XE3xg=="; }; }; - "ioredis-4.27.8" = { + "ioredis-4.27.9" = { name = "ioredis"; packageName = "ioredis"; - version = "4.27.8"; + version = "4.27.9"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-4.27.8.tgz"; - sha512 = "AcMEevap2wKxNcYEybZ/Qp+MR2HbNNUwGjG4sVCC3cAJ/zR9HXKAkolXOuR6YcOGPf7DHx9mWb/JKtAGujyPow=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-4.27.9.tgz"; + sha512 = "hAwrx9F+OQ0uIvaJefuS3UTqW+ByOLyLIV+j0EH8ClNVxvFyH9Vmb08hCL4yje6mDYT5zMquShhypkd50RRzkg=="; }; }; "iota-array-1.0.0" = { @@ -32014,6 +32113,15 @@ let sha512 = "6ZMWB3JnCWT0gISUkzChcUEkJS6+LpGRU3h10f9Mfc0usVmyIcbcTN9+QPMg29gLOY8WtaKFbM5ME8qNySoh8g=="; }; }; + "irc-colors-1.5.0" = { + name = "irc-colors"; + packageName = "irc-colors"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irc-colors/-/irc-colors-1.5.0.tgz"; + sha512 = "HtszKchBQTcqw1DC09uD7i7vvMayHGM1OCo6AHt5pkgZEyo99ClhHTMJdf+Ezc9ovuNNxcH89QfyclGthjZJOw=="; + }; + }; "irc-framework-4.9.0" = { name = "irc-framework"; packageName = "irc-framework"; @@ -32032,6 +32140,15 @@ let sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; }; }; + "irc-upd-0.11.0" = { + name = "irc-upd"; + packageName = "irc-upd"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irc-upd/-/irc-upd-0.11.0.tgz"; + sha512 = "A1hV5cUkl5HZsKWRYcszD2Usfz33hB8igSSox8dEmrMyfy8/Ra6T/o4jwzs7jYMZ7ljLquSIWzcvSZHZ/bEAZA=="; + }; + }; "irregular-plurals-1.4.0" = { name = "irregular-plurals"; packageName = "irregular-plurals"; @@ -33256,13 +33373,13 @@ let sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; }; }; - "is-typed-array-1.1.7" = { + "is-typed-array-1.1.8" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.7.tgz"; - sha512 = "VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz"; + sha512 = "HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA=="; }; }; "is-typedarray-1.0.0" = { @@ -33886,13 +34003,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.0.6" = { + "jest-worker-27.1.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.0.6"; + version = "27.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz"; - sha512 = "qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz"; + sha512 = "XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA=="; }; }; "jimp-compact-0.16.1" = { @@ -34039,13 +34156,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-base64-3.6.1" = { + "js-base64-3.7.0" = { name = "js-base64"; packageName = "js-base64"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.6.1.tgz"; - sha512 = "Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.0.tgz"; + sha512 = "hJiXqoqZKdNx7PNuqHx3ZOgwcvgCprV0cs9ZMeqERshhVZ3cmXc3HGR60mKsHHqVK18PCwGXnmPiPDbao7SOMQ=="; }; }; "js-beautify-1.14.0" = { @@ -34354,13 +34471,13 @@ let sha512 = "GOGAy5b+zCGeyYziBoNVXgamL2CEZKMj5moeemkyN4AUHUqugNk3fSul2Zdbxs2S13Suk0D9iYAgChDxew0bOw=="; }; }; - "jsii-srcmak-0.1.335" = { + "jsii-srcmak-0.1.341" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.335"; + version = "0.1.341"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.335.tgz"; - sha512 = "9Htj62cspqqlxHw961LxHKL9YQv2+11BRXf8nQkxURWlRqbH+73iXzy8LaUvBTA52ZgEJffY38FuDjHv9gqhCw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.341.tgz"; + sha512 = "G8BUBXJDTXYsqpv5CWMSwYuGz21WdY1TRJZZVp+CIPTEbxCBc2nEJ41Ihsa1u8MCs9D1ddWGrX3JmZwqvMqUxw=="; }; }; "json-bigint-1.0.0" = { @@ -34651,13 +34768,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.7" = { + "json2jsii-0.2.17" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.7"; + version = "0.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.7.tgz"; - sha512 = "cOfUWGFat3g6v1cWJ6+yPDFkV9O802hp8AcJfPgp16FWeDMNgnIsaavSw+i3IPFns3Fap1O+Oj/8g6s1+NwCJg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.17.tgz"; + sha512 = "dU28KQ5UBvyGcc4QaQey98a2uTwwsnh+bP4EI6wnJjsCKjMKxSLFot1jwSCA/olaWIpJFGCIYif2IJ/0Dy5a8w=="; }; }; "json3-3.2.6" = { @@ -34723,13 +34840,13 @@ let sha512 = "oDPf7b6nFDKcX2qt5OLI/ZwGwH43qS/g2Z98UWo8ChoNtVMYdGa3Y48WHvjPqvNKnTUa2fOanvHFeE7ZxkiboQ=="; }; }; - "jsonata-1.8.4" = { + "jsonata-1.8.5" = { name = "jsonata"; packageName = "jsonata"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.4.tgz"; - sha512 = "OqzmM5IICtm/687zckG5BROZzInGCEuKojpYs48H8RnkII8Np+o912ryvhnYwsRrSI24TQRG/qqrSwBuaneDbg=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.5.tgz"; + sha512 = "ilDyTBkg6qhNoNVr8PUPzz5GYvRK+REKOM5MdOGzH2y6V4yvPRMegSvbZLpbTtI0QAgz09QM7drDhSHUlwp9pA=="; }; }; "jsonc-parser-1.0.3" = { @@ -34858,15 +34975,6 @@ let sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; }; }; - "jsonrpc2-ws-1.0.0-beta9" = { - name = "jsonrpc2-ws"; - packageName = "jsonrpc2-ws"; - version = "1.0.0-beta9"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonrpc2-ws/-/jsonrpc2-ws-1.0.0-beta9.tgz"; - sha512 = "0KA+ufhSy7gN2/jGXagXLz4V5m+vymmNTI5IpNBIUiunday45P6dspdaOO0wwt2JJyrACC/BKMH154OqsuB80w=="; - }; - }; "jsonschema-1.4.0" = { name = "jsonschema"; packageName = "jsonschema"; @@ -35210,13 +35318,13 @@ let sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug=="; }; }; - "katex-0.13.13" = { + "katex-0.13.18" = { name = "katex"; packageName = "katex"; - version = "0.13.13"; + version = "0.13.18"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz"; - sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.18.tgz"; + sha512 = "a3dC4NSVSDU3O1WZbTnOiA8rVNJ2lSiomOl0kmckCIGObccIHXof7gAseIY0o1gjEspe+34ZeSEX2D1ChFKIvA=="; }; }; "kdbush-3.0.0" = { @@ -35462,6 +35570,15 @@ let sha512 = "LOS0CoS8zcZnB1EjLw4LLqDXw8nvt3AGH5dXLQP3D9O1nLLA+9GC5GnPl5mmF+JiQAtSX4VyZC7KvEtcA4kUtA=="; }; }; + "koa-compose-4.2.0" = { + name = "koa-compose"; + packageName = "koa-compose"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.2.0.tgz"; + sha512 = "/Io2dpt3uU/wWkn2pkRBj3vudzsi6hMssGkREZCxLIczAIvLWy5Jw9PW7ctTxvcfXKCisbgsMLsgE1BvSZB6Kw=="; + }; + }; "kuler-1.0.1" = { name = "kuler"; packageName = "kuler"; @@ -36074,6 +36191,24 @@ let sha512 = "ngS2829bxBMgK/MFanm6jypvpIbxzxBX/vFbUKyFrj3MxcSKvMQzr1sXRppYxZXHwOuqyiN91QnaKNg3upQ9sg=="; }; }; + "lightning-4.1.3" = { + name = "lightning"; + packageName = "lightning"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.1.3.tgz"; + sha512 = "DI21mqAdwBM/Os3pcAnBrpUCoaKQzJFTEv2c+DEJUzPBnpxRGGKGurlT5FDz9QZSTag7YgBb5ghsqtjQ2MlFWg=="; + }; + }; + "lightning-4.2.1" = { + name = "lightning"; + packageName = "lightning"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.2.1.tgz"; + sha512 = "ltYLcoJcGjL9yuBpoZfi8tLZ+SwInX3l/BrZIK1d14Wlk0dAu8jhLPClPDm0kt91HULpnynl/xxeOPVdQqdsHA=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -36218,13 +36353,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-5.0.0" = { + "ln-accounting-5.0.1" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.0.tgz"; - sha512 = "iKvNJI8qRv5O7rI3m7ARXTg9fergI3AEx2RqnB3A/dTo80zt78+x57zyBw7WmqE/BiV5eJ4kyOw1lIx1N0eC1g=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.1.tgz"; + sha512 = "5hHO3/ZdKwVicDpgU0ElDnSqKSrqx9Cz7eD6r/3STjqLnLuOjj9/ILzPOgY3lPyD7j3gHifzuJg5dUx2Bxh0sg=="; }; }; "ln-service-51.8.2" = { @@ -36254,6 +36389,24 @@ let sha512 = "ETL/rpidWMS7nCsZoRb3/0vU5nk7RE1PRtn3YBnmUWJcdhjREPhQRLHm7/vZ+JFRdAwvW7V/lqCvOkDZXCKo6w=="; }; }; + "ln-service-52.0.3" = { + name = "ln-service"; + packageName = "ln-service"; + version = "52.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.0.3.tgz"; + sha512 = "upswAJU9Mrfh3l+q46rvmRu8Pf7iYR2vkKyq16dgiBgxKw7fzvI8aL2Xi0xrtyoRUOUODOyEzO7/MRRhNKcvMA=="; + }; + }; + "ln-service-52.1.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "52.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.1.0.tgz"; + sha512 = "xB+Si8fQoHpmJWQDA3JFVxs/xV/c26OU2NsnkIRcbNQagwQtSKV08fcwbfKs3tpZLHQiyzmKos4XF82TfYtzeA=="; + }; + }; "ln-sync-0.4.7" = { name = "ln-sync"; packageName = "ln-sync"; @@ -37604,13 +37757,13 @@ let sha1 = "ec6662e4896408ed4ab6c542a3990b72cc080020"; }; }; - "log-6.0.0" = { + "log-6.1.0" = { name = "log"; packageName = "log"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/log/-/log-6.0.0.tgz"; - sha512 = "sxChESNYJ/EcQv8C7xpmxhtTOngoXuMEqGDAkhXBEmt3MAzM3SM/TmIBOqnMEVdrOv1+VgZoYbo6U2GemQiU4g=="; + url = "https://registry.npmjs.org/log/-/log-6.1.0.tgz"; + sha512 = "ZulFTrSNfKd8AlMNhl2sQ/jphhTReGeYYsB/ABV1u3jADp2wedQ7+uhSaXlBdu3VMM5PS0ribMFb0UJMesaGng=="; }; }; "log-driver-1.2.7" = { @@ -37622,6 +37775,15 @@ let sha512 = "U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="; }; }; + "log-node-8.0.0" = { + name = "log-node"; + packageName = "log-node"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-node/-/log-node-8.0.0.tgz"; + sha512 = "ogrmq+slTOCXG6TMgXxZ2lkfm00CrnO8LLgvqpvEzDhzJ/DmOCGj2AlSjEClk36k7S4k1HNw3WLwF2nqx15SKQ=="; + }; + }; "log-process-errors-6.3.0" = { name = "log-process-errors"; packageName = "log-process-errors"; @@ -38090,6 +38252,15 @@ let sha1 = "f35ca91c493f7b73da0e07495304f17b31f87ee5"; }; }; + "ltx-2.10.0" = { + name = "ltx"; + packageName = "ltx"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ltx/-/ltx-2.10.0.tgz"; + sha512 = "RB4zR6Mrp/0wTNS9WxMvpgfht/7u/8QAC9DpPD19opL/4OASPa28uoliFqeDkLUU8pQ4aeAfATBZmz1aSAHkMw=="; + }; + }; "lunr-2.3.9" = { name = "lunr"; packageName = "lunr"; @@ -38108,13 +38279,13 @@ let sha512 = "ZRioYLCgRHrtTORaZX1mx+jtxKtKuI5ZDvHNAmqpUzGqSrR+tL4FVLn/CUGMA3h0+AKD1MAxGI5GnCqR5txNqg=="; }; }; - "lzma-native-6.0.1" = { + "lzma-native-8.0.1" = { name = "lzma-native"; packageName = "lzma-native"; - version = "6.0.1"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lzma-native/-/lzma-native-6.0.1.tgz"; - sha512 = "O6oWF0xe1AFvOCjU8uOZBZ/lhjaMNwHfVNaqVMqmoQXlRwBcFWpCAToiZOdXcKVMdo/5s/D0a2QgA5laMErxHQ=="; + url = "https://registry.npmjs.org/lzma-native/-/lzma-native-8.0.1.tgz"; + sha512 = "Ryr9X3yDVZhRYOxR8QhUBCNe6GdEfy9BvFDIFtUvEkocvSvnrYt9lRm6FR1z0eQn0QSMenrgrDIJRMgUf9zsKQ=="; }; }; "macaroon-3.0.4" = { @@ -39269,15 +39440,6 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; - "mem-8.1.1" = { - name = "mem"; - packageName = "mem"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"; - sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; - }; - }; "mem-fs-2.2.1" = { name = "mem-fs"; packageName = "mem-fs"; @@ -39296,13 +39458,13 @@ let sha512 = "QKFbPwGCh1ypmc2H8BUYpbapwT/x2AOCYZQogzSui4rUNes7WVMagQXsirPIfp18EarX0SSY9Fpg426nSjew4Q=="; }; }; - "memfs-3.2.2" = { + "memfs-3.2.4" = { name = "memfs"; packageName = "memfs"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz"; - sha512 = "RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q=="; + url = "https://registry.npmjs.org/memfs/-/memfs-3.2.4.tgz"; + sha512 = "2mDCPhuduRPOxlfgsXF9V+uqC6Jgz8zt/bNe4d4W7d5f6pCzHrWkxLNr17jKGXd4+j2kQNsAG2HARPnt74sqVQ=="; }; }; "memoize-one-5.2.1" = { @@ -39566,13 +39728,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.12.0" = { + "mermaid-8.12.1" = { name = "mermaid"; packageName = "mermaid"; - version = "8.12.0"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.12.0.tgz"; - sha512 = "YegtLgtdpnd+y7J9gfSfFkD7T3G7cXQ6orOL7x4jAx6SWyJSMAQIb34JBKuhagXNsi34nK6gpfHbv63Br7246g=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.12.1.tgz"; + sha512 = "0UCcSF0FLoNcPBsRF4f9OIV32t41fV18//z8o3S+FDz2PbDA1CRGKdQF9IX84VP4Tv9kcgJI/oqJdcBEtB/GPA=="; }; }; "meros-1.1.4" = { @@ -40286,13 +40448,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.3.4" = { + "minipass-fetch-1.4.1" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.3.4"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz"; - sha512 = "TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; + sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; "minipass-flush-1.0.5" = { @@ -40493,13 +40655,13 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.3.2" = { + "mobx-6.3.3" = { name = "mobx"; packageName = "mobx"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.3.2.tgz"; - sha512 = "xGPM9dIE1qkK9Nrhevp0gzpsmELKU4MFUJRORW/jqxVFIHHWIoQrjDjL8vkwoJYY3C2CeVJqgvl38hgKTalTWg=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.3.3.tgz"; + sha512 = "JoNU50rO6d1wHwKPJqKq4rmUMbYnI9CsJmBo+Cu4exBYenFvIN77LWrZENpzW6reZPADtXMmB1DicbDSfy8Clw=="; }; }; "mobx-react-7.2.0" = { @@ -40511,13 +40673,13 @@ let sha512 = "KHUjZ3HBmZlNnPd1M82jcdVsQRDlfym38zJhZEs33VxyVQTvL77hODCArq6+C1P1k/6erEeo2R7rpE7ZeOL7dg=="; }; }; - "mobx-react-lite-3.2.0" = { + "mobx-react-lite-3.2.1" = { name = "mobx-react-lite"; packageName = "mobx-react-lite"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.2.0.tgz"; - sha512 = "q5+UHIqYCOpBoFm/PElDuOhbcatvTllgRp3M1s+Hp5j0Z6XNgDbgqxawJ0ZAUEyKM8X1zs70PCuhAIzX1f4Q/g=="; + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.2.1.tgz"; + sha512 = "hwURgfmP2apX3HQrB55V9DN47kuN3C6KlQvI5UIfJRibXma72C/JudcNt2r9dWjAdFMrcZoz1ivvtXMCkJ2aQA=="; }; }; "mocha-2.5.3" = { @@ -40547,13 +40709,13 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.1.0" = { + "mocha-9.1.1" = { name = "mocha"; packageName = "mocha"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.0.tgz"; - sha512 = "Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz"; + sha512 = "0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA=="; }; }; "mock-require-3.0.3" = { @@ -40610,13 +40772,13 @@ let sha1 = "114c949673e2a8a35e9d35788527aa37b679da2b"; }; }; - "moize-6.0.3" = { + "moize-6.1.0" = { name = "moize"; packageName = "moize"; - version = "6.0.3"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/moize/-/moize-6.0.3.tgz"; - sha512 = "7Jz9TSiqW9G2u8HwUWnaBQMFMPLblrWKEiWN4BA/GPOfQlsnfQqq0yRnTGHckGPlKApA9Eu1HPb/eTqvK9EtKg=="; + url = "https://registry.npmjs.org/moize/-/moize-6.1.0.tgz"; + sha512 = "WrMcM+C2Jy+qyOC/UMhA3BCHGowxV34dhDZnDNfxsREW/8N+33SFjmc23Q61Xv1WUthUA1vYopTitP1sZ5jkeg=="; }; }; "mold-source-map-0.4.0" = { @@ -41708,13 +41870,13 @@ let sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; }; }; - "needle-2.9.0" = { + "needle-2.9.1" = { name = "needle"; packageName = "needle"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.9.0.tgz"; - sha512 = "UBLC4P8w9to3rAhWOQYXIXzTUio9yVnDzIeKxfGbF+Hngy+2bXTqqFK+6nF42EAQKfJdezXK6vzMsefUa1Y3ag=="; + url = "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"; + sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; }; }; "negotiator-0.3.0" = { @@ -42042,13 +42204,13 @@ let sha512 = "0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="; }; }; - "node-abi-2.30.0" = { + "node-abi-2.30.1" = { name = "node-abi"; packageName = "node-abi"; - version = "2.30.0"; + version = "2.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz"; - sha512 = "g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; "node-addon-api-1.7.2" = { @@ -42096,6 +42258,15 @@ let sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; }; + "node-api-version-0.1.4" = { + name = "node-api-version"; + packageName = "node-api-version"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz"; + sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; + }; + }; "node-appc-1.1.2" = { name = "node-appc"; packageName = "node-appc"; @@ -42232,6 +42403,15 @@ let sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; }; + "node-fetch-2.6.2" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz"; + sha512 = "aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="; + }; + }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -43141,13 +43321,13 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; - "npmlog-5.0.0" = { + "npmlog-5.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.0.tgz"; - sha512 = "ftpIiLjerL2tUg3dCqN8pOSoB90gqZlzv/gaZoxHaKjeLClrfJIEQ1Pdxi6qSzflz916Bljdy8dTWQ4J7hAFSQ=="; + url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; + sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; "nprogress-0.2.0" = { @@ -43511,6 +43691,15 @@ let sha512 = "jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg=="; }; }; + "object-path-0.11.7" = { + name = "object-path"; + packageName = "object-path"; + version = "0.11.7"; + src = fetchurl { + url = "https://registry.npmjs.org/object-path/-/object-path-0.11.7.tgz"; + sha512 = "T4evaK9VfGGQskXBDILcn6F90ZD+WO3OwRFFQ2rmZdUH4vQeDBpiolTpVlPY2yj5xSepyILTjDyM6UvbbdHMZw=="; + }; + }; "object-to-arguments-0.0.8" = { name = "object-to-arguments"; packageName = "object-to-arguments"; @@ -43709,13 +43898,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.174.1" = { + "office-ui-fabric-react-7.175.2" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.174.1"; + version = "7.175.2"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.174.1.tgz"; - sha512 = "zRUpUqZtVncvb+Tt+5SVNEcI3MfpwTLU+v2u7ZdF9ukPbD+UBKJSkIbydyO0P2S5jVizgdqioSOarfUA70ICvw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.175.2.tgz"; + sha512 = "8D57MG+F4m8aTbV4M9oeFQNdu8NNYSV8yI9wSL20FmdeYSCddqhrxW/JqivJMiDBn1Y4+dnjXLRahudUbePBQQ=="; }; }; "omggif-1.0.10" = { @@ -43988,15 +44177,6 @@ let sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; }; }; - "openapi-default-setter-8.0.0" = { - name = "openapi-default-setter"; - packageName = "openapi-default-setter"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; - sha512 = "Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA=="; - }; - }; "openapi-framework-0.26.0" = { name = "openapi-framework"; packageName = "openapi-framework"; @@ -44015,15 +44195,6 @@ let sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ=="; }; }; - "openapi-framework-8.0.0" = { - name = "openapi-framework"; - packageName = "openapi-framework"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-8.0.0.tgz"; - sha512 = "T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ=="; - }; - }; "openapi-jsonschema-parameters-1.2.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; @@ -44042,15 +44213,6 @@ let sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; }; }; - "openapi-jsonschema-parameters-8.0.0" = { - name = "openapi-jsonschema-parameters"; - packageName = "openapi-jsonschema-parameters"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; - sha512 = "yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA=="; - }; - }; "openapi-request-coercer-2.4.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; @@ -44069,15 +44231,6 @@ let sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw=="; }; }; - "openapi-request-coercer-8.0.0" = { - name = "openapi-request-coercer"; - packageName = "openapi-request-coercer"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; - sha512 = "CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw=="; - }; - }; "openapi-request-validator-4.2.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; @@ -44096,15 +44249,6 @@ let sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; }; }; - "openapi-request-validator-8.0.0" = { - name = "openapi-request-validator"; - packageName = "openapi-request-validator"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; - sha512 = "7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ=="; - }; - }; "openapi-response-validator-4.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; @@ -44123,15 +44267,6 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-response-validator-8.0.0" = { - name = "openapi-response-validator"; - packageName = "openapi-response-validator"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; - sha512 = "h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA=="; - }; - }; "openapi-sampler-1.1.0" = { name = "openapi-sampler"; packageName = "openapi-sampler"; @@ -44159,15 +44294,6 @@ let sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; }; }; - "openapi-schema-validator-8.0.0" = { - name = "openapi-schema-validator"; - packageName = "openapi-schema-validator"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; - sha512 = "cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA=="; - }; - }; "openapi-security-handler-2.0.4" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; @@ -44186,15 +44312,6 @@ let sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; }; }; - "openapi-security-handler-8.0.0" = { - name = "openapi-security-handler"; - packageName = "openapi-security-handler"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; - sha512 = "XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw=="; - }; - }; "openapi-to-graphql-2.2.5" = { name = "openapi-to-graphql"; packageName = "openapi-to-graphql"; @@ -44240,15 +44357,6 @@ let sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; - "openapi-types-8.0.0" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz"; - sha512 = "dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="; - }; - }; "openapi3-ts-2.0.1" = { name = "openapi3-ts"; packageName = "openapi3-ts"; @@ -46688,13 +46796,13 @@ let sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; }; }; - "plist-3.0.3" = { + "plist-3.0.4" = { name = "plist"; packageName = "plist"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.0.3.tgz"; - sha512 = "ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA=="; + url = "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz"; + sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; }; }; "plist-with-patches-0.5.1" = { @@ -47805,13 +47913,13 @@ let sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; }; }; - "prettier-2.3.2" = { + "prettier-2.4.0" = { name = "prettier"; packageName = "prettier"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz"; - sha512 = "lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz"; + sha512 = "DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ=="; }; }; "prettier-bytes-1.0.4" = { @@ -49587,13 +49695,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.163" = { + "pyright-1.1.166" = { name = "pyright"; packageName = "pyright"; - version = "1.1.163"; + version = "1.1.166"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.163.tgz"; - sha512 = "CU0WPzr+6ZKIqCqqVrOtxMFWdzdOV18zKmC7dVBzp3snuun8JafnnmUzNJpO8IJLN/bQNSLb3riLtXFM/8Xxbg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.166.tgz"; + sha512 = "mO+iPT2dhHzlplAV3iKE6u4gUstGZxxLyMSRd1PKZqWhwhTCCGjn3/7VqbAwUt4fuhY8g0V+SAsu+MPT4H3FvQ=="; }; }; "q-0.9.7" = { @@ -50388,13 +50496,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.17.0" = { + "react-devtools-core-4.18.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.17.0.tgz"; - sha512 = "+9/aF7Gc8gswkAsoyUyQdIrhKHY/hOaMdK0oPIHuxzckJC5Cd4R1Mx75DKaqn84znwrYvXQ65kAseA+X44jMTw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.18.0.tgz"; + sha512 = "Kg/LhDkdt9J0ned1D1RfeuSdX4cKW83/valJLYswGdsYc0g2msmD0kfYozsaRacjDoZwcKlxGOES1wrkET5O6Q=="; }; }; "react-dom-16.14.0" = { @@ -50559,13 +50667,31 @@ let sha512 = "dBUC6afvSAQhDcE4oh1eTmfU29W0O2eZhcGXnfGUTulXkU8ejuWqlJWXXrSMx5iV1H6LNgj2NJMj3BtBMfBNhA=="; }; }; - "react-virtualized-9.22.3" = { - name = "react-virtualized"; - packageName = "react-virtualized"; - version = "9.22.3"; + "react-virtualized-auto-sizer-1.0.6" = { + name = "react-virtualized-auto-sizer"; + packageName = "react-virtualized-auto-sizer"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz"; + sha512 = "7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ=="; + }; + }; + "react-window-1.8.6" = { + name = "react-window"; + packageName = "react-window"; + version = "1.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz"; + sha512 = "8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg=="; + }; + }; + "react-window-infinite-loader-1.0.7" = { + name = "react-window-infinite-loader"; + packageName = "react-window-infinite-loader"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.3.tgz"; - sha512 = "MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw=="; + url = "https://registry.npmjs.org/react-window-infinite-loader/-/react-window-infinite-loader-1.0.7.tgz"; + sha512 = "wg3LWkUpG21lhv+cZvNy+p0+vtclZw+9nP2vO6T9PKT50EN1cUq37Dq6FzcM38h/c2domE0gsUhb6jHXtGogAA=="; }; }; "read-1.0.7" = { @@ -50667,13 +50793,13 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-4.0.1" = { + "read-package-json-4.1.1" = { name = "read-package-json"; packageName = "read-package-json"; - version = "4.0.1"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.0.1.tgz"; - sha512 = "czqCcYfkEl6sIFJVOND/5/Goseu7cVw1rcDUATq6ED0jLGjMm9/HOPmFmEZMvRu9yl272YERaMUcOlvcNU9InQ=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz"; + sha512 = "P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw=="; }; }; "read-package-json-fast-2.0.3" = { @@ -52323,6 +52449,15 @@ let sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA=="; }; }; + "request-light-0.5.4" = { + name = "request-light"; + packageName = "request-light"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/request-light/-/request-light-0.5.4.tgz"; + sha512 = "t3566CMweOFlUk7Y1DJMu5OrtpoZEb6aSTsLQVT3wtrIEJ5NhcY9G/Oqxvjllzl4a15zXfFlcr9q40LbLVQJqw=="; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -52530,13 +52665,13 @@ let sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; }; - "resolve-alpn-1.2.0" = { + "resolve-alpn-1.2.1" = { name = "resolve-alpn"; packageName = "resolve-alpn"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz"; - sha512 = "e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA=="; + url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; + sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; }; }; "resolve-cwd-2.0.0" = { @@ -53628,13 +53763,49 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.38.1" = { + "sasl-anonymous-0.1.0" = { + name = "sasl-anonymous"; + packageName = "sasl-anonymous"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz"; + sha1 = "f544c7e824df2a40d9ad4733829572cc8d9ed5a5"; + }; + }; + "sasl-plain-0.1.0" = { + name = "sasl-plain"; + packageName = "sasl-plain"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sasl-plain/-/sasl-plain-0.1.0.tgz"; + sha1 = "cf145e7c02222b64d60c0806d9cd2ae5380426cc"; + }; + }; + "sasl-scram-sha-1-1.2.1" = { + name = "sasl-scram-sha-1"; + packageName = "sasl-scram-sha-1"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz"; + sha1 = "d88d51feaa0ff320d8eb1d6fc75657653f9dcd4b"; + }; + }; + "saslmechanisms-0.1.1" = { + name = "saslmechanisms"; + packageName = "saslmechanisms"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/saslmechanisms/-/saslmechanisms-0.1.1.tgz"; + sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; + }; + }; + "sass-1.39.0" = { name = "sass"; packageName = "sass"; - version = "1.38.1"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.38.1.tgz"; - sha512 = "Lj8nPaSYOuRhgqdyShV50fY5jKnvaRmikUNalMPmbH+tKMGgEKVkltI/lP30PEfO2T1t6R9yc2QIBLgOc3uaFw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz"; + sha512 = "F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg=="; }; }; "sax-0.5.8" = { @@ -54789,13 +54960,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.44.0" = { + "simple-git-2.45.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.44.0"; + version = "2.45.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.44.0.tgz"; - sha512 = "wIjcAmymhzgdaM0Y/a+XxmNGlivvHQTPZDYXVmyHMShVDwdeVqu3+OOyDbYu0DnfVzqLs2EOxRTgMNbC3YquwQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.45.1.tgz"; + sha512 = "NmEoThiLTJxl26WNtZxtJTue18ReTcSrf3so5vJG/O8KY9uMxH+yAhXV/DElBJyOYZrrBbVsH8JOFxgENdc9Xg=="; }; }; "simple-handshake-3.0.0" = { @@ -54807,13 +54978,13 @@ let sha512 = "8Te0vlxvhpNCMgwnWFTbRR6Re2l8hq8wyXQc3lY9dPYXFxYwVkh79LhDQHFCOWRavmbiOdfqq1l5HT/73Rn2/w=="; }; }; - "simple-hypercore-protocol-2.1.1" = { + "simple-hypercore-protocol-2.1.2" = { name = "simple-hypercore-protocol"; packageName = "simple-hypercore-protocol"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-hypercore-protocol/-/simple-hypercore-protocol-2.1.1.tgz"; - sha512 = "xKuomRCfDDf+r6PDOD3RD88cjOLcbJ0E3Iz9Z+daB4Sq3FVv6efKYsOytgzTfSZMzkszF9EpYHGIILdVI669qA=="; + url = "https://registry.npmjs.org/simple-hypercore-protocol/-/simple-hypercore-protocol-2.1.2.tgz"; + sha512 = "zCwEMw/Evd5iDPkVEjO+1T3OJqbuDukJSuZtMZ7A7Wfn0RxmaJFbwngfUnDNyQFbPMxiINNxGBMD85fFJF8ghA=="; }; }; "simple-markdown-0.4.4" = { @@ -55140,15 +55311,6 @@ let sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="; }; }; - "smart-buffer-1.1.15" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "1.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; - sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; - }; - }; "smart-buffer-4.2.0" = { name = "smart-buffer"; packageName = "smart-buffer"; @@ -55338,13 +55500,13 @@ let sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; }; }; - "socket.io-adapter-2.3.1" = { + "socket.io-adapter-2.3.2" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz"; - sha512 = "8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz"; + sha512 = "PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg=="; }; }; "socket.io-client-1.0.6" = { @@ -55455,15 +55617,6 @@ let sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; }; }; - "socks-1.1.10" = { - name = "socks"; - packageName = "socks"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; - sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; - }; - }; "socks-2.6.1" = { name = "socks"; packageName = "socks"; @@ -55824,6 +55977,15 @@ let sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; + "source-map-support-0.5.20" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.20"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"; + sha512 = "n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="; + }; + }; "source-map-url-0.4.1" = { name = "source-map-url"; packageName = "source-map-url"; @@ -56256,6 +56418,33 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; + "ssb-bendy-butt-0.12.3" = { + name = "ssb-bendy-butt"; + packageName = "ssb-bendy-butt"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.3.tgz"; + sha512 = "fo3Sspdr+cjQzq8F+EKRJiibm06Mt/pzmtAjf0HEOl/pZPTHGFolfsGtZlU4U+RuKOqqZMhxzTXNAwoJ+trdDw=="; + }; + }; + "ssb-bfe-3.1.1" = { + name = "ssb-bfe"; + packageName = "ssb-bfe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; + sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + }; + }; + "ssb-bfe-spec-0.3.0" = { + name = "ssb-bfe-spec"; + packageName = "ssb-bfe-spec"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; + sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + }; + }; "ssb-blobs-1.2.2" = { name = "ssb-blobs"; packageName = "ssb-blobs"; @@ -56310,13 +56499,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.3.1" = { + "ssb-db2-2.4.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.3.1.tgz"; - sha512 = "SE/GGoLn29JJeeo/SLGzjtPj5xvafn6so8fBNqM0Hfnk03DwZ7iFG0PuB8L5CMold3sLLDXFjuzdacKf85848Q=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.4.0.tgz"; + sha512 = "UMd6XqBGTHBNPduyEc0ynO+lkCn/8/NTedzDz9XRYQsqk4ed2Js0cWhqeREv0Bz+upfCMmPQBBHASPBw47XTOA=="; }; }; "ssb-ebt-5.6.7" = { @@ -56553,6 +56742,15 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; + "ssb-typescript-2.5.0" = { + name = "ssb-typescript"; + packageName = "ssb-typescript"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz"; + sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA=="; + }; + }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -56562,6 +56760,15 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; + "ssb-uri2-1.5.2" = { + name = "ssb-uri2"; + packageName = "ssb-uri2"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.5.2.tgz"; + sha512 = "jlsN7w6/toFjcRZLDkCC3nq6+rKeS7NhUxZ+xGS1ASltenkudcZvdgczRb+L11ObFND4VCohkO21lVSAJV8hCQ=="; + }; + }; "ssb-validate-4.1.4" = { name = "ssb-validate"; packageName = "ssb-validate"; @@ -56598,13 +56805,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.54" = { + "sscaff-1.2.63" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.54"; + version = "1.2.63"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.54.tgz"; - sha512 = "092MKLW//UTJIFc8dnugvXKMgGsyiY/PP2C6MP1ThFRtwg58vH6TOfkVYo2OMxFqP7yBWJsc7VyIkzl8EiXpdQ=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.63.tgz"; + sha512 = "7T/JlrjNIc7kD+3mBvfE3JEpOAV0qstAEbCy3WOrMHWcgROAOESA9llkqQPcDQZB9bRV8JLqQIAgqVtpwljFOw=="; }; }; "ssh-config-1.1.6" = { @@ -58272,13 +58479,13 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; - "svelte-preprocess-4.8.0" = { + "svelte-preprocess-4.9.4" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.8.0"; + version = "4.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.8.0.tgz"; - sha512 = "i9Z17cwGlp+kuSSv3kJWdAdAP2L26A5yMzHHdDj8YL+86sN64Yz5/gfjQp3Xb6fiaToo4sB+wTpid/23Gz0yvw=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.4.tgz"; + sha512 = "Z0mUQBGtE+ZZSv/HerRSHe7ukJokxjiPeHe7iPOIXseEoRw51H3K/Vh6OMIMstetzZ11vWO9rCsXSD/uUUArmA=="; }; }; "svelte2tsx-0.4.5" = { @@ -58434,15 +58641,6 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.51.2" = { - name = "swagger-ui-dist"; - packageName = "swagger-ui-dist"; - version = "3.51.2"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.2.tgz"; - sha512 = "7aDfpvGrya61WQN4Eb6x5TELvYb5+7SRJQNYySkKUDGiRIwj1A8B2PNsXs4xMD0/5t8uNi4zW58KSofutcBdhw=="; - }; - }; "swagger2openapi-7.0.8" = { name = "swagger2openapi"; packageName = "swagger2openapi"; @@ -58578,13 +58776,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.8.6" = { + "systeminformation-5.8.7" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.8.6"; + version = "5.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.6.tgz"; - sha512 = "R37NZR9f6OejKvERiatjh1vK49xkJ/MOgFpwpCw2h0NoD+1nKAgGzxkyjNX7bsf6ADaKzyAZ2SFK1mXddytIaA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.7.tgz"; + sha512 = "e7b47PXn+GvPHLZm7FxC+IgPs5lqqsrmw7xtdxrr0U8aivYZO6V3CawMqCy5bfGB/ghZh/7AWlJEoXUPLyH3iw=="; }; }; "table-3.8.3" = { @@ -58813,15 +59011,6 @@ let sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; - "tar-6.1.2" = { - name = "tar"; - packageName = "tar"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.2.tgz"; - sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q=="; - }; - }; "tar-fs-1.16.3" = { name = "tar-fs"; packageName = "tar-fs"; @@ -59173,13 +59362,13 @@ let sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; }; }; - "terser-webpack-plugin-5.1.4" = { + "terser-webpack-plugin-5.2.4" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.1.4"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz"; - sha512 = "C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz"; + sha512 = "E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA=="; }; }; "test-exclude-6.0.0" = { @@ -59758,13 +59947,13 @@ let sha512 = "OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA=="; }; }; - "tmpl-1.0.4" = { + "tmpl-1.0.5" = { name = "tmpl"; packageName = "tmpl"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"; - sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz"; + sha512 = "3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="; }; }; "to-absolute-glob-2.0.2" = { @@ -60100,13 +60289,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.4.4" = { + "torrent-discovery-9.4.6" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.4"; + version = "9.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.4.tgz"; - sha512 = "psD/QcqSevMouHFbPKz4V9X5u2HuR/SaxeIp2T/JAduHKmDoq/pgxMQiAe/4DlhDgSCIAYWEB2xKP0dUTInBpQ=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.6.tgz"; + sha512 = "11FlrGmDvgD3RJhZLrC749yyqS7tKx3gXWbYN7xayVYsAcc6f8lQRQQIOF7TBgJE4f0e+ZS8dsct++aOlxFjRw=="; }; }; "torrent-piece-1.1.2" = { @@ -60289,13 +60478,13 @@ let sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; }; }; - "tree-kit-0.7.0" = { + "tree-kit-0.7.1" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.0.tgz"; - sha512 = "MAqFo2oJJ39zmxq3xETx0nMAgZw2z6pnJPjIAehEcrDaeePDhBBTshAlyhCDtezMDTIu1Av+vGE501xN3Sh8VA=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.1.tgz"; + sha512 = "7v5c7ipKxUBR0J3P+WCGg6WqbFV/2glYmTuibgQtyna1DaNJk5mSM3oxPC2AZ/xQN1dTbFWvih4aSbwSBDfx4Q=="; }; }; "tree-sitter-0.17.2" = { @@ -60379,15 +60568,6 @@ let sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; }; }; - "trim-off-newlines-1.0.1" = { - name = "trim-off-newlines"; - packageName = "trim-off-newlines"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; - sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; - }; - }; "trim-repeated-1.0.0" = { name = "trim-repeated"; packageName = "trim-repeated"; @@ -61018,13 +61198,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-rest-client-1.8.5" = { + "typed-rest-client-1.8.6" = { name = "typed-rest-client"; packageName = "typed-rest-client"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.5.tgz"; - sha512 = "952/Aegu3lTqUAI1anbDLbewojnF/gh8at9iy1CIrfS1h/+MtNjB1Y9z6ZF5n2kZd+97em56lZ9uu7Zz3y/pwg=="; + url = "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz"; + sha512 = "xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA=="; }; }; "typed-styles-0.0.7" = { @@ -61162,6 +61342,15 @@ let sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; }; + "typescript-4.4.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz"; + sha512 = "gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -61252,22 +61441,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.13.10" = { + "uglify-js-3.14.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.10"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.10.tgz"; - sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; + sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; }; }; - "uglify-js-3.14.1" = { + "uglify-js-3.14.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.1"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; - sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz"; + sha512 = "rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A=="; }; }; "uglify-js-3.4.10" = { @@ -62629,13 +62818,13 @@ let sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; }; }; - "usb-1.7.1" = { + "usb-1.7.2" = { name = "usb"; packageName = "usb"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/usb/-/usb-1.7.1.tgz"; - sha512 = "HTCfx6NnNRhv5y98t04Y8j2+A8dmQnEGxCMY2/zN/0gkiioLYfTZ5w/PEKlWRVUY+3qLe9xwRv9pHLkjQYNw/g=="; + url = "https://registry.npmjs.org/usb/-/usb-1.7.2.tgz"; + sha512 = "SfVSItgsD9+YfEpcK1UZ8tQ7e8GdxQ0xoQtB773omNBKTVj3IuFJNKjwSnpE58FGcV4tUoKLHmBMc018RUY5SA=="; }; }; "use-3.1.1" = { @@ -62999,15 +63188,6 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "uws-9.148.0" = { - name = "uws"; - packageName = "uws"; - version = "9.148.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-9.148.0.tgz"; - sha512 = "vWt+e8dOdwLM4neb1xIeZuQ7ZUN3l7n0qTKrOUtU1EZrV4BpmrSnsEL30d062/ocqRMGtLpwzVFsLKFgXomA9g=="; - }; - }; "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -63098,6 +63278,15 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; + "validator-13.6.0" = { + name = "validator"; + packageName = "validator"; + version = "13.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-13.6.0.tgz"; + sha512 = "gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg=="; + }; + }; "validator-5.7.0" = { name = "validator"; packageName = "validator"; @@ -63908,13 +64097,13 @@ let sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; }; }; - "vsce-1.96.1" = { + "vsce-1.97.0" = { name = "vsce"; packageName = "vsce"; - version = "1.96.1"; + version = "1.97.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.96.1.tgz"; - sha512 = "KnEVqjfc1dXrpZsbJ8J7B9VQ7GAAx8o5RqBNk42Srv1KF9+e2/aXchQHe9QZxeUs/FiliHoMGpGvnHTXwKIT2A=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.97.0.tgz"; + sha512 = "5Rxj6qO0dN4FnzVS9G94osstx8R3r1OQP39G7WYERpoO9X+OSodVVkRhFDapPNjekfUNo+d5Qn7W1EtNQVoLCg=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -63944,13 +64133,13 @@ let sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; }; }; - "vscode-css-languageservice-5.1.4" = { + "vscode-css-languageservice-5.1.5" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.4.tgz"; - sha512 = "fIJZJMXbaBsK0ifBb2RmSiLtzwn6NrZnKn7O+0ziIjwAY+rPvSK9St2qqQXFU3reZVRAt/I4GBp40dC/THcUDA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.5.tgz"; + sha512 = "c1hhsbnZ7bBvj10vMDLmkOk/n9r0rXQYDj4kbBi59bZaaEZ3e81zURx76/618NZM5NytlZmGfvmxQtB7mb03Ow=="; }; }; "vscode-debugadapter-testsupport-1.49.0" = { @@ -64007,13 +64196,13 @@ let sha512 = "UmC+GS0IqBeZnOAmdtQvaDzoH1c5/un+b7qALUziu/Y4SOPXso5dF+YkJeTqsde6YU2pLm78RtMDzl9BParwbw=="; }; }; - "vscode-html-languageservice-4.0.7" = { + "vscode-html-languageservice-4.0.8" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.7.tgz"; - sha512 = "P5TQMYpgxAdLs+PwpC7Lm+0lXCyQAC6kZ41YuPYNHVooC4XO7Y2+ncHBcQJVK4C9LU2cTOAl0lzq4WAxuwRHYw=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.8.tgz"; + sha512 = "VJ4boG3uOD5Ls0pCvml7ZkHY+f1uDuxr+wR39XrerPr7qQFAu91DRTBuOzBsp6lV3x5Vz2S835AS2ZzLNmezbg=="; }; }; "vscode-json-languageserver-1.3.4" = { @@ -64124,6 +64313,15 @@ let sha512 = "dEmliPZGbSyIcEeKRGzosCy7y7zsc8FXg1l5BBOGgMUbemlo3vUnsa2GFqpILJwJvlbvkRcF2QASNwIlKe9J7g=="; }; }; + "vscode-jsonrpc-8.0.0-next.2" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "8.0.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.2.tgz"; + sha512 = "gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -64223,6 +64421,15 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; + "vscode-languageserver-8.0.0-next.2" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "8.0.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.2.tgz"; + sha512 = "7qCEXTeGZKkI8BGvlKh0JPXTY7BaWoiwQYKCcGaUgnMs34wt6F/yaKcxoC3XIouBBVyRxiI6Ml/JdztM3XYEaA=="; + }; + }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -64277,6 +64484,15 @@ let sha512 = "f1kGsoOpISB5jSqQNeMDl2446enxVahyux2e5vZap6pu/TC+2UlvPT4DCR0gPph95KOQZweL9zq1SzLoPdqhuA=="; }; }; + "vscode-languageserver-protocol-3.17.0-next.8" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.17.0-next.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.8.tgz"; + sha512 = "P89vSuJ+FA5JzFmcOoZN13Ig1yd6LsiPOig0O5m5BSGuO/rplQegCd9J0wKpaTy7trf/SYHRoypnbUBdzy14sg=="; + }; + }; "vscode-languageserver-protocol-3.5.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -64376,6 +64592,15 @@ let sha512 = "L5S2kNLCgYJMVWgsZjBaorMM/6+itAfvOyl6Kv1bgFzDNaUKm9HsnUlehjpWPdV5DqnfJhJ5E03Z+/3Mw8ii+Q=="; }; }; + "vscode-languageserver-types-3.17.0-next.3" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.3.tgz"; + sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -64538,13 +64763,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.10.0" = { + "vue-eslint-parser-7.11.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz"; - sha512 = "7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz"; + sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -64772,13 +64997,13 @@ let sha512 = "tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA=="; }; }; - "web-streams-polyfill-3.1.0" = { + "web-streams-polyfill-3.1.1" = { name = "web-streams-polyfill"; packageName = "web-streams-polyfill"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.0.tgz"; - sha512 = "wO9r1YnYe7kFBLHyyVEhV1H8VRWoNiNnuP+v/HUUmSTaRF8F93Kmd3JMrETx0f11GXxRek6OcL2QtjFIdc5WYw=="; + url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.1.tgz"; + sha512 = "Czi3fG883e96T4DLEPRvufrF2ydhOOW1+1a6c3gNjH2aIh50DNFBdfwh2AKoOf1rXvpvavAoA11Qdq9+BKjE0Q=="; }; }; "web-tree-sitter-0.17.1" = { @@ -64898,13 +65123,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.51.1" = { + "webpack-5.52.0" = { name = "webpack"; packageName = "webpack"; - version = "5.51.1"; + version = "5.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz"; - sha512 = "xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.52.0.tgz"; + sha512 = "yRZOat8jWGwBwHpco3uKQhVU7HYaNunZiJ4AkAVQkPCUGoZk/tiIXiwG+8HIy/F+qsiZvSOa+GLQOj3q5RKRYg=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -64952,13 +65177,13 @@ let sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; }; }; - "webpack-dev-middleware-5.0.0" = { + "webpack-dev-middleware-5.1.0" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz"; - sha512 = "9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw=="; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.1.0.tgz"; + sha512 = "oT660AR1gOnU/NTdUQi3EiGR0iXG7CFxmKsj3ylWCBA2khJ8LFHK+sKv3BZEsC11gl1eChsltRhzUq7nWj7XIQ=="; }; }; "webpack-dev-server-3.11.0" = { @@ -65114,13 +65339,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.5.4" = { + "webtorrent-1.5.5" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.5.4.tgz"; - sha512 = "XXvOHlCskDgDjFoId0YrTebQQ/11rIJIm0MQqkBPctSA+RPrRDDooJa8yHAsVP+Aa2PtoxrKPSHr9RFDq+46aQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.5.5.tgz"; + sha512 = "YAEtWZxxf8N6DvdLgt79fQlIXSJU0G61YEkcWyBA+aopQGV0vCAMp1N/ifKIFt760pgKV+qzwRSbVP+/lBJ08g=="; }; }; "well-known-symbols-2.0.0" = { @@ -65312,13 +65537,13 @@ let sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; }; }; - "which-typed-array-1.1.6" = { + "which-typed-array-1.1.7" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.6.tgz"; - sha512 = "DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz"; + sha512 = "vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw=="; }; }; "wide-align-1.1.3" = { @@ -65933,13 +66158,13 @@ let sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; }; }; - "ws-7.5.3" = { + "ws-7.5.5" = { name = "ws"; packageName = "ws"; - version = "7.5.3"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz"; - sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz"; + sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; }; }; "ws-8.1.0" = { @@ -65960,6 +66185,24 @@ let sha512 = "uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g=="; }; }; + "ws-8.2.1" = { + name = "ws"; + packageName = "ws"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz"; + sha512 = "XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ=="; + }; + }; + "ws-8.2.2" = { + name = "ws"; + packageName = "ws"; + version = "8.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz"; + sha512 = "Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -66447,13 +66690,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.23.1" = { + "xstate-4.23.4" = { name = "xstate"; packageName = "xstate"; - version = "4.23.1"; + version = "4.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.23.1.tgz"; - sha512 = "8ZoCe8d6wDSPfkep+GBgi+fKAdMyXcaizoNf5FKceEhlso4+9n1TeK6oviaDsXZ3Z5O8xKkJOxXPNuD4cA9LCw=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.23.4.tgz"; + sha512 = "lWaUvyrd0HGhosyKnf8i9wBlszVaS+/uIs0EfnuPYNsZIh1BW9ed4bZ64P57wVYk2uln7v3u+Mv98FC+r8xrxQ=="; }; }; "xstream-11.14.0" = { @@ -67059,13 +67302,13 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; - "zen-observable-ts-1.2.0" = { + "zen-observable-ts-1.2.2" = { name = "zen-observable-ts"; packageName = "zen-observable-ts"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.0.tgz"; - sha512 = "3IklmJSChXaqAD2gPz6yKHThAnZL46D51x5EPpN/MHuPjrepVdSg3qI7f5fh1RT8Y+K46Owo9fpVuJiuJXLMMA=="; + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.2.tgz"; + sha512 = "o15G3luGAPoWD2//djCQsnC7886KpgQETAvTwnDPMN33RS+XACoFR46fm5e3tC/WNTF0uzHPL91Yyakc280Xiw=="; }; }; "zeromq-5.2.8" = { @@ -67155,15 +67398,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.3"; + version = "12.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.3.tgz"; - sha512 = "QBudMbLc+m/Z7GZTskeStk8PUAIPYVYRDq+9dQyKmill56t4MdmTU/m8eteVUXWpQFdRwhqIz6L9hlsfJXzP6A=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.5.tgz"; + sha512 = "O/NqRaFGx2jns03oWwhWBpilV4s7B8Zie6rgo2hJty1T3douGkK5kTO38N4Lebeayw8LTiPhT/JOrQTfFgXSjw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.3" - sources."@angular-devkit/core-12.2.3" - sources."@angular-devkit/schematics-12.2.3" + sources."@angular-devkit/architect-0.1202.5" + sources."@angular-devkit/core-12.2.5" + sources."@angular-devkit/schematics-12.2.5" sources."@gar/promisify-1.1.2" sources."@npmcli/fs-1.0.0" sources."@npmcli/git-2.1.0" @@ -67172,7 +67415,7 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" - sources."@schematics/angular-12.2.3" + sources."@schematics/angular-12.2.5" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -67186,7 +67429,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -67221,7 +67464,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."dashdash-1.14.1" sources."debug-4.3.2" sources."defaults-1.0.3" @@ -67323,7 +67566,7 @@ in sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.4" + sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -67407,7 +67650,11 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."validate-npm-package-name-3.0.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."wcwidth-1.0.1" sources."which-2.0.2" (sources."wide-align-1.1.3" // { @@ -67543,7 +67790,7 @@ in ]; }) sources."convict-6.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crc-32-1.2.0" sources."decamelize-1.2.0" sources."decompress-response-4.2.1" @@ -67747,7 +67994,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -67795,7 +68042,7 @@ in dependencies = [ sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" - sources."acorn-8.4.1" + sources."acorn-8.5.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -67827,7 +68074,7 @@ in sources."data-urls-2.0.0" sources."debug-4.3.2" sources."decimal.js-10.3.1" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" (sources."domexception-2.0.1" // { @@ -67871,7 +68118,7 @@ in sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-forge-0.10.0" sources."nwsapi-2.2.0" sources."onetime-5.1.2" @@ -67916,7 +68163,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."zxcvbn-4.4.2" @@ -67989,8 +68236,8 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."compare-func-2.0.0" - sources."conventional-changelog-angular-5.0.12" - sources."conventional-commits-parser-3.2.1" + sources."conventional-changelog-angular-5.0.13" + sources."conventional-commits-parser-3.2.2" sources."cosmiconfig-7.0.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -68103,7 +68350,6 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."trim-off-newlines-1.0.1" sources."type-fest-0.18.1" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" @@ -68172,7 +68418,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -68250,7 +68496,7 @@ in sources."readable-stream-3.6.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."corestore-5.8.2" sources."count-trailing-zeros-1.0.1" sources."cross-spawn-async-2.2.5" @@ -68277,7 +68523,7 @@ in sources."encoding-down-6.3.0" sources."end-of-stream-1.4.4" sources."errno-0.1.8" - (sources."es-abstract-1.18.5" // { + (sources."es-abstract-1.18.6" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -68305,6 +68551,7 @@ in sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."glob-7.1.3" sources."glob-parent-5.1.2" sources."growl-1.10.5" @@ -68321,8 +68568,8 @@ in sources."hrpc-2.2.0" sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" - sources."hyperbee-1.6.2" - sources."hypercore-9.10.0" + sources."hyperbee-1.6.3" + sources."hypercore-9.11.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ sources."readable-stream-3.6.0" @@ -68536,7 +68783,7 @@ in sources."nanoassert-2.0.0" ]; }) - sources."simple-hypercore-protocol-2.1.1" + sources."simple-hypercore-protocol-2.1.2" sources."simple-message-channels-1.2.1" (sources."siphash24-1.2.0" // { dependencies = [ @@ -68679,15 +68926,15 @@ in sources."@octokit/auth-token-2.4.5" sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.7.0" - sources."@octokit/plugin-paginate-rest-2.15.1" + sources."@octokit/graphql-4.8.0" + sources."@octokit/openapi-types-10.1.1" + sources."@octokit/plugin-paginate-rest-2.16.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.8.0" + sources."@octokit/plugin-rest-endpoint-methods-5.10.1" sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.1" - sources."@octokit/types-6.25.0" + sources."@octokit/rest-18.10.0" + sources."@octokit/types-6.27.0" sources."@sideway/address-4.1.2" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" @@ -68731,7 +68978,7 @@ in sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."netrc-0.1.4" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-version-1.2.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -68743,7 +68990,7 @@ in sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" sources."signal-exit-3.0.3" - sources."simple-git-2.44.0" + sources."simple-git-2.45.1" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" @@ -68810,7 +69057,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -68829,7 +69076,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.4.1" + sources."acorn-8.5.0" sources."ajv-8.6.0" sources."ajv-formats-2.1.0" sources."ajv-keywords-3.5.2" @@ -68845,11 +69092,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -68868,7 +69115,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" @@ -68876,7 +69123,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -68943,7 +69190,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.0.6" // { + (sources."jest-worker-27.1.1" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -68967,7 +69214,7 @@ in sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."magic-string-0.25.7" - sources."memfs-3.2.2" + sources."memfs-3.2.4" sources."merge-stream-2.0.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -69047,7 +69294,7 @@ in sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.1.4" // { + (sources."terser-webpack-plugin-5.2.4" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -69149,7 +69396,7 @@ in sources."util-deprecate-1.0.2" sources."wasm-feature-detect-1.2.11" sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.1.0" + sources."web-streams-polyfill-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -69181,38 +69428,38 @@ in sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.0" - sources."@babel/generator-7.15.0" - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - sources."@babel/helper-compilation-targets-7.15.0" - sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/core-7.15.5" + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-create-class-features-plugin-7.15.4" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" - sources."@babel/helper-explode-assignable-expression-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.9" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-namespace-from-7.14.5" sources."@babel/plugin-proposal-json-strings-7.14.5" @@ -69223,7 +69470,7 @@ in sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.15.4" sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -69245,25 +69492,25 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-classes-7.15.4" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" sources."@babel/plugin-transform-flow-strip-types-7.14.5" - sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.0" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" @@ -69272,10 +69519,10 @@ in sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-typescript-7.15.0" + sources."@babel/plugin-transform-typescript-7.15.4" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.0" + sources."@babel/preset-env-7.15.4" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.15.0" @@ -69286,10 +69533,10 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -69342,7 +69589,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -69357,13 +69604,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.2.6" // { + (sources."@vue/compiler-core-3.2.11" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.6" - sources."@vue/shared-3.2.6" + sources."@vue/compiler-dom-3.2.11" + sources."@vue/shared-3.2.11" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -69465,7 +69712,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -69485,7 +69732,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -69520,7 +69767,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -69542,12 +69789,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.16.3" // { + (sources."core-js-compat-3.17.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.16.3" + sources."core-js-pure-3.17.3" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -69613,14 +69860,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -69696,7 +69943,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.158.0" + sources."flow-parser-0.159.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -69719,6 +69966,7 @@ in sources."get-intrinsic-1.1.1" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."git-clone-0.1.0" @@ -69937,7 +70185,7 @@ in sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-dir-0.1.17" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-ipc-9.2.1" sources."node-modules-regexp-1.0.0" (sources."node-notifier-9.0.1" // { @@ -69979,7 +70227,7 @@ in }) sources."object-inspect-1.11.0" sources."object-keys-1.1.1" - sources."object-path-0.11.5" + sources."object-path-0.11.7" sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" @@ -70169,7 +70417,7 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { + (sources."source-map-support-0.5.20" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -70356,7 +70604,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -70509,12 +70757,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.15.0" + sources."@babel/generator-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/types-7.15.0" + sources."@babel/parser-7.15.5" + sources."@babel/template-7.15.4" + sources."@babel/types-7.15.4" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -70590,54 +70838,54 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.0" // { + (sources."@babel/generator-7.15.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.15.0" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/parser-7.15.5" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" sources."async-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.8" - sources."caniuse-lite-1.0.30001252" + sources."browserslist-4.17.0" + sources."caniuse-lite-1.0.30001255" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."colors-1.4.0" sources."commander-8.1.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70731,7 +70979,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -70759,16 +71007,16 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.3.3"; + version = "10.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.3.tgz"; - sha512 = "yRzjxfnggrP/+qVHlUuZz5FZzEbkT+Yt0/Df6ScEMnbbZBLzYB2W0KLxoQCW+THm1SpOsM1ZPcTHAwuvmibIsQ=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz"; + sha512 = "EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw=="; }; dependencies = [ - sources."browserslist-4.16.8" - sources."caniuse-lite-1.0.30001252" - sources."colorette-1.3.0" - sources."electron-to-chromium-1.3.818" + sources."browserslist-4.17.0" + sources."caniuse-lite-1.0.30001255" + sources."colorette-1.4.0" + sources."electron-to-chromium-1.3.833" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.75" @@ -70795,14 +71043,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.976.0" // { + (sources."aws-sdk-2.985.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -70833,20 +71081,20 @@ in sources."color-name-1.1.4" sources."commander-8.1.0" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."css-select-4.1.3" sources."css-what-5.0.1" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."degenerator-2.2.0" sources."depd-1.1.2" sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.0" - sources."domutils-2.7.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -71006,10 +71254,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.9.2"; + version = "10.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.9.2.tgz"; - sha512 = "tFjaQXQZ2Zu7Kz1ETOab3mnmjH1LYKJS3oeSVhT0tmQGF7MPFAoSghcjFz0vDmMxrQxIzBWXWjlRLOyTtGdWUw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.12.0.tgz"; + sha512 = "G8UVRAfWYPQSJwLiw1eqh61jfDSFKt0cDEfNbTzgv9Z5X+WnaGvk/0XzHCpoqNfHqRxRO2Zf9KHkFXS007bm5A=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -71017,7 +71265,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.7" // { dependencies = [ - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" ]; }) sources."@grpc/proto-loader-0.6.4" @@ -71065,7 +71313,7 @@ in sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -71193,13 +71441,13 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-js-4.1.1" sources."crypto-random-string-2.0.0" - sources."csv-parse-4.16.0" + sources."csv-parse-4.16.3" sources."cycle-1.0.3" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -71245,10 +71493,11 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."global-dirs-3.0.0" - (sources."goldengate-10.3.0" // { + (sources."goldengate-10.4.0" // { dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."ln-service-52.0.3" ]; }) sources."got-9.6.0" @@ -71334,14 +71583,21 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lightning-4.1.0" // { + (sources."lightning-4.1.3" // { dependencies = [ - sources."@types/node-16.6.1" + sources."@types/node-16.7.3" + sources."bn.js-5.2.0" + ]; + }) + sources."ln-accounting-5.0.1" + (sources."ln-service-52.1.0" // { + dependencies = [ + sources."@types/node-16.7.6" sources."bn.js-5.2.0" + sources."lightning-4.2.1" + sources."ws-8.2.1" ]; }) - sources."ln-accounting-5.0.0" - sources."ln-service-52.0.1" (sources."ln-sync-0.4.7" // { dependencies = [ sources."@grpc/grpc-js-1.3.6" @@ -71355,7 +71611,17 @@ in sources."nofilter-2.0.3" ]; }) - sources."ln-telegram-3.2.11" + (sources."ln-telegram-3.2.11" // { + dependencies = [ + sources."@types/node-16.6.1" + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."goldengate-10.3.0" + sources."lightning-4.1.0" + sources."ln-service-52.0.1" + sources."ws-8.1.0" + ]; + }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -71487,7 +71753,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" ]; }) sources."proxy-addr-2.0.7" @@ -71642,7 +71908,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.1.0" + sources."ws-8.2.0" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -71707,7 +71973,7 @@ in sources."whatwg-url-7.1.0" ]; }) - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."domexception-1.0.1" sources."ecc-jsbn-0.1.2" @@ -71820,7 +72086,7 @@ in sources."anchor-markdown-header-0.5.7" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."bail-1.0.5" sources."base64-js-1.5.1" (sources."bl-4.1.0" // { @@ -71838,7 +72104,7 @@ in sources."collapse-white-space-1.0.6" sources."commander-6.2.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-4.3.2" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -71847,14 +72113,14 @@ in sources."doctoc-2.0.1" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."domelementtype-2.2.0" sources."domhandler-3.3.0" - (sources."domutils-2.7.0" // { + (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."emoji-regex-6.1.3" @@ -71889,7 +72155,7 @@ in sources."ms-2.1.2" sources."nan-2.15.0" sources."napi-build-utils-1.0.2" - sources."node-abi-2.30.0" + sources."node-abi-2.30.1" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -72144,7 +72410,7 @@ in sources."util-0.10.3" ]; }) - sources."available-typed-arrays-1.0.4" + sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bn.js-5.2.0" @@ -72175,7 +72441,7 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -72202,16 +72468,17 @@ in sources."bn.js-4.12.0" ]; }) - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."glob-7.1.7" sources."has-1.0.3" sources."has-bigints-1.0.1" @@ -72245,7 +72512,7 @@ in sources."is-regex-1.1.4" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" + sources."is-typed-array-1.1.8" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -72339,7 +72606,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.6" + sources."which-typed-array-1.1.7" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -72365,8 +72632,8 @@ in sources."@babel/code-frame-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/types-7.15.0" + sources."@babel/parser-7.15.5" + sources."@babel/types-7.15.4" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -72389,7 +72656,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."babel-walk-3.0.0-canary-5" sources."balanced-match-1.0.2" sources."base-x-3.0.8" @@ -72529,7 +72796,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" @@ -72737,7 +73004,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.44.0" + sources."simple-git-2.45.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -72827,7 +73094,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -72898,7 +73165,7 @@ in sources."string_decoder-1.3.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."currently-unhandled-0.4.1" sources."cyclist-0.1.1" sources."dashdash-1.14.1" @@ -73069,7 +73336,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."plist-3.0.3" + sources."plist-3.0.4" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" sources."protobufjs-6.11.2" @@ -73194,7 +73461,11 @@ in sources."utp-0.0.7" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."voc-1.2.0" sources."ware-1.3.0" sources."windows-no-runnable-0.0.6" @@ -73212,7 +73483,6 @@ in ]; }) sources."xmlbuilder-9.0.7" - sources."xmldom-0.6.0" sources."xspfr-0.3.1" sources."xtend-4.0.2" ]; @@ -73229,20 +73499,20 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.45"; + version = "1.0.0-beta.50"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.45.tgz"; - sha512 = "4ixIu+0Fm5gv6nQ+cNhIHu5heJ95yC5HgVTU/Ad4hg5g0zWQLQcOn7s6znqgpFMDtrpH1v4RTMNp/jv10+FPiw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.50.tgz"; + sha512 = "KLvdcMqAYTbrMp4ru2m5/a5pATm6Jf5yMuXmkRTI8MgCG4iVMeSOFAfZMqWpDr9OGHOTx+7Gn1ryC1hBHqYMYw=="; }; dependencies = [ sources."@jsii/check-node-1.34.0" sources."@jsii/spec-1.34.0" - sources."@types/node-10.17.60" - sources."@xmldom/xmldom-0.7.2" + sources."@types/node-12.20.24" + sources."@xmldom/xmldom-0.7.4" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."at-least-node-1.0.0" - sources."available-typed-arrays-1.0.4" + sources."available-typed-arrays-1.0.5" sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" @@ -73260,7 +73530,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.133" + sources."constructs-3.3.147" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -73271,7 +73541,7 @@ in sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -73288,6 +73558,7 @@ in sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" @@ -73308,7 +73579,7 @@ in sources."is-set-2.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" + sources."is-typed-array-1.1.8" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -73336,13 +73607,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.335" // { + (sources."jsii-srcmak-0.1.341" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.2.7" + sources."json2jsii-0.2.17" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -73378,7 +73649,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.54" + sources."sscaff-1.2.63" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -73397,7 +73668,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.6" + sources."which-typed-array-1.1.7" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" @@ -73433,7 +73704,7 @@ in sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; }; dependencies = [ - sources."@apollo/client-3.4.9" + sources."@apollo/client-3.4.10" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -73447,16 +73718,16 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.15.0" + sources."@babel/generator-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/types-7.15.0" + sources."@babel/parser-7.15.5" + sources."@babel/template-7.15.4" + sources."@babel/types-7.15.4" sources."@cdktf/hcl2cdk-0.5.0" sources."@cdktf/hcl2json-0.5.0" (sources."@graphql-tools/graphql-file-loader-6.2.7" // { @@ -73464,11 +73735,7 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.3.1" // { - dependencies = [ - sources."tslib-2.2.0" - ]; - }) + sources."@graphql-tools/import-6.4.0" (sources."@graphql-tools/load-6.2.8" // { dependencies = [ sources."tslib-2.2.0" @@ -73479,15 +73746,15 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.2.2" // { + (sources."@graphql-tools/mock-8.3.1" // { dependencies = [ - sources."@graphql-tools/utils-8.1.2" + sources."@graphql-tools/utils-8.2.2" ]; }) - (sources."@graphql-tools/schema-8.1.2" // { + (sources."@graphql-tools/schema-8.2.0" // { dependencies = [ - sources."@graphql-tools/merge-8.0.3" - sources."@graphql-tools/utils-8.1.2" + sources."@graphql-tools/merge-8.1.2" + sources."@graphql-tools/utils-8.2.2" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -73522,7 +73789,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-14.17.12" + sources."@types/node-14.17.15" sources."@types/node-fetch-2.5.12" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -73532,7 +73799,7 @@ in sources."@wry/context-0.6.1" sources."@wry/equality-0.5.2" sources."@wry/trie-0.3.1" - sources."@xmldom/xmldom-0.7.2" + sources."@xmldom/xmldom-0.7.4" sources."accepts-1.3.7" sources."address-1.1.2" (sources."ansi-escapes-4.3.2" // { @@ -73553,7 +73820,7 @@ in sources."apollo-server-caching-3.1.0" (sources."apollo-server-core-3.3.0" // { dependencies = [ - sources."@graphql-tools/utils-8.1.2" + sources."@graphql-tools/utils-8.2.2" ]; }) sources."apollo-server-env-4.0.3" @@ -73577,8 +73844,8 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" - sources."available-typed-arrays-1.0.4" - sources."axios-0.21.1" + sources."available-typed-arrays-1.0.5" + sources."axios-0.21.4" sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -73641,7 +73908,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.133" + sources."constructs-3.3.147" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -73651,12 +73918,16 @@ in sources."convert-to-spaces-1.0.2" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-pure-3.16.3" - sources."core-util-is-1.0.2" + sources."core-js-pure-3.17.3" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" - sources."cross-fetch-3.1.4" + (sources."cross-fetch-3.1.4" // { + dependencies = [ + sources."node-fetch-2.6.1" + ]; + }) sources."cross-spawn-7.0.3" sources."cssfilter-0.0.10" sources."date-fns-2.23.0" @@ -73683,7 +73954,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.0.3" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -73720,7 +73991,7 @@ in sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."foreach-2.0.5" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -73738,13 +74009,14 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-6.0.1" + sources."get-symbol-description-1.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.3" sources."graceful-fs-4.2.8" sources."graphology-0.20.0" - sources."graphology-types-0.19.3" - sources."graphql-15.5.1" + sources."graphology-types-0.19.4" + sources."graphql-15.5.3" sources."graphql-subscriptions-1.2.1" sources."graphql-tag-2.12.5" sources."has-1.0.3" @@ -73802,7 +74074,7 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" + sources."is-typed-array-1.1.8" sources."is-unicode-supported-0.1.0" sources."is-valid-domain-0.1.2" sources."is-weakmap-2.0.1" @@ -73841,7 +74113,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.335" // { + (sources."jsii-srcmak-0.1.341" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73894,7 +74166,7 @@ in sources."ncp-2.0.0" sources."negotiator-0.6.2" sources."no-case-3.0.4" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."normalize-path-2.1.1" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -73929,7 +74201,7 @@ in sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.0" - sources."prettier-2.3.2" + sources."prettier-2.4.0" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -73942,7 +74214,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-16.14.0" - sources."react-devtools-core-4.17.0" + sources."react-devtools-core-4.18.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -73999,7 +74271,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.54" + sources."sscaff-1.2.63" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -74059,7 +74331,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.6" + sources."which-typed-array-1.1.7" sources."widest-line-3.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -74069,7 +74341,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xmlbuilder-15.1.1" sources."xss-1.0.9" sources."y18n-5.0.8" @@ -74092,7 +74364,7 @@ in sources."yocto-queue-0.1.0" sources."yoga-layout-prebuilt-1.10.0" sources."zen-observable-0.8.15" - sources."zen-observable-ts-1.2.0" + sources."zen-observable-ts-1.2.2" sources."zip-stream-4.1.0" sources."zod-1.11.17" ]; @@ -74305,10 +74577,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.14.0.tgz"; - sha512 = "CxeuK0gr5GKnswwuTKgWmRm3/KEmzeH0T8sV1AIRYuB/vZ61kBMplgb9fRvrNI540pKDR2xqWs5XZk6NyitPgA=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.14.1.tgz"; + sha512 = "VhEqQMIWrFtF+qzA03kLfwU7fX9f3qIVWltTk4Gc3QLqcIM0qtmpqnSRS7x/jRtbh/kLk2ckuwupQE59sTigCQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -74417,10 +74689,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.16"; + version = "0.18.17"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.16.tgz"; - sha512 = "sFk/5y7v/ITvuIeLia4VYRvQvD4fXgOI/Z3iS+1etkxuhiQo5fDwkRACWL6B4kRn6SWIn2scHyt49ePx1LURNg=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.17.tgz"; + sha512 = "RTbiCTMpRwlBS/fysJ0hUp9FsQJoCt6VMBF1sodkuOGR79Ha9I+XbyhnnxhVOnjUG4N4b4/OOfw8O0vBmWmMCQ=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -74528,7 +74800,7 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."tslib-2.3.1" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" @@ -74569,7 +74841,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.3.5" + sources."typescript-4.4.2" ]; buildInputs = globalBuildInputs; meta = { @@ -74714,13 +74986,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.7.tgz"; - sha512 = "EiD4lpcGW2WyzxEDpRMYPrjxAa0FhG69SzDoc1KbDht2Do/vgnRzvrtIsufPT14dALAesieN3kVVMCCfA9S6jA=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.8.tgz"; + sha512 = "ruCWV8SWSngpJFZrwghzi2yVVZ+Pa0o0vsNN106GlhMFgjtV+YudjVsPw7gH9NLBU77Zlpya4vtxP3AhgGfQ2w=="; }; dependencies = [ - sources."@chemzqm/neovim-5.3.5" + sources."@chemzqm/neovim-5.4.0" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -74742,7 +75014,7 @@ in sources."coc.nvim-0.0.79" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -74756,14 +75028,14 @@ in sources."define-properties-1.1.3" sources."duplexer2-0.1.4" sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."fp-ts-2.11.1" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" @@ -74777,6 +75049,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" sources."glob-7.1.7" sources."graceful-fs-4.2.8" sources."has-1.0.3" @@ -74834,7 +75107,7 @@ in }) sources."ncp-2.0.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" sources."object-inspect-1.11.0" @@ -75009,7 +75282,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -75071,7 +75344,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.16.3" + sources."core-js-3.17.3" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -75082,7 +75355,7 @@ in sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -75107,7 +75380,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75563,7 +75836,7 @@ in sources."prelude-ls-1.2.1" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.3.2" + sources."prettier-2.4.0" sources."prettier-eslint-12.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -75906,13 +76179,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.164"; + version = "1.1.166"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.164.tgz"; - sha512 = "7j+xroHX57poXJ9T+1OVYIx3NlTTKk6d0eoqLorv8BPFtjF0g+cTCLG67PNgpmfunBaF2g47aUoebli1x0fuKg=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.166.tgz"; + sha512 = "ler5AiK0fE5BbQ+RlkQYO+qzGUfFRmQW0XrSPFPCWgjvTfL20qXx7DU+lSZKRUJUQo3wXXHbnBnv7HHIOhokSw=="; }; dependencies = [ - sources."pyright-1.1.163" + sources."pyright-1.1.166" ]; buildInputs = globalBuildInputs; meta = { @@ -75986,10 +76259,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.50.0"; + version = "0.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.50.0.tgz"; - sha512 = "IqZL5m/fWXmUEF6xWXY1FA2sXJiCLQgi68Znm/Nz5sG+Hrl+OFCfaVCel6jr6xlshjmnnxtb8MoQlGbtChhKyg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.52.0.tgz"; + sha512 = "mT9Y7bzuhvHDj+Cv2+EbEUTGwdkulKpiGwyJ0Hm0/8+i3fM8zsoAuLM8l/A3TSIYlbt10Ru3dV5ilHwdt0MZkg=="; }; buildInputs = globalBuildInputs; meta = { @@ -76064,31 +76337,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.0" - sources."@babel/generator-7.15.0" - sources."@babel/helper-compilation-targets-7.15.0" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/core-7.15.5" + sources."@babel/generator-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/parser-7.15.5" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -76114,11 +76387,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -76134,7 +76407,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.1" @@ -76156,7 +76429,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76536,7 +76809,7 @@ in sha512 = "RTet29nZNYrOWEuquBOAv3yFtWyHPE7xGbsHjRdNbTP6g9PF+2nV2TnDO+c/T5HAk/1J0lKKZBu6hZTnEJ2f4w=="; }; dependencies = [ - sources."typescript-4.3.5" + sources."typescript-4.4.2" ]; buildInputs = globalBuildInputs; meta = { @@ -76595,14 +76868,14 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.16.0" // { + (sources."eslint-plugin-vue-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -76678,7 +76951,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.2" + sources."prettier-2.4.0" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.2.0" @@ -76719,11 +76992,11 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.5" + sources."typescript-4.4.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.10.0" // { + (sources."vue-eslint-parser-7.11.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -76747,10 +77020,10 @@ in coc-vimlsp = nodeEnv.buildNodePackage { name = "coc-vimlsp"; packageName = "coc-vimlsp"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.3.tgz"; - sha512 = "mq6V4fQmcQSiGvilJ0j1pbbj5EHeS8QC6ThuLVBJ+2wRqO8fiTkPYJrXPDUQDcICV9hUjdTBE8klaFYlK6oviA=="; + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.12.4.tgz"; + sha512 = "P4S+opRqtCXh2XqE5uj1u45+Jk3jCRIQl6/hdyCTSj8mMVR/BWf3xV2LjOuYoWIe0vIpYroYrxiU7ZvRYLRUrQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -76879,7 +77152,7 @@ in sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; }; dependencies = [ - sources."@xstate/fsm-1.6.1" + sources."@xstate/fsm-1.6.2" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -76899,7 +77172,7 @@ in sources."commander-5.1.0" sources."concat-map-0.0.1" sources."config-chain-1.1.13" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" sources."decompress-4.2.1" @@ -76982,7 +77255,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."plist-3.0.3" + sources."plist-3.0.4" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" @@ -77031,7 +77304,6 @@ in sources."wrappy-1.0.2" sources."xmlbuilder-9.0.7" sources."xmlcreate-2.0.3" - sources."xmldom-0.6.0" sources."xtend-4.0.2" sources."yauzl-2.10.0" ]; @@ -77073,7 +77345,7 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."chalk-2.4.2" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -77083,7 +77355,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" @@ -77126,13 +77398,13 @@ in sources."colors-1.4.0" sources."colorspace-1.1.2" sources."commander-8.0.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fecha-4.2.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -77191,21 +77463,29 @@ in sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" sources."add-stream-1.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" sources."array-ify-1.0.0" sources."arrify-1.0.1" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."compare-func-2.0.0" sources."conventional-changelog-3.1.24" - sources."conventional-changelog-angular-5.0.12" + sources."conventional-changelog-angular-5.0.13" sources."conventional-changelog-atom-2.0.8" sources."conventional-changelog-codemirror-2.0.8" sources."conventional-changelog-conventionalcommits-4.6.0" - sources."conventional-changelog-core-4.2.3" + sources."conventional-changelog-core-4.2.4" sources."conventional-changelog-ember-2.0.9" sources."conventional-changelog-eslint-3.0.9" sources."conventional-changelog-express-2.0.6" @@ -77214,8 +77494,8 @@ in sources."conventional-changelog-preset-loader-2.3.4" sources."conventional-changelog-writer-5.0.0" sources."conventional-commits-filter-2.0.7" - sources."conventional-commits-parser-3.2.1" - sources."core-util-is-1.0.2" + sources."conventional-commits-parser-3.2.2" + sources."core-util-is-1.0.3" sources."dargs-7.0.0" sources."dateformat-3.0.3" sources."decamelize-1.2.0" @@ -77225,31 +77505,17 @@ in ]; }) sources."dot-prop-5.3.0" + sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."find-up-4.1.0" + sources."find-up-2.1.0" sources."function-bind-1.1.1" - (sources."get-pkg-repo-4.1.2" // { + sources."get-caller-file-2.0.5" + (sources."get-pkg-repo-4.2.1" // { dependencies = [ - sources."meow-7.1.1" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - ]; - }) - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" - sources."semver-5.7.1" sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; @@ -77269,6 +77535,7 @@ in sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-core-module-2.6.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-text-path-1.0.1" @@ -77282,18 +77549,24 @@ in sources."lines-and-columns-1.1.6" (sources."load-json-file-4.0.0" // { dependencies = [ - sources."parse-json-4.0.0" sources."pify-3.0.0" ]; }) - sources."locate-path-5.0.0" + sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."lodash.ismatch-4.4.0" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" (sources."meow-8.1.2" // { dependencies = [ + sources."find-up-4.1.0" sources."hosted-git-info-2.8.9" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ sources."normalize-package-data-2.5.0" @@ -77306,8 +77579,6 @@ in ]; }) sources."semver-5.7.1" - sources."type-fest-0.18.1" - sources."yargs-parser-20.2.9" ]; }) sources."min-indent-1.0.1" @@ -77320,11 +77591,11 @@ in sources."semver-7.3.5" ]; }) - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-json-4.0.0" + sources."path-exists-3.0.0" sources."path-parse-1.0.7" (sources."path-type-3.0.0" // { dependencies = [ @@ -77342,18 +77613,10 @@ in sources."semver-5.7.1" ]; }) - (sources."read-pkg-up-3.0.0" // { - dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."read-pkg-up-3.0.0" sources."readable-stream-3.6.0" sources."redent-3.0.0" + sources."require-directory-2.1.1" sources."resolve-1.20.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" @@ -77364,7 +77627,9 @@ in sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."split2-3.2.2" + sources."string-width-4.2.2" sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" sources."strip-bom-3.0.0" sources."strip-indent-3.0.0" sources."supports-color-5.5.0" @@ -77374,16 +77639,18 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."trim-off-newlines-1.0.1" - sources."type-fest-0.13.1" - sources."uglify-js-3.14.1" + sources."type-fest-0.18.1" + sources."uglify-js-3.14.2" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" + sources."wrap-ansi-7.0.0" sources."xtend-4.0.2" + sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-parser-18.1.3" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; meta = { @@ -77438,7 +77705,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" sources."array-union-2.1.0" @@ -77536,7 +77803,7 @@ in ]; }) sources."cordova-serve-4.0.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."currently-unhandled-0.4.1" @@ -77763,7 +78030,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.4" + sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -77838,7 +78105,7 @@ in sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pkg-up-2.0.0" - sources."plist-3.0.3" + sources."plist-3.0.4" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" @@ -77959,7 +78226,11 @@ in sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."which-2.0.2" sources."wide-align-1.1.3" (sources."widest-line-3.1.0" // { @@ -77990,7 +78261,6 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" - sources."xmldom-0.6.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -78020,7 +78290,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -78391,7 +78661,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -78413,7 +78683,7 @@ in sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-5.1.0" sources."cssauron-1.4.0" sources."custom-error-instance-2.1.1" @@ -78560,7 +78830,7 @@ in sources."color-name-1.1.4" sources."commander-4.1.1" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."duplexer2-0.0.2" @@ -78796,7 +79066,7 @@ in sources."connections-1.4.2" sources."content-types-0.1.0" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."corsify-2.1.0" sources."count-trailing-zeros-1.0.1" sources."create-error-class-3.0.2" @@ -79313,7 +79583,11 @@ in }) sources."uuid-3.4.0" sources."varint-3.0.1" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."which-1.3.1" sources."widest-line-2.0.1" (sources."winston-2.4.5" // { @@ -79361,51 +79635,51 @@ in "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage { name = "deltachat-desktop"; packageName = "deltachat-desktop"; - version = "1.20.3"; + version = "1.21.0"; src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.0" // { + (sources."@babel/generator-7.15.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - sources."@babel/helper-compilation-targets-7.15.0" - sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-create-class-features-plugin-7.15.4" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" - sources."@babel/helper-explode-assignable-expression-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.9" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-namespace-from-7.14.5" sources."@babel/plugin-proposal-json-strings-7.14.5" @@ -79416,7 +79690,7 @@ in sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.15.4" sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -79437,24 +79711,24 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-classes-7.15.4" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" - sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.0" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-react-display-name-7.15.1" sources."@babel/plugin-transform-react-jsx-7.14.9" @@ -79469,16 +79743,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.0" + sources."@babel/preset-env-7.15.4" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" - sources."@babel/runtime-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" - sources."@blueprintjs/colors-1.0.0" - sources."@blueprintjs/core-3.48.0" - sources."@blueprintjs/icons-3.28.0" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" + sources."@blueprintjs/colors-3.0.0" + sources."@blueprintjs/core-3.49.1" + sources."@blueprintjs/icons-3.29.0" sources."@electron/get-1.13.0" sources."@hypnosphi/create-react-context-0.3.1" sources."@mapbox/extent-0.4.0" @@ -79499,17 +79773,17 @@ in sources."@types/debounce-1.2.0" sources."@types/dom4-2.0.2" sources."@types/emoji-mart-3.0.5" - sources."@types/fs-extra-8.1.2" sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" - sources."@types/node-14.17.12" + sources."@types/node-14.17.15" sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" - sources."@types/react-16.14.14" + sources."@types/react-16.14.15" sources."@types/react-dom-16.9.14" - sources."@types/react-virtualized-9.21.13" + sources."@types/react-window-1.8.5" + sources."@types/react-window-infinite-loader-1.0.5" sources."@types/scheduler-0.16.2" sources."@types/url-parse-1.4.4" sources."ansi-styles-3.2.1" @@ -79523,7 +79797,6 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-differ-3.0.0" sources."array-each-1.0.1" sources."array-slice-1.1.0" sources."array-unique-0.3.2" @@ -79549,7 +79822,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -79560,7 +79833,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -79582,11 +79855,10 @@ in }) sources."classnames-2.3.1" sources."clone-response-1.0.2" - sources."clsx-1.1.1" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" (sources."concat-stream-1.6.2" // { @@ -79603,13 +79875,13 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.16.3" - (sources."core-js-compat-3.16.3" // { + sources."core-js-3.17.3" + (sources."core-js-compat-3.17.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."csscolorparser-1.0.3" sources."csstype-3.0.8" @@ -79623,14 +79895,14 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - sources."deltachat-node-1.56.2" + sources."deltachat-node-1.60.0" sources."detect-node-2.1.0" sources."dom-helpers-3.4.0" sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.2.2" - sources."electron-to-chromium-1.3.818" + sources."electron-13.3.0" + sources."electron-to-chromium-1.3.833" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -79789,6 +80061,7 @@ in sources."escape-string-regexp-4.0.0" ]; }) + sources."memoize-one-5.2.1" sources."micromatch-3.1.10" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -79806,7 +80079,7 @@ in sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."napi-macros-2.0.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-gyp-build-4.2.3" sources."node-releases-1.1.75" sources."normalize-path-3.0.0" @@ -79868,11 +80141,9 @@ in sources."react-qr-svg-2.4.0" sources."react-string-replace-0.4.4" sources."react-transition-group-2.9.0" - (sources."react-virtualized-9.22.3" // { - dependencies = [ - sources."dom-helpers-5.2.1" - ]; - }) + sources."react-virtualized-auto-sizer-1.0.6" + sources."react-window-1.8.6" + sources."react-window-infinite-loader-1.0.7" sources."readable-stream-3.6.0" (sources."readdirp-2.2.1" // { dependencies = [ @@ -79909,7 +80180,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.38.1" // { + (sources."sass-1.39.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -79973,7 +80244,7 @@ in }) sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."source-map-url-0.4.1" sources."split-string-3.1.0" sources."split2-3.2.2" @@ -80170,32 +80441,20 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.5.0.tgz"; - sha512 = "aDwANs1c1xIh5lQTbMlsGx8tMDk1k+sjsYbIXYjWvGY9Ff2e40MQ6RgALItVVij1dj1049FkG9MOHLFqekxZoA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.6.0.tgz"; + sha512 = "+5bTaLsYJ+sb9bOzV7i6374Bb61jKlE3eh0mMlaLKwG9ZJO8r/pTMbsRNt9vXipkcJEvc9N8xZJyDs2EYnyfPA=="; }; dependencies = [ - (sources."dockerfile-ast-0.3.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0" - ]; - }) - sources."dockerfile-language-service-0.4.0" - (sources."dockerfile-utils-0.5.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0" - ]; - }) - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - (sources."vscode-languageserver-protocol-3.16.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0" - ]; - }) + sources."dockerfile-ast-0.3.1" + sources."dockerfile-language-service-0.5.0" + sources."dockerfile-utils-0.7.0" + sources."vscode-jsonrpc-8.0.0-next.2" + sources."vscode-languageserver-8.0.0-next.2" + sources."vscode-languageserver-protocol-3.17.0-next.8" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.17.0-next.1" + sources."vscode-languageserver-types-3.17.0-next.3" ]; buildInputs = globalBuildInputs; meta = { @@ -80218,7 +80477,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.12" + sources."@types/node-14.17.15" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -80356,30 +80615,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.59"; + version = "6.0.0-beta.60"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.59.tgz"; - sha512 = "cFYnr5LKi+Hg+rzhL2OZq5S7vlqzNS8rlQzXiYtv4Ft6BY27CTJ8mz76nAxgjRFv0/rDUyKTY2NZUOPeztziMQ=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.60.tgz"; + sha512 = "bbppliO8kl54MHwe7hCNapzmaqP0RNUONFcK/fd9Od917+ib23KqRAgbrN4ukwKjXzIfzLfoAsEY06UgL0DvIg=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.59" - sources."@electron-forge/core-6.0.0-beta.59" - sources."@electron-forge/installer-base-6.0.0-beta.59" - sources."@electron-forge/installer-darwin-6.0.0-beta.59" - sources."@electron-forge/installer-deb-6.0.0-beta.59" - sources."@electron-forge/installer-dmg-6.0.0-beta.59" - sources."@electron-forge/installer-exe-6.0.0-beta.59" - sources."@electron-forge/installer-linux-6.0.0-beta.59" - sources."@electron-forge/installer-rpm-6.0.0-beta.59" - sources."@electron-forge/installer-zip-6.0.0-beta.59" - sources."@electron-forge/maker-base-6.0.0-beta.59" - sources."@electron-forge/plugin-base-6.0.0-beta.59" - sources."@electron-forge/publisher-base-6.0.0-beta.59" - sources."@electron-forge/shared-types-6.0.0-beta.59" - sources."@electron-forge/template-base-6.0.0-beta.59" - sources."@electron-forge/template-typescript-6.0.0-beta.59" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.59" - sources."@electron-forge/template-webpack-6.0.0-beta.59" + sources."@electron-forge/async-ora-6.0.0-beta.60" + sources."@electron-forge/core-6.0.0-beta.60" + sources."@electron-forge/installer-base-6.0.0-beta.60" + sources."@electron-forge/installer-darwin-6.0.0-beta.60" + sources."@electron-forge/installer-deb-6.0.0-beta.60" + sources."@electron-forge/installer-dmg-6.0.0-beta.60" + sources."@electron-forge/installer-exe-6.0.0-beta.60" + sources."@electron-forge/installer-linux-6.0.0-beta.60" + sources."@electron-forge/installer-rpm-6.0.0-beta.60" + sources."@electron-forge/installer-zip-6.0.0-beta.60" + sources."@electron-forge/maker-base-6.0.0-beta.60" + sources."@electron-forge/plugin-base-6.0.0-beta.60" + sources."@electron-forge/publisher-base-6.0.0-beta.60" + sources."@electron-forge/shared-types-6.0.0-beta.60" + sources."@electron-forge/template-base-6.0.0-beta.60" + sources."@electron-forge/template-typescript-6.0.0-beta.60" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.60" + sources."@electron-forge/template-webpack-6.0.0-beta.60" (sources."@electron/get-1.13.0" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -80406,21 +80665,28 @@ in sources."universalify-0.1.2" ]; }) + sources."@gar/promisify-1.1.2" sources."@malept/cross-spawn-promise-2.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@npmcli/fs-1.0.0" + sources."@npmcli/move-file-1.1.2" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" + sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.1.4" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.2" + sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" + sources."agent-base-6.0.2" + sources."agentkeepalive-4.1.4" + sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -80430,7 +80696,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -80464,6 +80730,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" + sources."cacache-15.3.0" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."camelcase-2.1.1" @@ -80471,8 +80738,9 @@ in sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chardet-0.7.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."chromium-pickle-js-0.2.0" + sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" @@ -80494,8 +80762,8 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.16.3" - sources."core-util-is-1.0.2" + sources."core-js-3.17.3" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { dependencies = [ @@ -80515,7 +80783,6 @@ in sources."mimic-response-3.1.0" ]; }) - sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" @@ -80526,11 +80793,12 @@ in }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."depd-1.1.2" sources."detect-libc-1.0.3" sources."detect-node-2.1.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - (sources."electron-notarize-1.1.0" // { + (sources."electron-notarize-1.1.1" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -80545,16 +80813,13 @@ in sources."fs-extra-9.1.0" ]; }) - (sources."electron-rebuild-2.3.5" // { - dependencies = [ - sources."@malept/cross-spawn-promise-1.1.1" - sources."fs-extra-9.1.0" - ]; - }) + sources."electron-rebuild-3.2.3" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" + sources."err-code-2.0.3" sources."error-ex-1.3.2" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -80572,7 +80837,11 @@ in }) sources."expand-tilde-2.0.2" sources."extend-3.0.2" - sources."external-editor-3.1.0" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) sources."extract-zip-2.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -80602,7 +80871,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-10.0.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" (sources."galactus-0.2.1" // { @@ -80651,12 +80920,16 @@ in sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.0" + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" - sources."iconv-lite-0.4.24" + sources."https-proxy-agent-5.0.0" + sources."humanize-ms-1.2.1" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.4" - sources."indent-string-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -80666,6 +80939,7 @@ in sources."string-width-4.2.2" ]; }) + sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-core-module-2.6.0" sources."is-docker-2.2.1" @@ -80674,6 +80948,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-interactive-1.0.0" + sources."is-lambda-1.0.1" sources."is-number-7.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -80701,18 +80976,9 @@ in sources."log-symbols-4.1.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-2.0.0" - (sources."lru-cache-6.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) - (sources."lzma-native-6.0.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."lru-cache-6.0.0" + sources."lzma-native-8.0.1" + sources."make-fetch-happen-8.0.14" sources."map-age-cleaner-0.1.3" sources."map-obj-1.0.1" (sources."matcher-3.0.0" // { @@ -80740,52 +81006,39 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.4.1" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.9.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) sources."nice-try-1.0.5" - (sources."node-abi-2.30.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."node-addon-api-1.7.2" - sources."node-fetch-2.6.1" - (sources."node-gyp-7.1.2" // { - dependencies = [ - sources."nopt-5.0.0" - sources."rimraf-3.0.2" - ]; - }) - (sources."node-pre-gyp-0.11.0" // { + (sources."node-abi-2.30.1" // { dependencies = [ sources."semver-5.7.1" - sources."tar-4.4.19" ]; }) - sources."nopt-4.0.3" + sources."node-addon-api-3.2.1" + sources."node-api-version-0.1.4" + sources."node-fetch-2.6.2" + sources."node-gyp-8.2.0" + sources."node-gyp-build-4.2.3" + sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."normalize-url-6.1.0" - sources."npm-bundled-1.1.2" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" ]; }) - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" (sources."npm-run-path-2.0.2" // { dependencies = [ sources."path-key-2.0.1" @@ -80805,15 +81058,14 @@ in sources."onetime-5.1.2" sources."open-8.2.1" sources."ora-5.4.1" - sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" + sources."p-map-4.0.0" sources."p-try-1.0.0" sources."parse-author-2.0.0" sources."parse-json-2.2.0" @@ -80840,13 +81092,15 @@ in sources."path-exists-4.0.0" ]; }) - sources."plist-3.0.3" + sources."plist-3.0.4" sources."prepend-http-2.0.0" sources."pretty-bytes-1.0.4" sources."pretty-ms-7.0.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."progress-stream-1.2.0" + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" sources."proto-list-1.2.4" sources."psl-1.8.0" sources."pump-3.0.0" @@ -80854,7 +81108,6 @@ in sources."qs-6.5.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - sources."rc-1.2.8" sources."rcedit-3.0.1" sources."read-pkg-2.0.0" (sources."read-pkg-up-2.0.0" // { @@ -80863,25 +81116,29 @@ in ]; }) sources."readable-stream-3.6.0" - sources."redent-1.0.0" + (sources."redent-1.0.0" // { + dependencies = [ + sources."indent-string-2.1.0" + ]; + }) sources."repeating-2.0.1" sources."request-2.88.2" sources."require-directory-2.1.1" sources."resolve-1.20.0" - sources."resolve-alpn-1.2.0" + sources."resolve-alpn-1.2.1" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" + sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rimraf-2.7.1" + sources."rimraf-3.0.2" sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-7.3.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" sources."semver-7.3.5" sources."semver-compare-1.0.0" sources."serialize-error-7.0.1" @@ -80890,8 +81147,11 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."single-line-log-1.1.2" + sources."smart-buffer-4.2.0" + sources."socks-2.6.1" + sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -80899,6 +81159,7 @@ in sources."speedometer-0.1.4" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" + sources."ssri-8.0.1" (sources."string-width-1.0.2" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -80910,21 +81171,11 @@ in sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-indent-1.0.1" - sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.11" // { - dependencies = [ - sources."chownr-2.0.0" - sources."fs-minipass-2.1.0" - sources."minipass-3.1.3" - sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" - sources."yallist-4.0.0" - ]; - }) + sources."tar-6.1.11" sources."throttleit-0.0.2" sources."through-2.3.8" (sources."through2-0.2.3" // { @@ -80945,6 +81196,8 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.13.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" @@ -80952,7 +81205,11 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."wcwidth-1.0.1" sources."which-2.0.2" sources."wide-align-1.1.3" @@ -80964,11 +81221,10 @@ in }) sources."wrappy-1.0.2" sources."xmlbuilder-9.0.7" - sources."xmldom-0.6.0" sources."xtend-2.1.2" sources."y18n-5.0.8" - sources."yallist-3.1.1" - (sources."yargs-16.2.0" // { + sources."yallist-4.0.0" + (sources."yargs-17.1.1" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" @@ -81019,60 +81275,53 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-3.1.0.tgz"; - sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; + url = "https://registry.npmjs.org/emoj/-/emoj-3.2.0.tgz"; + sha512 = "ceJSyC2s1VCIqyzGkHeJkWBq/85QXaHM+0rZ1lRRtmcK9CsfRDyLSIZ7KJDZhPdIRUXBgBkdcOAW3AIu/yO/ew=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.0" - sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.15.0" // { + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" + sources."@babel/parser-7.15.5" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-react-jsx-7.14.9" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" - sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.2" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.2" sources."@types/normalize-package-data-2.4.1" - sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -81089,34 +81338,23 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.8" - sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.2" // { - dependencies = [ - sources."get-stream-5.2.0" - ]; - }) + sources."browserslist-4.17.0" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" - (sources."camelcase-keys-6.2.2" // { - dependencies = [ - sources."quick-lru-4.0.1" - ]; - }) - sources."caniuse-lite-1.0.30001252" + sources."camelcase-keys-6.2.2" + sources."caniuse-lite-1.0.30001255" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" sources."clipboardy-2.3.0" - sources."clone-response-1.0.2" sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" (sources."conf-7.1.2" // { @@ -81135,14 +81373,8 @@ in sources."map-obj-1.0.1" ]; }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -81153,7 +81385,7 @@ in sources."execa-1.0.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-3.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -81161,13 +81393,10 @@ in sources."get-stream-4.1.0" sources."glob-7.1.7" sources."globals-11.12.0" - sources."got-11.8.2" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" - sources."http2-wrapper-1.0.3" sources."import-jsx-4.0.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -81205,18 +81434,15 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."json5-2.2.0" - sources."keyv-4.0.3" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."loose-envify-1.4.0" - sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -81232,7 +81458,6 @@ in ]; }) sources."mimic-fn-3.1.0" - sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -81241,7 +81466,6 @@ in sources."nice-try-1.0.5" sources."node-releases-1.1.75" sources."normalize-package-data-2.5.0" - sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -81250,7 +81474,6 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -81274,9 +81497,9 @@ in sources."prop-types-15.7.2" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."quick-lru-5.1.1" + sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.17.0" + sources."react-devtools-core-4.18.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -81295,9 +81518,7 @@ in }) sources."redent-3.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.2.0" sources."resolve-from-3.0.0" - sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" @@ -81346,7 +81567,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -81396,8 +81617,8 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.174.1" - sources."@fluentui/react-focus-7.17.6" + sources."@fluentui/react-7.175.2" + sources."@fluentui/react-focus-7.18.0" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" sources."@gar/promisify-1.1.2" @@ -81411,7 +81632,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.203" + sources."@microsoft/load-themed-styles-1.10.208" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -81461,12 +81682,12 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.1" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.26" - sources."@uifabric/icons-7.5.23" + sources."@uifabric/foundation-7.10.0" + sources."@uifabric/icons-7.6.0" sources."@uifabric/merge-styles-7.19.2" sources."@uifabric/react-hooks-7.14.0" sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.19.0" + sources."@uifabric/styling-7.19.1" sources."@uifabric/utilities-7.33.5" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -81530,7 +81751,7 @@ in sources."append-field-1.0.0" sources."aproba-1.2.0" sources."archy-1.0.0" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -81771,7 +81992,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crc-3.8.0" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -81954,7 +82175,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-1.1.2" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -82364,7 +82585,7 @@ in }) sources."nan-2.15.0" sources."nanomatch-1.2.13" - (sources."needle-2.9.0" // { + (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -82439,7 +82660,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.174.1" + sources."office-ui-fabric-react-7.175.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -82666,7 +82887,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.38.1" // { + (sources."sass-1.39.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -82761,7 +82982,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."source-map-url-0.4.1" sources."sparkles-1.0.1" sources."spdx-correct-3.1.1" @@ -82952,7 +83173,11 @@ in sources."validate-npm-package-license-3.0.4" sources."value-or-function-3.0.0" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vinyl-2.2.1" (sources."vinyl-fs-3.0.3" // { dependencies = [ @@ -83037,7 +83262,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -83125,7 +83350,7 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" @@ -83244,10 +83469,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "10.1.3"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.1.3.tgz"; - sha512 = "B8ESWH1KrLNgV0CR9r/Mc4lbgArnbWIuHnHrJlmuWx+02UriPXNnk4+nNFakzXHRh/sTHeCA4LiArkSfIqsfsw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-11.0.0.tgz"; + sha512 = "eR6yaJepLQ8hMGIfW2Bj41e4ZnxbsbMZvYjDxWl98YnUlqn46qoUi20N3VB0xq9mv1IKsOO+Rqfnjov5Y93zLg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -83288,7 +83513,7 @@ in sources."core_d-3.2.0" sources."cross-spawn-7.0.3" sources."debug-4.3.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" @@ -83434,51 +83659,51 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."@babel/code-frame-7.14.5" sources."json5-2.2.0" sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.0" - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.15.0" // { + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.4" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.3" + sources."@babel/parser-7.15.5" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" @@ -83498,19 +83723,19 @@ in sources."@babel/plugin-transform-arrow-functions-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-classes-7.15.4" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" sources."@babel/plugin-transform-flow-strip-types-7.14.5" - sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.0" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" sources."@babel/plugin-transform-object-assign-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-react-display-name-7.15.1" sources."@babel/plugin-transform-react-jsx-7.14.9" @@ -83526,20 +83751,20 @@ in sources."@babel/plugin-transform-spread-7.14.6" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" - sources."@babel/plugin-transform-typescript-7.15.0" + sources."@babel/plugin-transform-typescript-7.15.4" sources."@babel/plugin-transform-unicode-regex-7.14.5" sources."@babel/runtime-7.9.0" - (sources."@babel/template-7.14.5" // { + (sources."@babel/template-7.15.4" // { dependencies = [ sources."@babel/code-frame-7.14.5" ]; }) - (sources."@babel/traverse-7.15.0" // { + (sources."@babel/traverse-7.15.4" // { dependencies = [ sources."@babel/code-frame-7.14.5" ]; }) - sources."@babel/types-7.15.0" + sources."@babel/types-7.15.4" sources."@dabh/diagnostics-2.0.2" sources."@expo/apple-utils-0.0.0-alpha.25" sources."@expo/bunyan-4.0.0" @@ -83692,7 +83917,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.9" - sources."@types/keyv-3.1.2" + sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" sources."@types/node-9.6.61" sources."@types/q-1.5.5" @@ -83736,7 +83961,7 @@ in sources."@webassemblyjs/wast-parser-1.9.0" sources."@webassemblyjs/wast-printer-1.9.0" sources."@wry/equality-0.1.11" - sources."@xmldom/xmldom-0.7.2" + sources."@xmldom/xmldom-0.7.4" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."abbrev-1.1.1" @@ -83777,7 +84002,7 @@ in sources."apollo-utilities-1.3.4" sources."application-config-path-0.1.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."argparse-2.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -83893,7 +84118,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" - (sources."bull-3.29.1" // { + (sources."bull-3.29.2" // { dependencies = [ sources."get-port-5.1.1" sources."p-timeout-3.2.0" @@ -83922,7 +84147,7 @@ in }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -83999,7 +84224,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -84043,7 +84268,7 @@ in sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-6.0.4" // { dependencies = [ - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" @@ -84057,14 +84282,14 @@ in sources."serialize-javascript-4.0.0" ]; }) - sources."core-js-3.16.3" - (sources."core-js-compat-3.16.3" // { + sources."core-js-3.17.3" + (sources."core-js-compat-3.17.3" // { dependencies = [ - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -84093,7 +84318,7 @@ in }) (sources."css-select-4.1.3" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."css-select-base-adapter-0.1.1" @@ -84171,16 +84396,16 @@ in sources."dom-converter-0.2.0" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."domain-browser-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-3.3.0" sources."domino-2.1.6" - (sources."domutils-2.7.0" // { + (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) (sources."dot-case-3.0.4" // { @@ -84194,7 +84419,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -84228,7 +84453,7 @@ in ]; }) sources."errorhandler-1.5.1" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -84300,7 +84525,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."faye-websocket-0.10.0" sources."fecha-4.2.1" @@ -84321,7 +84546,7 @@ in sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -84377,6 +84602,7 @@ in sources."get-intrinsic-1.1.1" sources."get-port-3.2.0" sources."get-stream-5.2.0" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getenv-1.0.0" sources."getpass-0.1.7" @@ -84506,7 +84732,7 @@ in sources."internal-ip-4.3.0" sources."internal-slot-1.0.3" sources."invariant-2.2.4" - (sources."ioredis-4.27.8" // { + (sources."ioredis-4.27.9" // { dependencies = [ sources."p-map-2.1.0" ]; @@ -84737,7 +84963,7 @@ in sources."minipass-3.1.3" ]; }) - (sources."minipass-fetch-1.3.4" // { + (sources."minipass-fetch-1.4.1" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -84789,7 +85015,7 @@ in sources."nan-2.15.0" sources."nanomatch-1.2.13" sources."ncp-2.0.0" - (sources."needle-2.9.0" // { + (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" ]; @@ -84804,7 +85030,7 @@ in ]; }) sources."nocache-2.1.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-forge-0.10.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -85006,7 +85232,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."plist-3.0.3" + sources."plist-3.0.4" sources."pngjs-3.4.0" sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { @@ -85243,7 +85469,7 @@ in (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" sources."htmlparser2-6.1.0" sources."strip-ansi-3.0.1" ]; @@ -85266,7 +85492,7 @@ in }) sources."requires-port-1.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.2.0" + sources."resolve-alpn-1.2.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -85504,12 +85730,12 @@ in dependencies = [ sources."commander-2.20.3" sources."source-map-0.6.1" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" ]; }) (sources."terser-webpack-plugin-3.1.0" // { dependencies = [ - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" @@ -85561,7 +85787,7 @@ in sources."type-fest-0.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" sources."ultron-1.1.1" sources."unbox-primitive-1.0.1" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -85624,7 +85850,11 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."vendors-1.0.4" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vlq-1.0.1" sources."vm-browserify-1.1.2" sources."watchpack-1.7.5" @@ -85832,7 +86062,6 @@ in ]; }) sources."xmlbuilder-9.0.7" - sources."xmldom-0.6.0" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -85878,37 +86107,37 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.0" - sources."@babel/generator-7.15.0" - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-compilation-targets-7.15.0" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/core-7.15.5" + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" + sources."@babel/parser-7.15.5" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-react-jsx-7.14.9" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -85927,7 +86156,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -85935,7 +86164,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -85946,7 +86175,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" @@ -85960,7 +86189,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -85968,7 +86197,7 @@ in sources."escape-string-regexp-1.0.5" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" @@ -86027,7 +86256,7 @@ in sources."minimist-options-4.1.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-releases-1.1.75" (sources."normalize-package-data-3.0.3" // { dependencies = [ @@ -86054,7 +86283,7 @@ in sources."puppeteer-9.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.17.0" + sources."react-devtools-core-4.18.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -86125,7 +86354,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."yallist-4.0.0" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" @@ -86175,7 +86404,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.32" // { + (sources."@oclif/core-0.5.35" // { dependencies = [ sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { @@ -86348,8 +86577,12 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" - sources."cross-fetch-3.1.4" + sources."core-util-is-1.0.3" + (sources."cross-fetch-3.1.4" // { + dependencies = [ + sources."node-fetch-2.6.1" + ]; + }) (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -86359,7 +86592,7 @@ in sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" @@ -86415,7 +86648,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.12.0" - (sources."faunadb-4.3.0" // { + (sources."faunadb-4.4.1" // { dependencies = [ sources."chalk-4.1.2" sources."has-flag-4.0.0" @@ -86594,7 +86827,7 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -86647,7 +86880,7 @@ in sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.3.2" + sources."prettier-2.4.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -86799,7 +87032,11 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -86821,10 +87058,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.16.6"; + version = "9.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.16.6.tgz"; - sha512 = "bW4rT+pTE6n8892rXd5ier9H1snXUZIXrL3WKzuVWXSUqDjUbx6SIgXhjp1++GIdkiMGnfDY5EJR4nV/YrTO5A=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.18.0.tgz"; + sha512 = "yth3C6ZdzkXbQVKgmrIYn/NBvkCnstEfsTsqvLUL+Mo0s5Cq+JR8A8DKLJHyWBrWjKkT5R9VfefnkhHCUrjRNw=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -86834,13 +87071,13 @@ in }) sources."@dabh/diagnostics-2.0.2" sources."@gar/promisify-1.1.2" - sources."@google-cloud/paginator-3.0.5" - sources."@google-cloud/precise-date-2.0.3" - sources."@google-cloud/projectify-2.1.0" - sources."@google-cloud/promisify-2.0.3" + sources."@google-cloud/paginator-3.0.6" + sources."@google-cloud/precise-date-2.0.4" + sources."@google-cloud/projectify-2.1.1" + sources."@google-cloud/promisify-2.0.4" (sources."@google-cloud/pubsub-2.17.0" // { dependencies = [ - sources."google-auth-library-7.6.2" + sources."google-auth-library-7.9.1" ]; }) sources."@grpc/grpc-js-1.3.7" @@ -86856,7 +87093,7 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@opentelemetry/api-1.0.2" + sources."@opentelemetry/api-1.0.3" sources."@opentelemetry/semantic-conventions-0.24.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -86877,7 +87114,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -86909,7 +87146,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -87049,7 +87286,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" @@ -87075,7 +87312,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."degenerator-2.2.0" @@ -87151,7 +87388,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -87210,8 +87447,8 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."gaxios-4.3.0" - sources."gcp-metadata-4.3.0" + sources."gaxios-4.3.1" + sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" (sources."get-uri-3.0.2" // { @@ -87226,9 +87463,9 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.24.2" // { + (sources."google-gax-2.25.1" // { dependencies = [ - sources."google-auth-library-7.6.2" + sources."google-auth-library-7.9.1" ]; }) sources."google-p12-pem-3.1.2" @@ -87403,7 +87640,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.4" + sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -87429,7 +87666,7 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-forge-0.10.0" (sources."node-gyp-8.2.0" // { dependencies = [ @@ -87699,7 +87936,11 @@ in sources."uuid-3.4.0" sources."valid-url-1.0.9" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."wcwidth-1.0.1" sources."which-1.3.1" (sources."wide-align-1.1.3" // { @@ -87723,7 +87964,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" @@ -87983,7 +88224,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -88092,7 +88333,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."nedb-1.8.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" (sources."number-to-bn-1.7.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -88218,7 +88459,7 @@ in sources."async-1.5.2" sources."async-each-1.0.3" sources."atob-2.1.2" - sources."available-typed-arrays-1.0.4" + sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -88275,7 +88516,7 @@ in sources."concat-map-0.0.1" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."debug-2.6.9" @@ -88287,7 +88528,7 @@ in sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -88337,6 +88578,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { @@ -88388,7 +88630,7 @@ in sources."is-set-2.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" + sources."is-typed-array-1.1.8" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -88592,7 +88834,7 @@ in }) sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.6" + sources."which-typed-array-1.1.7" (sources."winston-0.8.3" // { dependencies = [ sources."async-0.2.10" @@ -88668,10 +88910,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.12.0.tgz"; - sha512 = "Yf2Xa1mLbRi0yjtIRwklRCuTJB+DEKx5jl/2jFKKZkAdIHU8mXizBEkh4Pf0zeERv/22OjsfeCixjBcAw7WbHA=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.13.0.tgz"; + sha512 = "QTJZUY4wPwXLuK4aP3GCqBpklruV2hv/jtf65ED5zfeF2YnZlFvrJXt40n9o1ptc5XYe/FF6yFBxu1Lwbt9qtg=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -88681,56 +88923,56 @@ in }) sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.0" // { + (sources."@babel/generator-7.15.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.14.5" - (sources."@babel/helper-compilation-targets-7.15.0" // { + sources."@babel/helper-annotate-as-pure-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.3" + sources."@babel/parser-7.15.5" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-react-jsx-7.14.9" - sources."@babel/runtime-7.15.3" - sources."@babel/standalone-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/runtime-7.15.4" + sources."@babel/standalone-7.15.5" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -88766,14 +89008,14 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" - sources."acorn-8.4.1" + sources."acorn-8.5.0" sources."acorn-jsx-5.3.2" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { @@ -88781,11 +89023,7 @@ in sources."string-width-3.1.0" ]; }) - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -88793,7 +89031,7 @@ in sources."array-flatten-1.1.1" sources."async-retry-ng-2.0.1" sources."asynckit-0.4.0" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."bail-1.0.5" sources."balanced-match-1.0.2" sources."better-opn-2.1.1" @@ -88821,7 +89059,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -88833,7 +89071,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -88872,7 +89110,7 @@ in sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."common-tags-1.8.0" sources."concat-map-0.0.1" @@ -88883,8 +89121,8 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.33.0" - sources."contentful-sdk-core-6.8.0" + sources."contentful-management-7.36.2" + sources."contentful-sdk-core-6.8.5" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { dependencies = [ @@ -88894,7 +89132,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.12.0" + sources."create-gatsby-1.13.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -88923,13 +89161,13 @@ in sources."dom-converter-0.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.0" - sources."domutils-2.7.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -88991,7 +89229,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -89000,13 +89238,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.12.0" - (sources."gatsby-recipes-0.23.0" // { + sources."gatsby-core-utils-2.13.0" + (sources."gatsby-recipes-0.24.0" // { dependencies = [ sources."strip-ansi-6.0.0" ]; }) - sources."gatsby-telemetry-2.12.0" + sources."gatsby-telemetry-2.13.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -89019,7 +89257,7 @@ in sources."globals-11.12.0" sources."got-9.6.0" sources."graceful-fs-4.2.8" - sources."graphql-15.5.1" + sources."graphql-15.5.3" sources."graphql-compose-7.25.1" sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" @@ -89164,7 +89402,7 @@ in sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-eta-0.9.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-object-hash-2.3.9" sources."node-releases-1.1.75" sources."normalize-path-3.0.0" @@ -89204,7 +89442,7 @@ in sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" - sources."prettier-2.3.2" + sources."prettier-2.4.0" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -89345,7 +89583,7 @@ in sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."tslib-2.2.0" - sources."type-fest-0.20.2" + sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" @@ -89372,6 +89610,7 @@ in dependencies = [ sources."boxen-5.0.1" sources."camelcase-6.2.0" + sources."type-fest-0.20.2" ]; }) sources."url-parse-lax-3.0.0" @@ -89397,9 +89636,9 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xdg-basedir-4.0.0" - sources."xstate-4.23.1" + sources."xstate-4.23.4" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -89426,10 +89665,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.5.5.tgz"; - sha512 = "KxmZfEzhV0JYIonYtKBihZAFFVt0tqKoGL1OAbW8RdFQAgR/Yt5H0zF5K/7q7/M446JRcHCrI/pn9dmWmCXiDA=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.0.tgz"; + sha512 = "AZQg3krSIoySkTfHUhcWdDAALT5rIRvlFI8EcbrFMjIgedYZk04HdxYtq8FGdsWD9D/3F2zQN++iuWXowQw8Ig=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -89447,17 +89686,16 @@ in sources."@octokit/auth-token-2.4.5" sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.7.0" - sources."@octokit/plugin-paginate-rest-2.15.1" + sources."@octokit/graphql-4.8.0" + sources."@octokit/openapi-types-10.1.1" + sources."@octokit/plugin-paginate-rest-2.16.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.8.0" + sources."@octokit/plugin-rest-endpoint-methods-5.10.1" sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.1" - sources."@octokit/types-6.25.0" + sources."@octokit/rest-18.10.0" + sources."@octokit/types-6.27.0" sources."@types/normalize-package-data-2.4.1" - sources."agent-base-4.3.0" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" @@ -89471,12 +89709,10 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" - sources."debug-3.1.0" + sources."debug-4.3.2" sources."deprecation-2.3.1" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."execa-4.1.0" sources."fast-plist-0.1.2" @@ -89491,8 +89727,6 @@ in sources."has-ansi-2.0.0" sources."has-flag-4.0.0" sources."hosted-git-info-2.8.9" - sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-2.2.4" sources."human-signals-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -89513,8 +89747,8 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."ms-2.0.0" - sources."node-fetch-2.6.1" + sources."ms-2.1.2" + sources."node-fetch-2.6.2" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -89541,7 +89775,7 @@ in }) sources."read-pkg-up-7.0.1" sources."rechoir-0.6.2" - sources."request-light-0.4.0" + sources."request-light-0.5.4" sources."resolve-1.20.0" sources."run-async-2.4.1" sources."sanitize-filename-1.6.3" @@ -89570,7 +89804,6 @@ in sources."universal-user-agent-6.0.0" sources."utf8-byte-length-1.0.4" sources."validate-npm-package-license-3.0.4" - sources."vscode-nls-4.1.2" sources."which-2.0.2" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -89580,12 +89813,7 @@ in }) sources."wrappy-1.0.2" sources."yallist-4.0.0" - (sources."yeoman-generator-5.4.2" // { - dependencies = [ - sources."debug-4.3.2" - sources."ms-2.1.2" - ]; - }) + sources."yeoman-generator-5.4.2" (sources."yosay-2.0.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -89628,7 +89856,7 @@ in sources."has-flag-3.0.0" sources."iterall-1.3.0" sources."minimist-1.2.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."supports-color-5.5.0" ]; buildInputs = globalBuildInputs; @@ -89841,7 +90069,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -89875,10 +90103,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.5.1"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.5.1.tgz"; - sha512 = "jKet1JrZa/pxV1JePwm6Asd3ZnyqIQG8FN3caTjd9hM+LygssW2NLSFOpnlrvblNXzhpwLxNxcvIv4RoU1Impw=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.6.1.tgz"; + sha512 = "B2wwKFTFDPrs0vESTIsU2jJXlqvq8PCC6aTkOS+1qPsATPkepeYC0PHw/CZpjx1o77aoTCkbmitb1dP8hVs8Gw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -89951,7 +90179,7 @@ in sources."dot-prop-5.3.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-3.0.1" @@ -89965,7 +90193,7 @@ in }) sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."degenerator-3.0.1" @@ -90088,7 +90316,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-2.0.2" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."normalize-package-data-3.0.3" sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" @@ -90283,9 +90511,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.3.1" // { + (sources."@graphql-tools/import-6.4.0" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.1" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -90309,10 +90537,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.1.2" // { + (sources."@graphql-tools/schema-8.2.0" // { dependencies = [ - sources."@graphql-tools/merge-8.0.3" - sources."@graphql-tools/utils-8.1.2" + sources."@graphql-tools/merge-8.1.2" + sources."@graphql-tools/utils-8.2.2" sources."tslib-2.3.1" ]; }) @@ -90343,7 +90571,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -90362,7 +90590,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."available-typed-arrays-1.0.4" + sources."available-typed-arrays-1.0.5" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."backo2-1.0.2" @@ -90437,7 +90665,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" @@ -90458,7 +90686,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."figlet-1.5.0" sources."figures-3.2.0" @@ -90476,6 +90704,7 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.7" sources."glob-parent-5.1.2" @@ -90550,7 +90779,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" + sources."is-typed-array-1.1.8" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-weakmap-2.0.1" @@ -90776,7 +91005,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.6" + sources."which-typed-array-1.1.7" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -91044,7 +91273,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.0.3" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" sources."escape-string-regexp-1.0.5" @@ -91089,7 +91318,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.8.6" + sources."systeminformation-5.8.7" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -91212,7 +91441,7 @@ in sources."is-plain-object-5.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."d-1.0.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -91634,7 +91863,7 @@ in sources."concat-stream-1.6.2" sources."copy-descriptor-0.1.1" sources."copy-props-2.0.5" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."d-1.0.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -91985,7 +92214,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -92108,7 +92337,7 @@ in sources."corser-2.0.1" sources."debug-3.2.7" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" @@ -92159,7 +92388,7 @@ in sources."bfilter-1.0.5" sources."bheep-0.1.5" sources."binet-0.3.6" - sources."blgr-0.1.8" + sources."blgr-0.1.9" sources."blru-0.1.6" sources."blst-0.1.5" sources."bmutex-0.1.6" @@ -92368,7 +92597,7 @@ in sources."uuid-2.0.3" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."css-select-1.0.0" sources."css-what-1.0.0" sources."csso-2.0.0" @@ -92526,7 +92755,11 @@ in sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."whet.extend-0.9.9" sources."window-size-0.1.0" sources."wordwrap-0.0.2" @@ -92560,7 +92793,7 @@ in sources."bunyan-1.8.15" sources."colors-0.6.2" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cycle-1.0.3" sources."dtrace-provider-0.8.8" sources."eyes-0.1.8" @@ -92620,7 +92853,7 @@ in sources."async-limiter-1.0.1" sources."chrome-remote-interface-0.27.2" sources."commander-2.11.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."semver-5.7.1" sources."source-map-0.7.3" sources."ws-6.2.2" @@ -92762,11 +92995,11 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."cookiejar-2.1.2" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" sources."depd-1.1.2" @@ -93004,7 +93237,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -93029,7 +93262,7 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@msgpack/msgpack-2.7.0" + sources."@msgpack/msgpack-2.7.1" sources."@ot-builder/bin-composite-types-1.1.0" sources."@ot-builder/bin-util-1.1.0" (sources."@ot-builder/cli-help-shower-1.1.0" // { @@ -93074,7 +93307,7 @@ in sources."@ot-builder/var-store-1.1.0" sources."@ot-builder/variance-1.1.0" sources."@unicode/unicode-13.0.0-1.2.0" - sources."@xmldom/xmldom-0.7.2" + sources."@xmldom/xmldom-0.7.4" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -93097,7 +93330,7 @@ in sources."css-parse-2.0.0" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."ejs-3.1.6" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" @@ -93366,8 +93599,8 @@ in dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.33" - sources."@joplin/fork-sax-1.2.37" + sources."@joplin/fork-htmlparser2-4.1.34" + sources."@joplin/fork-sax-1.2.38" sources."@joplin/lib-2.3.1" (sources."@joplin/renderer-2.3.1" // { dependencies = [ @@ -93376,12 +93609,12 @@ in sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.55" // { + (sources."@joplin/turndown-4.0.56" // { dependencies = [ sources."css-2.2.4" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.37" + sources."@joplin/turndown-plugin-gfm-1.0.38" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -93406,7 +93639,7 @@ in }) sources."anymatch-3.1.2" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" @@ -93421,7 +93654,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.977.0" // { + (sources."aws-sdk-2.985.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -93487,88 +93720,48 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-7.0.1" - sources."d3-array-3.0.2" - sources."d3-axis-3.0.0" - sources."d3-brush-3.0.0" - sources."d3-chord-3.0.1" + sources."d3-5.16.0" + sources."d3-array-1.2.4" + sources."d3-axis-1.0.12" + sources."d3-brush-1.1.6" + sources."d3-chord-1.0.6" sources."d3-collection-1.0.7" - sources."d3-color-3.0.1" - sources."d3-contour-3.0.1" - sources."d3-delaunay-6.0.2" - sources."d3-dispatch-3.0.1" - sources."d3-drag-3.0.0" - (sources."d3-dsv-3.0.1" // { - dependencies = [ - sources."commander-7.2.0" - sources."iconv-lite-0.6.3" - ]; - }) - sources."d3-ease-3.0.1" - sources."d3-fetch-3.0.1" - sources."d3-force-3.0.0" - sources."d3-format-3.0.1" - sources."d3-geo-3.0.1" - sources."d3-hierarchy-3.0.1" - sources."d3-interpolate-3.0.1" - sources."d3-path-3.0.1" - sources."d3-polygon-3.0.1" - sources."d3-quadtree-3.0.1" - sources."d3-random-3.0.1" - sources."d3-scale-4.0.0" - sources."d3-scale-chromatic-3.0.0" - sources."d3-selection-3.0.0" - sources."d3-shape-3.0.1" - sources."d3-time-3.0.0" - sources."d3-time-format-4.0.0" - sources."d3-timer-3.0.1" - sources."d3-transition-3.0.1" + sources."d3-color-1.4.1" + sources."d3-contour-1.3.2" + sources."d3-dispatch-1.0.6" + sources."d3-drag-1.2.5" + sources."d3-dsv-1.2.0" + sources."d3-ease-1.0.7" + sources."d3-fetch-1.2.0" + sources."d3-force-1.2.1" + sources."d3-format-1.4.5" + sources."d3-geo-1.12.1" + sources."d3-hierarchy-1.1.9" + sources."d3-interpolate-1.4.0" + sources."d3-path-1.0.9" + sources."d3-polygon-1.0.6" + sources."d3-quadtree-1.0.7" + sources."d3-random-1.1.2" + sources."d3-scale-2.2.2" + sources."d3-scale-chromatic-1.5.0" + sources."d3-selection-1.4.2" + sources."d3-shape-1.3.7" + sources."d3-time-1.1.0" + sources."d3-time-format-2.3.0" + sources."d3-timer-1.0.10" + sources."d3-transition-1.3.2" sources."d3-voronoi-1.1.4" - sources."d3-zoom-3.0.0" + sources."d3-zoom-1.8.3" sources."dagre-0.8.5" - (sources."dagre-d3-0.6.4" // { - dependencies = [ - sources."d3-5.16.0" - sources."d3-array-1.2.4" - sources."d3-axis-1.0.12" - sources."d3-brush-1.1.6" - sources."d3-chord-1.0.6" - sources."d3-color-1.4.1" - sources."d3-contour-1.3.2" - sources."d3-dispatch-1.0.6" - sources."d3-drag-1.2.5" - sources."d3-dsv-1.2.0" - sources."d3-ease-1.0.7" - sources."d3-fetch-1.2.0" - sources."d3-force-1.2.1" - sources."d3-format-1.4.5" - sources."d3-geo-1.12.1" - sources."d3-hierarchy-1.1.9" - sources."d3-interpolate-1.4.0" - sources."d3-path-1.0.9" - sources."d3-polygon-1.0.6" - sources."d3-quadtree-1.0.7" - sources."d3-random-1.1.2" - sources."d3-scale-2.2.2" - sources."d3-scale-chromatic-1.5.0" - sources."d3-selection-1.4.2" - sources."d3-shape-1.3.7" - sources."d3-time-1.1.0" - sources."d3-time-format-2.3.0" - sources."d3-timer-1.0.10" - sources."d3-transition-1.3.2" - sources."d3-zoom-1.8.3" - ]; - }) + sources."dagre-d3-0.6.4" sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."debug-3.2.7" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."deepmerge-2.2.1" - sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -93576,16 +93769,16 @@ in sources."diff-match-patch-1.0.5" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."domelementtype-2.2.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" sources."dompurify-2.3.1" - (sources."domutils-2.7.0" // { + (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."ecc-jsbn-0.1.2" @@ -93623,7 +93816,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -93705,7 +93898,6 @@ in sources."split-skip-0.0.1" ]; }) - sources."internmap-2.0.1" sources."iota-array-1.0.0" sources."ip-regex-2.1.0" sources."is-absolute-0.2.6" @@ -93742,7 +93934,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" - (sources."katex-0.13.13" // { + (sources."katex-0.13.18" // { dependencies = [ sources."commander-6.2.1" ]; @@ -93796,7 +93988,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.12.0" + sources."mermaid-8.12.1" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."mimic-response-2.1.0" @@ -93819,10 +94011,10 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."needle-2.9.0" + sources."needle-2.9.1" sources."nextgen-events-1.5.2" sources."no-case-2.3.2" - (sources."node-abi-2.30.0" // { + (sources."node-abi-2.30.1" // { dependencies = [ sources."semver-5.7.1" ]; @@ -93931,7 +94123,6 @@ in sources."resolve-url-0.2.1" sources."retry-0.10.1" sources."rimraf-2.7.1" - sources."robust-predicates-3.0.1" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -94035,7 +94226,7 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" - sources."tree-kit-0.7.0" + sources."tree-kit-0.7.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -94084,7 +94275,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -94175,7 +94366,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.15.3" + sources."@babel/parser-7.15.5" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -94223,7 +94414,7 @@ in sources."cli-1.0.1" sources."concat-map-0.0.1" sources."console-browserify-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."date-now-0.1.4" (sources."dom-serializer-0.2.2" // { dependencies = [ @@ -94320,7 +94511,7 @@ in sources."commander-4.1.1" sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-3.2.7" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" @@ -94730,7 +94921,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-error-class-3.0.2" sources."dashdash-1.14.1" @@ -95173,7 +95364,11 @@ in sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."which-module-1.0.0" sources."widest-line-1.0.0" sources."window-size-0.2.0" @@ -95216,7 +95411,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.32" // { + (sources."@oclif/core-0.5.35" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -95239,7 +95434,7 @@ in sources."@oclif/screen-1.0.4" (sources."@putdotio/api-client-8.17.0" // { dependencies = [ - sources."axios-0.21.1" + sources."axios-0.21.4" ]; }) sources."ajv-6.12.6" @@ -95326,7 +95521,7 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" @@ -95454,10 +95649,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.13.13"; + version = "0.13.18"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz"; - sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.18.tgz"; + sha512 = "a3dC4NSVSDU3O1WZbTnOiA8rVNJ2lSiomOl0kmckCIGObccIHXof7gAseIY0o1gjEspe+34ZeSEX2D1ChFKIvA=="; }; dependencies = [ sources."commander-6.2.1" @@ -95484,7 +95679,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -95523,7 +95718,7 @@ in sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.2" + sources."engine.io-parser-4.0.3" sources."ent-2.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -95532,7 +95727,7 @@ in sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."flatted-2.0.2" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -95638,262 +95833,404 @@ in keyoxide = nodeEnv.buildNodePackage { name = "keyoxide"; packageName = "keyoxide"; - version = "0.3.0"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/keyoxide/-/keyoxide-0.3.0.tgz"; - sha512 = "LTy8I1D5hkQptMCy7XdSEY7GB5QG8TzOgp28D9B/XNt/wKKr2hRwrcW1eLGzazJQkMrdVg2AASLpgmFzPpVPrw=="; + url = "https://registry.npmjs.org/keyoxide/-/keyoxide-0.4.2.tgz"; + sha512 = "JErcr+qnJbmS7ZwHlm5mFKzM162WtALhxaTdkr1SDhi8oS+hSVAniGACqIFfMNvGhODGh6iBipOpMVykAYKfNw=="; }; dependencies = [ - sources."JSONStream-1.3.5" - sources."acorn-7.4.1" - sources."acorn-node-1.8.2" - sources."acorn-walk-7.2.0" - sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - (sources."asn1.js-5.4.1" // { + sources."@babel/cli-7.15.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.15.0" + (sources."@babel/core-7.15.5" // { dependencies = [ - sources."bn.js-4.12.0" + sources."semver-6.3.0" ]; }) - (sources."assert-1.5.0" // { + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" + sources."semver-6.3.0" ]; }) - sources."available-typed-arrays-1.0.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" + sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.15.4" + sources."@babel/highlight-7.14.5" + sources."@babel/node-7.15.4" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-syntax-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.9" + sources."@babel/register-7.15.3" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" + sources."@tootallnate/once-1.1.2" + sources."@xmpp/base64-0.12.1" + sources."@xmpp/client-0.12.1" + sources."@xmpp/client-core-0.12.1" + sources."@xmpp/connection-0.12.1" + sources."@xmpp/connection-tcp-0.12.1" + sources."@xmpp/debug-0.12.1" + sources."@xmpp/error-0.12.1" + sources."@xmpp/events-0.12.1" + sources."@xmpp/id-0.12.1" + sources."@xmpp/iq-0.12.1" + sources."@xmpp/jid-0.12.1" + sources."@xmpp/middleware-0.12.1" + sources."@xmpp/reconnect-0.12.1" + sources."@xmpp/resolve-0.12.1" + sources."@xmpp/resource-binding-0.12.1" + sources."@xmpp/sasl-0.12.1" + sources."@xmpp/sasl-anonymous-0.12.1" + sources."@xmpp/sasl-plain-0.12.1" + sources."@xmpp/sasl-scram-sha-1-0.12.1" + sources."@xmpp/session-establishment-0.12.1" + sources."@xmpp/starttls-0.12.1" + sources."@xmpp/stream-features-0.12.1" + sources."@xmpp/stream-management-0.12.1" + sources."@xmpp/tcp-0.12.1" + sources."@xmpp/tls-0.12.1" + sources."@xmpp/websocket-0.12.1" + sources."@xmpp/xml-0.12.1" + sources."abab-2.0.5" + sources."accepts-1.3.7" + sources."acorn-8.5.0" + (sources."acorn-globals-6.0.0" // { + dependencies = [ + sources."acorn-7.4.1" + ]; + }) + sources."acorn-walk-7.2.0" + sources."agent-base-6.0.2" + sources."ansi-colors-4.1.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."array-flatten-1.1.1" + sources."asn1.js-5.4.1" + sources."asynckit-0.4.0" + sources."babel-plugin-jsx-pragmatic-1.0.2" + sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" + sources."base-64-1.0.0" sources."bent-7.3.12" - sources."bn.js-5.2.0" - sources."brace-expansion-1.1.11" - sources."brorand-1.1.0" - sources."browser-pack-6.1.0" - sources."browser-resolve-2.0.0" - sources."browserify-17.0.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { + sources."bitwise-xor-0.0.0" + sources."bn.js-4.12.0" + (sources."body-parser-1.19.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) - sources."browserify-zlib-0.2.0" - sources."buffer-5.2.1" + sources."brace-expansion-1.1.11" + sources."browser-or-node-1.3.0" + sources."browser-process-hrtime-1.0.0" + sources."browserslist-4.17.0" sources."buffer-from-1.1.2" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" + sources."bytes-3.1.0" sources."bytesish-0.4.4" - sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" + sources."caniuse-lite-1.0.30001255" sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-1.3.0" sources."cipher-base-1.0.4" sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."combine-source-map-0.8.0" + sources."clone-deep-4.0.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colorette-1.4.0" + sources."combined-stream-1.0.8" + sources."commander-4.1.1" + sources."commondir-1.0.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."convert-source-map-1.1.3" - sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-source-map-1.8.0" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-js-3.17.3" + sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."crypto-browserify-3.12.0" - sources."dash-ast-1.0.0" - sources."decode-uri-component-0.2.0" - sources."define-properties-1.1.3" - sources."defined-1.0.0" - sources."deps-sort-2.0.1" - sources."des.js-1.0.1" - sources."detective-5.2.0" - (sources."diffie-hellman-5.0.3" // { + sources."cssom-0.4.4" + (sources."cssstyle-2.3.0" // { dependencies = [ - sources."bn.js-4.12.0" + sources."cssom-0.3.8" ]; }) - sources."doipjs-0.11.2" - sources."domain-browser-1.2.0" - sources."duplexer2-0.1.4" - (sources."elliptic-6.5.4" // { + sources."data-urls-2.0.0" + sources."debug-4.3.2" + sources."decimal.js-10.3.1" + sources."decode-uri-component-0.2.0" + sources."deep-is-0.1.4" + sources."define-properties-1.1.3" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."doipjs-0.13.0" + (sources."domexception-2.0.1" // { dependencies = [ - sources."bn.js-4.12.0" + sources."webidl-conversions-5.0.0" ]; }) + sources."dotenv-8.6.0" + sources."ee-first-1.1.1" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" sources."enquirer-2.3.6" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."escodegen-2.0.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."esprima-4.0.1" + sources."estraverse-5.2.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.8" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."express-validator-6.12.1" + sources."fast-levenshtein-2.0.6" sources."filter-obj-1.1.0" - sources."foreach-2.0.5" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."form-data-3.0.1" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-assigned-identifiers-1.2.0" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."glob-7.1.7" + sources."globals-11.12.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-flag-3.0.0" sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" ]; }) - sources."hash.js-1.1.7" - sources."hmac-drbg-1.0.1" - sources."htmlescape-1.1.1" - sources."https-browserify-1.0.0" - sources."ieee754-1.2.1" + sources."homedir-polyfill-1.0.3" + sources."html-encoding-sniffer-2.0.1" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.4.24" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.2.1" sources."internal-slot-1.0.3" - sources."is-arguments-1.1.1" + sources."ipaddr.js-1.9.1" + sources."irc-colors-1.5.0" + (sources."irc-upd-0.11.0" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" - sources."is-buffer-1.1.6" sources."is-callable-1.2.4" - sources."is-core-module-2.6.0" sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.1" sources."is-number-object-1.0.6" sources."is-plain-obj-2.1.0" + sources."is-plain-object-2.0.4" + sources."is-potential-custom-element-name-1.0.1" sources."is-regex-1.1.4" sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" - sources."isarray-1.0.0" - sources."jsonparse-1.3.1" - sources."labeled-stream-splicer-2.0.2" - sources."lodash.memoize-3.0.4" - sources."md5.js-1.3.5" - sources."merge-options-3.0.4" - (sources."miller-rabin-4.0.1" // { + sources."isobject-3.0.1" + sources."js-tokens-4.0.0" + (sources."jsdom-16.7.0" // { dependencies = [ - sources."bn.js-4.12.0" + sources."ws-7.5.5" ]; }) + sources."jsesc-2.5.2" + sources."json5-2.2.0" + sources."kind-of-6.0.3" + sources."koa-compose-4.2.0" + sources."levn-0.3.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + sources."ltx-2.10.0" + sources."make-dir-2.1.0" + sources."md5.js-1.3.5" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."merge-options-3.0.4" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-classic-0.5.3" - sources."module-deps-6.2.3" - sources."node-fetch-2.6.1" + sources."ms-2.1.2" + sources."negotiator-0.6.2" + sources."node-environment-flags-1.0.6" + sources."node-fetch-2.6.2" sources."node-localstorage-1.3.1" + sources."node-modules-regexp-1.0.0" + sources."node-releases-1.1.75" + sources."nwsapi-2.2.0" sources."object-assign-4.1.1" sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.2" + sources."on-finished-2.3.0" sources."once-1.4.0" sources."openpgp-4.10.10" - sources."os-browserify-0.3.0" - sources."pako-1.0.11" - sources."parents-1.0.1" - sources."parse-asn1-5.1.6" - sources."path-browserify-1.0.1" + sources."optionator-0.8.3" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parse-passwd-1.0.0" + sources."parse5-6.0.1" + sources."parseurl-1.3.3" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-platform-0.11.15" - sources."pbkdf2-3.1.2" - sources."prettier-2.3.2" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."punycode-1.4.1" + sources."path-to-regexp-0.1.7" + sources."pify-4.0.1" + sources."pirates-4.0.1" + sources."pkg-dir-3.0.0" + sources."prelude-ls-1.1.2" + sources."proxy-addr-2.0.7" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" sources."query-string-6.14.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."readable-stream-3.6.0" + sources."regenerator-runtime-0.13.9" sources."require-directory-2.1.1" - sources."resolve-1.20.0" sources."ripemd160-2.0.2" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."sasl-anonymous-0.1.0" + sources."sasl-plain-0.1.0" + sources."sasl-scram-sha-1-1.2.1" + sources."saslmechanisms-0.1.1" + sources."saxes-5.0.1" + sources."semver-5.7.1" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."shasum-object-1.0.0" - sources."shell-quote-1.7.2" + sources."shallow-clone-3.0.1" sources."side-channel-1.0.4" - sources."simple-concat-1.0.1" + sources."slash-2.0.0" sources."slide-1.1.6" sources."source-map-0.5.7" - sources."split-on-first-1.1.0" - (sources."stream-browserify-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."stream-combiner2-1.1.1" - (sources."stream-http-3.2.0" // { + (sources."source-map-support-0.5.20" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."source-map-0.6.1" ]; }) - sources."stream-splicer-2.0.1" + sources."split-on-first-1.1.0" + sources."statuses-1.5.0" sources."strict-uri-encode-2.0.0" sources."string-width-4.2.2" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" - sources."subarg-1.0.0" - sources."syntax-error-1.4.0" - sources."through-2.3.8" - sources."through2-2.0.5" - sources."timers-browserify-1.4.2" - sources."tty-browserify-0.0.1" - sources."typedarray-0.0.6" - sources."umd-3.0.3" - sources."unbox-primitive-1.0.1" - sources."undeclared-identifiers-1.1.3" - (sources."url-0.11.0" // { + (sources."string_decoder-1.3.0" // { dependencies = [ - sources."punycode-1.3.2" + sources."safe-buffer-5.2.1" ]; }) - sources."util-0.12.4" + sources."strip-ansi-6.0.0" + sources."supports-color-5.5.0" + sources."symbol-tree-3.2.4" + sources."to-fast-properties-2.0.0" + sources."toidentifier-1.0.0" + sources."tough-cookie-4.0.0" + sources."tr46-2.1.0" + sources."type-check-0.3.2" + sources."type-is-1.6.18" + sources."unbox-primitive-1.0.1" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."v8flags-3.2.0" sources."valid-url-1.0.9" - sources."vm-browserify-1.1.2" + sources."validator-13.6.0" + sources."vary-1.1.2" + sources."w3c-hr-time-1.0.2" + sources."w3c-xmlserializer-2.0.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-8.7.0" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.6" - sources."wrap-ansi-7.0.0" + sources."word-wrap-1.2.3" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-1.3.4" - sources."xtend-4.0.2" + sources."ws-8.2.2" + sources."xml-name-validator-3.0.0" + sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" @@ -95928,7 +96265,7 @@ in sources."cloneable-readable-1.1.3" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."define-properties-1.1.3" sources."duplexify-3.7.1" sources."end-of-stream-1.4.4" @@ -96044,7 +96381,7 @@ in sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-6.0.5" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -96054,7 +96391,7 @@ in sources."dashdash-1.14.1" sources."decamelize-1.2.0" sources."deep-equal-0.2.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" sources."dom-serializer-0.1.1" @@ -96214,7 +96551,11 @@ in ]; }) sources."uuid-3.4.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."wcwidth-1.0.1" sources."webidl-conversions-2.0.1" sources."whatwg-url-compat-0.6.5" @@ -96301,7 +96642,7 @@ in sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."cssom-0.3.8" @@ -96310,7 +96651,7 @@ in sources."dashdash-1.14.1" sources."decamelize-1.2.0" sources."deep-equal-0.2.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" sources."dom-serializer-0.1.1" @@ -96450,7 +96791,11 @@ in ]; }) sources."uuid-3.4.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."wcwidth-1.0.1" sources."webidl-conversions-2.0.1" sources."whatwg-url-compat-0.6.5" @@ -96634,20 +96979,20 @@ in sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.7.0" + sources."@octokit/graphql-4.8.0" + sources."@octokit/openapi-types-10.1.1" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.15.1" + sources."@octokit/plugin-paginate-rest-2.16.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.8.0" + sources."@octokit/plugin-rest-endpoint-methods-5.10.1" (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.1" - sources."@octokit/types-6.25.0" + sources."@octokit/rest-18.10.0" + sources."@octokit/types-6.27.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -96668,7 +97013,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -96731,8 +97076,8 @@ in sources."concat-stream-2.0.0" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-5.0.12" - (sources."conventional-changelog-core-4.2.3" // { + sources."conventional-changelog-angular-5.0.13" + (sources."conventional-changelog-core-4.2.4" // { dependencies = [ sources."normalize-package-data-3.0.3" ]; @@ -96744,7 +97089,7 @@ in ]; }) sources."conventional-commits-filter-2.0.7" - sources."conventional-commits-parser-3.2.1" + sources."conventional-commits-parser-3.2.2" sources."conventional-recommended-bump-6.1.0" sources."core-util-is-1.0.2" sources."cosmiconfig-7.0.1" @@ -96780,7 +97125,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -96816,29 +97161,17 @@ in }) sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - (sources."get-pkg-repo-4.1.2" // { + (sources."get-pkg-repo-4.2.1" // { dependencies = [ - sources."meow-7.1.1" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" - sources."type-fest-0.13.1" - sources."yargs-parser-18.1.3" ]; }) sources."get-port-5.1.1" sources."get-stream-6.0.1" + sources."get-symbol-description-1.0.0" sources."getpass-0.1.7" sources."git-raw-commits-2.0.10" (sources."git-remote-origin-url-2.0.0" // { @@ -96852,7 +97185,7 @@ in ]; }) sources."git-up-4.0.5" - sources."git-url-parse-11.5.0" + sources."git-url-parse-11.6.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" @@ -96893,7 +97226,7 @@ in (sources."init-package-json-2.0.4" // { dependencies = [ sources."normalize-package-data-3.0.3" - sources."read-package-json-4.0.1" + sources."read-package-json-4.1.1" ]; }) (sources."inquirer-7.3.3" // { @@ -97004,7 +97337,7 @@ in }) sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.4" + sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -97018,7 +97351,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."neo-async-2.6.2" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-gyp-7.1.2" sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { @@ -97204,14 +97537,13 @@ in sources."tough-cookie-2.5.0" sources."tr46-2.1.0" sources."trim-newlines-3.0.1" - sources."trim-off-newlines-1.0.1" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -97300,7 +97632,7 @@ in sources."make-dir-2.1.0" sources."mime-1.6.0" sources."ms-2.1.3" - sources."needle-2.9.0" + sources."needle-2.9.1" sources."parse-node-version-1.0.1" sources."pify-4.0.1" sources."prr-1.0.1" @@ -97408,7 +97740,7 @@ in sources."component-emitter-1.3.0" sources."connect-3.7.0" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" @@ -97754,7 +98086,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" @@ -98156,7 +98488,11 @@ in sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."ws-7.4.6" sources."xmlhttprequest-ssl-1.6.3" sources."yeast-0.1.2" @@ -98179,43 +98515,43 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.0" - sources."@babel/generator-7.15.0" - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - sources."@babel/helper-compilation-targets-7.15.0" - sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/core-7.15.5" + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-create-class-features-plugin-7.15.4" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" - sources."@babel/helper-explode-assignable-expression-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.3" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.14.9" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-namespace-from-7.14.5" sources."@babel/plugin-proposal-json-strings-7.14.5" @@ -98226,7 +98562,7 @@ in sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.15.4" sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" @@ -98248,24 +98584,24 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-classes-7.15.4" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" - sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.0" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" @@ -98277,13 +98613,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.0" + sources."@babel/preset-env-7.15.4" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -98294,7 +98630,7 @@ in ]; }) sources."@jest/types-25.5.0" - sources."@types/babel__core-7.1.15" + sources."@types/babel__core-7.1.16" sources."@types/babel__generator-7.6.3" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" @@ -98304,7 +98640,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -98461,7 +98797,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -98477,7 +98813,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -98526,7 +98862,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."colors-1.4.0" (sources."combine-source-map-0.8.0" // { dependencies = [ @@ -98549,12 +98885,12 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.3" // { + (sources."core-js-compat-3.17.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -98601,7 +98937,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -98670,7 +99006,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" @@ -98679,7 +99015,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -98889,7 +99225,7 @@ in sources."ncp-2.0.0" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-int64-0.4.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ @@ -99103,7 +99439,7 @@ in sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { + (sources."source-map-support-0.5.20" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -99185,7 +99521,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."timers-browserify-1.4.2" - sources."tmpl-1.0.4" + sources."tmpl-1.0.5" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { @@ -99239,7 +99575,11 @@ in sources."uuid-3.4.0" sources."v8-compile-cache-2.3.0" sources."validate-npm-package-license-3.0.4" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vinyl-2.2.1" sources."vm-browserify-1.1.2" sources."walker-1.0.7" @@ -99541,14 +99881,14 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."d-1.0.1" sources."dashdash-1.14.1" sources."dateformat-2.2.0" sources."deasync-0.1.20" sources."debug-2.6.9" sources."deep-extend-0.5.1" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."doctrine-2.1.0" (sources."duplexer2-0.0.2" // { @@ -99765,7 +100105,11 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vinyl-0.5.3" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" @@ -99842,14 +100186,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.11.5"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.5.tgz"; - sha512 = "kvOJ9VkabUFEASC0yE7KiWT7e8t2OBb6cw4YOXctXRJtbxSubLSANpfSxuy+MuaR9JJCMWcqD6sYy8FmdaPiaQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.12.1.tgz"; + sha512 = "cgs55tY9sLgtt9/67J7rfDLN/IM5BbobduO3FrKXBKVVanXbMubeTztcpVTtIRYEfJLmn+c+nfmnkNKruN3k0w=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -99865,82 +100209,45 @@ in sources."color-name-1.1.4" sources."commander-8.1.0" sources."concat-map-0.0.1" - sources."d3-7.0.1" - sources."d3-array-3.0.2" - sources."d3-axis-3.0.0" - sources."d3-brush-3.0.0" - sources."d3-chord-3.0.1" + sources."d3-5.16.0" + sources."d3-array-1.2.4" + sources."d3-axis-1.0.12" + sources."d3-brush-1.1.6" + sources."d3-chord-1.0.6" sources."d3-collection-1.0.7" - sources."d3-color-3.0.1" - sources."d3-contour-3.0.1" - sources."d3-delaunay-6.0.2" - sources."d3-dispatch-3.0.1" - sources."d3-drag-3.0.0" - (sources."d3-dsv-3.0.1" // { + sources."d3-color-1.4.1" + sources."d3-contour-1.3.2" + sources."d3-dispatch-1.0.6" + sources."d3-drag-1.2.5" + (sources."d3-dsv-1.2.0" // { dependencies = [ - sources."commander-7.2.0" + sources."commander-2.20.3" ]; }) - sources."d3-ease-3.0.1" - sources."d3-fetch-3.0.1" - sources."d3-force-3.0.0" - sources."d3-format-3.0.1" - sources."d3-geo-3.0.1" - sources."d3-hierarchy-3.0.1" - sources."d3-interpolate-3.0.1" - sources."d3-path-3.0.1" - sources."d3-polygon-3.0.1" - sources."d3-quadtree-3.0.1" - sources."d3-random-3.0.1" - sources."d3-scale-4.0.0" - sources."d3-scale-chromatic-3.0.0" - sources."d3-selection-3.0.0" - sources."d3-shape-3.0.1" - sources."d3-time-3.0.0" - sources."d3-time-format-4.0.0" - sources."d3-timer-3.0.1" - sources."d3-transition-3.0.1" + sources."d3-ease-1.0.7" + sources."d3-fetch-1.2.0" + sources."d3-force-1.2.1" + sources."d3-format-1.4.5" + sources."d3-geo-1.12.1" + sources."d3-hierarchy-1.1.9" + sources."d3-interpolate-1.4.0" + sources."d3-path-1.0.9" + sources."d3-polygon-1.0.6" + sources."d3-quadtree-1.0.7" + sources."d3-random-1.1.2" + sources."d3-scale-2.2.2" + sources."d3-scale-chromatic-1.5.0" + sources."d3-selection-1.4.2" + sources."d3-shape-1.3.7" + sources."d3-time-1.1.0" + sources."d3-time-format-2.3.0" + sources."d3-timer-1.0.10" + sources."d3-transition-1.3.2" sources."d3-voronoi-1.1.4" - sources."d3-zoom-3.0.0" + sources."d3-zoom-1.8.3" sources."dagre-0.8.5" - (sources."dagre-d3-0.6.4" // { - dependencies = [ - sources."commander-2.20.3" - sources."d3-5.16.0" - sources."d3-array-1.2.4" - sources."d3-axis-1.0.12" - sources."d3-brush-1.1.6" - sources."d3-chord-1.0.6" - sources."d3-color-1.4.1" - sources."d3-contour-1.3.2" - sources."d3-dispatch-1.0.6" - sources."d3-drag-1.2.5" - sources."d3-dsv-1.2.0" - sources."d3-ease-1.0.7" - sources."d3-fetch-1.2.0" - sources."d3-force-1.2.1" - sources."d3-format-1.4.5" - sources."d3-geo-1.12.1" - sources."d3-hierarchy-1.1.9" - sources."d3-interpolate-1.4.0" - sources."d3-path-1.0.9" - sources."d3-polygon-1.0.6" - sources."d3-quadtree-1.0.7" - sources."d3-random-1.1.2" - sources."d3-scale-2.2.2" - sources."d3-scale-chromatic-1.5.0" - sources."d3-selection-1.4.2" - sources."d3-shape-1.3.7" - sources."d3-time-1.1.0" - sources."d3-time-format-2.3.0" - sources."d3-timer-1.0.10" - sources."d3-transition-1.3.2" - sources."d3-zoom-1.8.3" - sources."iconv-lite-0.4.24" - ]; - }) + sources."dagre-d3-0.6.4" sources."debug-4.3.1" - sources."delaunator-5.0.0" sources."devtools-protocol-0.0.901419" sources."dompurify-2.3.1" sources."end-of-stream-1.4.4" @@ -99954,15 +100261,14 @@ in sources."graphlib-2.1.8" sources."has-flag-4.0.0" sources."https-proxy-agent-5.0.0" - sources."iconv-lite-0.6.3" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internmap-2.0.1" sources."khroma-1.4.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mermaid-8.12.0" + sources."mermaid-8.12.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -99983,7 +100289,6 @@ in sources."puppeteer-10.2.0" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" - sources."robust-predicates-3.0.1" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -100009,360 +100314,13 @@ in bypassCache = true; reconstructLock = true; }; - mirakurun = nodeEnv.buildNodePackage { - name = "mirakurun"; - packageName = "mirakurun"; - version = "3.9.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.2.tgz"; - sha512 = "67eI8su/4N6KvHKveYHYuimSIdk5gZug4mGPPkeSib+y9IHCnHK6LUwN28NMvsYQPYRVRfhk8Y76TfPV4dpzwQ=="; - }; - dependencies = [ - sources."@chinachu/aribts-1.3.5-mirakurun.3" - sources."@fluentui/date-time-utilities-8.2.2" - sources."@fluentui/dom-utilities-2.1.4" - sources."@fluentui/font-icons-mdl2-8.1.10" - sources."@fluentui/foundation-legacy-8.1.10" - sources."@fluentui/keyboard-key-0.3.4" - sources."@fluentui/merge-styles-8.1.5" - sources."@fluentui/react-8.27.0" - sources."@fluentui/react-focus-8.2.1" - sources."@fluentui/react-hooks-8.3.1" - sources."@fluentui/react-window-provider-2.1.4" - sources."@fluentui/set-version-8.1.4" - sources."@fluentui/style-utilities-8.3.1" - sources."@fluentui/theme-2.3.1" - sources."@fluentui/utilities-8.3.1" - sources."@microsoft/load-themed-styles-1.10.203" - sources."@napi-rs/triples-1.0.3" - sources."@node-rs/crc32-1.2.1" - sources."@node-rs/crc32-android-arm64-1.2.1" - sources."@node-rs/crc32-darwin-arm64-1.2.1" - sources."@node-rs/crc32-darwin-x64-1.2.1" - sources."@node-rs/crc32-freebsd-x64-1.2.1" - sources."@node-rs/crc32-linux-arm-gnueabihf-1.2.1" - sources."@node-rs/crc32-linux-arm64-gnu-1.2.1" - sources."@node-rs/crc32-linux-arm64-musl-1.2.1" - sources."@node-rs/crc32-linux-x64-gnu-1.2.1" - sources."@node-rs/crc32-linux-x64-musl-1.2.1" - sources."@node-rs/crc32-win32-arm64-msvc-1.2.1" - sources."@node-rs/crc32-win32-ia32-msvc-1.2.1" - sources."@node-rs/crc32-win32-x64-msvc-1.2.1" - sources."@node-rs/helper-1.2.1" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.7.2" - sources."@types/uuid-3.4.10" - sources."@types/ws-6.0.4" - sources."accepts-1.3.7" - sources."ajv-6.12.6" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."argparse-1.0.10" - sources."array-flatten-1.1.1" - sources."async-limiter-1.0.1" - sources."babel-polyfill-6.23.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) - sources."backo2-1.0.2" - sources."balanced-match-1.0.2" - sources."basic-auth-2.0.1" - (sources."body-parser-1.19.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.3" - sources."builtin-status-codes-3.0.0" - sources."bytes-3.1.0" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."chalk-1.1.3" - sources."chardet-0.4.2" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."clone-response-1.0.2" - sources."colors-1.4.0" - sources."concat-map-0.0.1" - sources."content-disposition-0.5.3" - sources."content-type-1.0.4" - sources."cookie-0.4.0" - sources."cookie-signature-1.0.6" - sources."core-js-2.6.12" - sources."cors-2.8.5" - sources."debug-2.6.9" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."difunc-0.0.4" - sources."dotenv-8.6.0" - sources."duplexer3-0.1.4" - sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."etag-1.8.1" - sources."eventemitter3-4.0.7" - sources."express-4.17.1" - sources."express-normalize-query-params-middleware-0.5.1" - (sources."express-openapi-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - (sources."external-editor-2.2.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."figures-2.0.0" - sources."finalhandler-1.1.2" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-routes-8.0.0" - sources."fs.realpath-1.0.0" - sources."get-stream-4.1.0" - sources."glob-7.1.7" - sources."got-9.6.0" - sources."has-ansi-2.0.0" - sources."http-cache-semantics-4.1.0" - sources."http-errors-1.7.2" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."ini-1.3.8" - sources."inquirer-3.0.6" - sources."ip-1.1.5" - sources."ipaddr.js-1.9.1" - sources."is-dir-1.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."is-stream-1.1.0" - sources."isomorphic-ws-4.0.1" - sources."js-tokens-4.0.0" - (sources."js-yaml-4.1.0" // { - dependencies = [ - sources."argparse-2.0.1" - ]; - }) - sources."json-buffer-3.0.0" - sources."json-schema-traverse-0.4.1" - (sources."jsonrpc2-ws-1.0.0-beta9" // { - dependencies = [ - sources."eventemitter3-3.1.2" - ]; - }) - sources."keyv-3.1.0" - sources."latest-version-5.1.0" - sources."lodash-4.17.21" - sources."lodash.merge-4.6.2" - sources."loose-envify-1.4.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.49.0" - sources."mime-types-2.1.32" - sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."depd-2.0.0" - ]; - }) - sources."ms-2.0.0" - sources."mute-stream-0.0.7" - sources."negotiator-0.6.2" - sources."node-fetch-1.6.3" - sources."node-gyp-build-4.2.3" - sources."normalize-url-4.5.1" - sources."object-assign-4.1.1" - sources."on-finished-2.3.0" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."onetime-2.0.1" - (sources."openapi-default-setter-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - (sources."openapi-framework-8.0.0" // { - dependencies = [ - sources."js-yaml-3.14.1" - sources."openapi-types-8.0.0" - ]; - }) - (sources."openapi-jsonschema-parameters-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - (sources."openapi-request-coercer-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - (sources."openapi-request-validator-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - (sources."openapi-response-validator-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - (sources."openapi-schema-validator-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - (sources."openapi-security-handler-8.0.0" // { - dependencies = [ - sources."openapi-types-8.0.0" - ]; - }) - sources."openapi-types-7.2.3" - (sources."opencollective-1.0.3" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."opencollective-postinstall-2.0.3" - sources."opn-4.0.2" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."prepend-http-2.0.0" - sources."promise-queue-2.2.5" - sources."proxy-addr-2.0.7" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.7.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.4.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."rc-1.2.8" - sources."react-17.0.2" - sources."react-dom-17.0.2" - sources."readable-stream-3.6.0" - sources."regenerator-runtime-0.10.5" - sources."registry-auth-token-4.2.1" - sources."registry-url-5.1.0" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" - sources."rfdc-1.3.0" - sources."run-async-2.4.1" - sources."rx-4.1.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."scheduler-0.20.2" - sources."semver-7.3.5" - (sources."send-0.17.1" // { - dependencies = [ - sources."ms-2.1.1" - ]; - }) - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" - sources."sift-7.0.1" - sources."signal-exit-3.0.3" - sources."source-map-0.6.1" - sources."source-map-support-0.5.19" - sources."sprintf-js-1.0.3" - sources."statuses-1.5.0" - (sources."stream-http-3.2.0" // { - dependencies = [ - sources."inherits-2.0.4" - ]; - }) - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - (sources."string_decoder-1.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" - sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.51.2" - sources."tail-2.2.3" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."to-readable-stream-1.0.0" - sources."toidentifier-1.0.0" - sources."ts-log-2.2.3" - sources."tslib-2.3.1" - sources."type-is-1.6.18" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."url-parse-lax-3.0.0" - sources."utf-8-validate-5.0.5" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."uws-9.148.0" - sources."vary-1.1.2" - sources."wrappy-1.0.2" - sources."ws-6.2.2" - sources."xtend-4.0.2" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Japanese DTV Tuner Server Service."; - homepage = "https://github.com/Chinachu/Mirakurun"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.0.tgz"; - sha512 = "Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz"; + sha512 = "0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -100499,7 +100457,7 @@ in sources."commander-2.20.3" sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-3.2.7" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" @@ -100593,7 +100551,7 @@ in sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" @@ -100644,11 +100602,11 @@ in sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fecha-2.3.3" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -100689,52 +100647,52 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.7.6"; + version = "6.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.7.6.tgz"; - sha512 = "yGdBrNqFPHRrIEcyRXseYt8NOPj7XWeMZiQ6ZGO4Zgkju6nSPnaI9Cxm0rBi7+92c9xU7yhtqY1Z+rs69jaLRw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.8.11.tgz"; + sha512 = "OdClfrRa1MAI1Oltk2x0dJx43EsM4NZtENDttlbv3ODaglimInvd1NSpyjzOM4gFluMt6GG2rzH2LQcFNM8IvQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.0" - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.15.0" // { + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.4" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -100745,11 +100703,11 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.3" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.9" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-namespace-from-7.14.5" sources."@babel/plugin-proposal-json-strings-7.14.5" @@ -100760,7 +100718,7 @@ in sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.15.4" sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -100780,24 +100738,24 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-classes-7.15.4" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" - sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.0" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" sources."@babel/plugin-transform-reserved-words-7.14.5" @@ -100808,16 +100766,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.0" // { + (sources."@babel/preset-env-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@bugsnag/browser-7.11.0" sources."@bugsnag/core-7.11.0" sources."@bugsnag/cuid-3.0.0" @@ -100827,7 +100785,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.6.0" // { + (sources."@netlify/build-18.8.0" // { dependencies = [ sources."resolve-2.0.0-next.3" ]; @@ -100839,7 +100797,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-15.5.0" // { + (sources."@netlify/config-15.6.2" // { dependencies = [ sources."dot-prop-5.3.0" ]; @@ -100872,10 +100830,10 @@ in sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.12" + sources."@types/node-14.17.15" ]; }) - sources."@netlify/plugins-list-3.5.0" + sources."@netlify/plugins-list-3.6.0" sources."@netlify/routing-local-proxy-0.31.0" sources."@netlify/run-utils-2.0.1" (sources."@netlify/zip-it-and-ship-it-4.20.0" // { @@ -100939,7 +100897,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.32" // { + (sources."@oclif/core-0.5.35" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."ansi-styles-4.3.0" @@ -101015,19 +100973,19 @@ in sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.7.0" - sources."@octokit/plugin-paginate-rest-2.15.1" + sources."@octokit/graphql-4.8.0" + sources."@octokit/openapi-types-10.1.1" + sources."@octokit/plugin-paginate-rest-2.16.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.8.0" + sources."@octokit/plugin-rest-endpoint-methods-5.10.1" (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.9.1" - sources."@octokit/types-6.25.0" + sources."@octokit/rest-18.10.0" + sources."@octokit/types-6.27.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -101039,14 +100997,14 @@ in sources."@rollup/plugin-node-resolve-11.2.1" sources."@rollup/pluginutils-3.1.0" sources."@samverschueren/stream-to-observable-0.3.1" - sources."@sindresorhus/is-0.14.0" + sources."@sindresorhus/is-2.1.1" sources."@sindresorhus/slugify-1.1.2" (sources."@sindresorhus/transliterate-0.1.2" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; }) - sources."@szmarczak/http-timer-1.1.2" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/decompress-4.2.4" sources."@types/download-8.0.1" @@ -101058,9 +101016,9 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/keyv-3.1.2" + sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -101068,8 +101026,8 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.29.3" - (sources."@typescript-eslint/typescript-estree-4.29.3" // { + sources."@typescript-eslint/types-4.31.0" + (sources."@typescript-eslint/typescript-estree-4.31.0" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -101086,10 +101044,10 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.29.3" + sources."@typescript-eslint/visitor-keys-4.31.0" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" - sources."acorn-8.4.1" + sources."acorn-8.5.0" sources."agent-base-6.0.2" (sources."aggregate-error-3.1.0" // { dependencies = [ @@ -101196,7 +101154,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -101209,16 +101167,10 @@ in sources."byline-5.0.0" sources."bytes-3.1.0" sources."cache-base-1.0.1" - (sources."cacheable-lookup-2.0.1" // { - dependencies = [ - sources."json-buffer-3.0.1" - sources."keyv-4.0.3" - ]; - }) - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-2.0.1" + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" ]; }) sources."cachedir-2.3.0" @@ -101226,7 +101178,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { dependencies = [ @@ -101295,7 +101247,11 @@ in sources."cli-width-2.2.1" sources."cliui-6.0.0" sources."clone-1.0.4" - sources."clone-response-1.0.2" + (sources."clone-response-1.0.2" // { + dependencies = [ + sources."mimic-response-1.0.1" + ]; + }) sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" (sources."color-3.0.0" // { @@ -101307,7 +101263,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.6.0" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -101336,12 +101292,12 @@ in sources."readdirp-2.2.1" ]; }) - (sources."core-js-compat-3.16.3" // { + (sources."core-js-compat-3.17.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cp-file-7.0.0" (sources."cpy-8.1.2" // { dependencies = [ @@ -101374,7 +101330,7 @@ in sources."pify-2.3.0" ]; }) - sources."decompress-response-3.3.0" + sources."decompress-response-5.0.0" (sources."decompress-tar-4.1.1" // { dependencies = [ sources."bl-1.2.3" @@ -101404,10 +101360,10 @@ in ]; }) sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."defer-to-connect-1.1.3" + sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" sources."define-property-2.0.2" (sources."del-6.0.0" // { @@ -101458,8 +101414,10 @@ in (sources."cacheable-request-2.1.4" // { dependencies = [ sources."get-stream-3.0.0" + sources."lowercase-keys-1.0.0" ]; }) + sources."decompress-response-3.3.0" sources."get-stream-4.1.0" (sources."got-8.3.2" // { dependencies = [ @@ -101469,19 +101427,22 @@ in }) sources."http-cache-semantics-3.8.1" sources."is-plain-obj-1.1.0" + sources."json-buffer-3.0.0" sources."keyv-3.0.0" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."make-dir-2.1.0" + sources."mimic-response-1.0.1" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."p-event-2.3.1" + sources."responselike-1.0.2" sources."semver-5.7.1" sources."sort-keys-2.0.0" ]; }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -101564,7 +101525,7 @@ in sources."fast-equals-2.0.3" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" @@ -101575,16 +101536,9 @@ in sources."chalk-3.0.0" ]; }) - sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.6" sources."@types/istanbul-reports-1.1.2" sources."ansi-styles-4.3.0" - sources."cacheable-request-7.0.2" sources."camelcase-5.3.1" - sources."decompress-response-5.0.0" - sources."defer-to-connect-2.0.1" - sources."get-stream-5.2.0" - sources."got-10.7.0" sources."has-flag-4.0.0" sources."jest-get-type-25.2.6" (sources."jest-validate-25.5.0" // { @@ -101592,17 +101546,9 @@ in sources."chalk-3.0.0" ]; }) - sources."json-buffer-3.0.1" - sources."keyv-4.0.3" - sources."lowercase-keys-2.0.0" - sources."mimic-response-2.1.0" - sources."normalize-url-6.1.0" - sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" sources."react-is-16.13.1" - sources."responselike-2.0.0" sources."supports-color-7.2.0" - sources."type-fest-0.10.0" ]; }) (sources."figures-3.2.0" // { @@ -101630,7 +101576,7 @@ in sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."for-in-1.0.2" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -101690,10 +101636,10 @@ in ]; }) sources."gonzales-pe-4.3.0" - (sources."got-9.6.0" // { + (sources."got-10.7.0" // { dependencies = [ - sources."get-stream-4.1.0" - sources."to-readable-stream-1.0.0" + sources."get-stream-5.2.0" + sources."type-fest-0.10.0" ]; }) sources."graceful-fs-4.2.8" @@ -101852,7 +101798,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" @@ -101861,7 +101807,7 @@ in sources."junk-3.1.0" sources."jwt-decode-3.1.2" sources."keep-func-props-3.0.1" - sources."keyv-3.1.0" + sources."keyv-4.0.3" sources."kind-of-6.0.3" sources."kuler-2.0.0" (sources."lambda-local-2.0.0" // { @@ -101947,7 +101893,7 @@ in sources."ms-2.1.3" ]; }) - sources."lowercase-keys-1.0.1" + sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."magic-string-0.25.7" @@ -101984,7 +101930,7 @@ in sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."mimic-fn-3.1.0" - sources."mimic-response-1.0.1" + sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -101994,7 +101940,7 @@ in }) sources."mkdirp-0.5.5" sources."module-definition-3.3.1" - sources."moize-6.0.3" + sources."moize-6.1.0" sources."move-file-2.1.0" sources."ms-2.0.0" (sources."multiparty-4.2.2" // { @@ -102019,7 +101965,7 @@ in sources."netlify-redirect-parser-11.0.2" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-releases-1.1.75" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { @@ -102059,7 +102005,7 @@ in ]; }) sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" + sources."normalize-url-6.1.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-run-path-4.0.1" sources."number-is-nan-1.0.1" @@ -102118,7 +102064,7 @@ in sources."p-map-2.1.0" ]; }) - sources."p-cancelable-1.1.0" + sources."p-cancelable-2.1.1" (sources."p-event-4.2.0" // { dependencies = [ sources."p-timeout-3.2.0" @@ -102149,7 +102095,27 @@ in }) (sources."package-json-6.5.0" // { dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.3" + sources."get-stream-4.1.0" + sources."got-9.6.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."lowercase-keys-1.0.1" + sources."mimic-response-1.0.1" + sources."normalize-url-4.5.1" + sources."p-cancelable-1.1.0" + sources."responselike-1.0.2" sources."semver-6.3.0" + sources."to-readable-stream-1.0.0" ]; }) (sources."parallel-transform-1.2.0" // { @@ -102265,7 +102231,7 @@ in sources."requires-port-1.0.0" sources."resolve-1.20.0" sources."resolve-url-0.2.1" - sources."responselike-1.0.2" + sources."responselike-2.0.0" (sources."restore-cursor-2.0.0" // { dependencies = [ sources."mimic-fn-1.2.0" @@ -102371,7 +102337,7 @@ in sources."source-map-0.5.7" sources."source-map-js-0.6.2" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { + (sources."source-map-support-0.5.20" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -102500,7 +102466,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.5" + sources."typescript-4.4.2" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -102649,7 +102615,7 @@ in sources."aggregate-error-3.1.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."cacache-15.3.0" @@ -102658,7 +102624,7 @@ in sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-4.3.2" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -102691,7 +102657,7 @@ in sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.4" + sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -102775,7 +102741,7 @@ in sources."ajv-4.11.8" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" sources."asn1-0.2.4" @@ -102809,7 +102775,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cryptiles-2.0.5" sources."currently-unhandled-0.4.1" (sources."dashdash-1.14.1" // { @@ -103025,6 +102991,7 @@ in (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" + sources."core-util-is-1.0.2" ]; }) sources."which-1.3.1" @@ -103070,14 +103037,14 @@ in sources."abbrev-1.1.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-3.2.7" sources."deep-extend-0.6.0" sources."delegates-1.0.0" @@ -103100,7 +103067,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.3" - sources."needle-2.9.0" + sources."needle-2.9.1" sources."nopt-4.0.3" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" @@ -103150,17 +103117,17 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.0.5.tgz"; - sha512 = "S3vhm/EqQwEvHDBw/375j4f5vVT9YknfTEeQjbA/Fa2XAK0WLCC+ENLV+4HzkpSAIi+9hmrF3TpdhjVLksmk1A=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.0.6.tgz"; + sha512 = "UdQPwnciQMcFIXjldFhP9XfqBHcFYtAIXDt3be8kp+OZPxRqjxSDI5EuIfxY8QnUK1YVqwDV+5CKDhh97+dA0w=="; }; dependencies = [ - sources."@babel/runtime-7.15.3" + sources."@babel/runtime-7.15.4" sources."@mapbox/node-pre-gyp-1.0.5" - sources."@node-red/editor-api-2.0.5" - sources."@node-red/editor-client-2.0.5" - (sources."@node-red/nodes-2.0.5" // { + sources."@node-red/editor-api-2.0.6" + sources."@node-red/editor-client-2.0.6" + (sources."@node-red/nodes-2.0.6" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.6.3" @@ -103173,15 +103140,15 @@ in }) ]; }) - sources."@node-red/registry-2.0.5" - sources."@node-red/runtime-2.0.5" - sources."@node-red/util-2.0.5" + sources."@node-red/registry-2.0.6" + sources."@node-red/runtime-2.0.6" + sources."@node-red/util-2.0.6" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.2" - sources."@types/node-16.7.2" + sources."@types/keyv-3.1.3" + sources."@types/node-16.9.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -103193,12 +103160,12 @@ in sources."ms-2.1.2" ]; }) - sources."ajv-8.6.0" + sources."ajv-8.6.2" sources."ansi-colors-4.1.1" sources."ansi-regex-2.1.1" sources."append-field-1.0.0" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -103209,7 +103176,7 @@ in sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."async-0.1.22" - sources."async-mutex-0.3.1" + sources."async-mutex-0.3.2" sources."asynckit-0.4.0" sources."axios-0.21.1" sources."balanced-match-1.0.2" @@ -103270,7 +103237,7 @@ in ]; }) sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cronosjs-1.7.1" sources."css-select-4.1.3" @@ -103291,8 +103258,8 @@ in sources."dicer-0.2.5" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.0" - sources."domutils-2.7.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" (sources."duplexify-4.1.2" // { dependencies = [ sources."readable-stream-3.6.0" @@ -103320,7 +103287,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -103369,7 +103336,7 @@ in sources."json-buffer-3.0.1" sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.4" + sources."jsonata-1.8.5" (sources."jsonfile-6.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -103429,12 +103396,12 @@ in ]; }) sources."ms-2.0.0" - sources."multer-1.4.2" + sources."multer-1.4.3" sources."mustache-4.2.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-red-admin-2.2.0" sources."nopt-5.0.0" sources."normalize-url-6.1.0" @@ -103473,7 +103440,7 @@ in sources."regenerator-runtime-0.13.9" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.0" + sources."resolve-alpn-1.2.1" sources."responselike-2.0.0" sources."retry-0.6.1" sources."rimraf-3.0.2" @@ -103509,7 +103476,7 @@ in sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" - (sources."tar-6.1.2" // { + (sources."tar-6.1.11" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" @@ -103520,7 +103487,7 @@ in sources."tslib-2.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.10" + sources."uglify-js-3.14.1" sources."uid-safe-2.1.5" sources."uid2-0.0.4" sources."universalify-0.1.2" @@ -103561,7 +103528,7 @@ in sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -103581,7 +103548,7 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -103726,7 +103693,11 @@ in sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."walk-2.3.14" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -103939,9 +103910,9 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.2" + sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -104445,10 +104416,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.21.0"; + version = "7.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.21.0.tgz"; - sha512 = "OYSQykXItCDXYGb9U8o85Snhmbe0k/nwVK6CmUNmgtOcfPevVB5ZXwA44eWOCvM+WdWYQsJAJoA7eCHKImQt8g=="; + url = "https://registry.npmjs.org/npm/-/npm-7.22.0.tgz"; + sha512 = "HJnjTCrGGnacPMCSnrxuHGf2H4VdrY7hwTAK1RwByg0K96KIuTR4QNioFW+bnc/pW0uwpk9lLsDf4BeEQhTv2Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -104463,10 +104434,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.8.3"; + version = "11.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.8.3.tgz"; - sha512 = "NslIB6Af7GagVrN+bvBkObLyawIZfOnDnl8n9MHE+dFt0aChRYtvR6T2BLJKzOPIepCLmmh0NRR/qha0ExAELQ=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.8.5.tgz"; + sha512 = "IYSHjlWe8UEugDy7X0qjBeJwcni4DlcWdBK4QQEbwgkNlEDlXyd4yQJYWFumKaJzrp/n5/EcvaboXsBD1Er/pw=="; }; dependencies = [ sources."@gar/promisify-1.1.2" @@ -104499,7 +104470,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."argparse-2.0.1" sources."array-union-2.1.0" sources."asn1-0.2.4" @@ -104547,7 +104518,7 @@ in sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" sources."debug-4.3.2" @@ -104677,7 +104648,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.4" + sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -104785,7 +104756,11 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-name-3.0.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."which-2.0.2" sources."wide-align-1.1.3" (sources."widest-line-3.1.0" // { @@ -104854,7 +104829,7 @@ in sources."ajv-6.12.6" sources."ansi-regex-3.0.0" sources."aproba-2.0.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-2.0.0" sources."argparse-0.1.15" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -104917,7 +104892,6 @@ in sources."ini-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" @@ -104945,23 +104919,18 @@ in sources."semver-2.3.2" ]; }) - sources."npmlog-5.0.0" + sources."npmlog-5.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."osenv-0.0.3" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."readable-stream-3.6.0" sources."request-2.88.2" sources."retry-0.6.0" sources."rimraf-2.7.1" @@ -104973,11 +104942,7 @@ in sources."slide-1.1.6" sources."sshpk-1.16.1" sources."string-width-2.1.1" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string_decoder-1.3.0" sources."strip-ansi-4.0.0" (sources."tar-0.1.17" // { dependencies = [ @@ -105065,56 +105030,56 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.15.0" // { + (sources."@babel/generator-7.15.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.15.0" // { + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.4" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.9" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-namespace-from-7.14.5" sources."@babel/plugin-proposal-json-strings-7.14.5" @@ -105125,7 +105090,7 @@ in sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.15.4" sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -105147,25 +105112,25 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-classes-7.15.4" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" sources."@babel/plugin-transform-flow-strip-types-7.14.5" - sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.0" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/plugin-transform-regenerator-7.14.5" @@ -105177,16 +105142,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.0" // { + (sources."@babel/preset-env-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -105291,7 +105256,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -105308,7 +105273,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -105323,7 +105288,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -105335,12 +105300,12 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.3" // { + (sources."core-js-compat-3.17.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -105394,7 +105359,7 @@ in sources."deasync-0.1.23" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" (sources."defaults-1.0.3" // { dependencies = [ sources."clone-1.0.4" @@ -105434,7 +105399,7 @@ in sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" sources."domexception-1.0.1" - (sources."domhandler-4.2.0" // { + (sources."domhandler-4.2.2" // { dependencies = [ sources."domelementtype-2.2.0" ]; @@ -105446,7 +105411,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105456,7 +105421,7 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.18.5" // { + (sources."es-abstract-1.18.6" // { dependencies = [ sources."object-inspect-1.11.0" ]; @@ -105507,6 +105472,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-intrinsic-1.1.1" sources."get-port-3.2.0" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.7" @@ -105562,7 +105528,7 @@ in dependencies = [ sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domutils-2.7.0" + sources."domutils-2.8.0" ]; }) sources."http-errors-1.7.3" @@ -105939,7 +105905,7 @@ in sources."snapdragon-util-3.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."source-map-url-0.4.1" (sources."split-string-3.1.0" // { dependencies = [ @@ -106045,7 +106011,11 @@ in sources."uuid-3.4.0" sources."v8-compile-cache-2.3.0" sources."vendors-1.0.4" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vlq-0.2.3" sources."vm-browserify-1.1.2" sources."w3c-hr-time-1.0.2" @@ -106325,7 +106295,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -106499,7 +106469,7 @@ in sources."concat-stream-1.6.2" sources."consume-http-header-1.0.0" sources."consume-until-1.0.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."currently-unhandled-0.4.1" sources."cyclist-0.1.1" sources."debug-2.6.9" @@ -106825,7 +106795,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crc-3.8.0" sources."crc32-stream-3.0.1" sources."cyclist-0.1.1" @@ -107092,7 +107062,11 @@ in sources."utp-0.0.7" sources."uuid-3.4.0" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."which-1.3.1" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -107130,7 +107104,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."array-union-2.1.0" sources."at-least-node-1.0.0" sources."base64-js-1.5.1" @@ -107148,11 +107122,11 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-4.3.2" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."dir-glob-3.0.1" @@ -107216,12 +107190,12 @@ in ]; }) sources."napi-build-utils-1.0.2" - (sources."node-abi-2.30.0" // { + (sources."node-abi-2.30.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -107358,7 +107332,7 @@ in sources."semver-5.7.1" ]; }) - sources."axios-0.21.1" + sources."axios-0.21.4" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."blessed-0.1.81" @@ -107376,13 +107350,13 @@ in sources."commander-2.15.1" sources."concat-map-0.0.1" sources."continuation-local-storage-3.2.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cron-1.8.2" sources."culvert-0.1.2" sources."data-uri-to-buffer-3.0.1" sources."dayjs-1.8.36" sources."debug-4.3.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."degenerator-2.2.0" sources."depd-1.1.2" sources."emitter-listener-1.1.2" @@ -107398,7 +107372,7 @@ in sources."fclone-1.0.11" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -107499,7 +107473,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.8.6" + sources."systeminformation-5.8.7" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -107534,10 +107508,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.14.3"; + version = "6.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.14.3.tgz"; - sha512 = "9fU65+uSa2kB5+/b2crLT3lLcauExf9v6vPkDa4javQVnrz3/HDa6TLEshgo5BXXks3wThq+eCrDlVvD7AUwOQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.14.7.tgz"; + sha512 = "/pjz4Eod3Heyxw/QCGLYpkZR8YNuzTTblgcVC+qvvYCtX0Wb5J9jVcbHoSRqC2jeo4ldtg8H9dssPlHlH50I7w=="; }; buildInputs = globalBuildInputs; meta = { @@ -107586,7 +107560,7 @@ in sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; dependencies = [ - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."nanoid-3.1.25" sources."source-map-js-0.6.2" ]; @@ -107624,7 +107598,7 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" @@ -107696,10 +107670,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz"; - sha512 = "lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz"; + sha512 = "DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -107735,6 +107709,27 @@ in bypassCache = true; reconstructLock = true; }; + prisma = nodeEnv.buildNodePackage { + name = "prisma"; + packageName = "prisma"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma/-/prisma-3.0.1.tgz"; + sha512 = "ENmYAopd56nkds5/IOSTGixbkbUN2QdEzB4cp/mtaGB/G0OArbP6cnbA/9u02Pe29RdErbNOoIdCGASjpItJwQ=="; + }; + dependencies = [ + sources."@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Prisma is an open-source database toolkit. It includes a JavaScript/TypeScript ORM for Node.js, migrations and a modern GUI to view and edit the data in your database. You can use Prisma in new projects or add it to an existing one."; + homepage = "https://www.prisma.io"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; @@ -107844,7 +107839,7 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -107873,7 +107868,7 @@ in sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -108040,10 +108035,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.15.4"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.4.tgz"; - sha512 = "llUv605I8yvraO98rb5RmmqPdpWBno7IpIlgNlX3Nq3Q4lvB7G0OxGK89JuAoVZ8T/xkTzhjyuzw0sty0DoY3Q=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.5.tgz"; + sha512 = "Km6LOus92Rab315/OhnILwslCseXbl8s53m0T8te0SYeYgNfUnxVh4/m/r217PAApicemaT3ZMdnXrtAZJ5U6Q=="; }; dependencies = [ sources."isexe-2.0.0" @@ -108114,11 +108109,22 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@ungap/promise-all-settled-1.1.2" sources."agent-base-6.0.2" + sources."ansi-colors-4.1.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" sources."appdata-path-1.0.0" + sources."argparse-2.0.1" sources."at-least-node-1.0.0" - sources."axios-0.21.1" + sources."axios-0.21.4" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" sources."blueimp-md5-2.18.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browser-stdout-1.3.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -108126,72 +108132,172 @@ in ]; }) sources."call-bind-1.0.2" + sources."camelcase-6.2.0" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."supports-color-7.2.0" + ]; + }) + sources."chokidar-3.5.1" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) sources."clone-response-1.0.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.4.0" sources."commander-5.1.0" sources."compare-versions-3.6.0" + sources."concat-map-0.0.1" sources."debug-4.3.2" + sources."decamelize-4.0.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."diff-5.0.0" sources."duplexer3-0.1.4" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."follow-redirects-1.14.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" + sources."flat-5.0.2" + sources."follow-redirects-1.14.3" sources."fs-extra-9.1.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.2" sources."got-9.6.0" sources."graceful-fs-4.2.8" + sources."growl-1.10.5" sources."has-1.0.3" + sources."has-flag-4.0.0" sources."has-symbols-1.0.2" + sources."he-1.2.0" sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" sources."ini-1.3.8" sources."ip-1.1.5" + sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-plain-obj-2.1.0" sources."is-wsl-2.2.0" - sources."js-base64-3.6.1" + sources."isexe-2.0.0" + sources."js-base64-3.7.0" + sources."js-yaml-4.0.0" sources."json-buffer-3.0.0" sources."jsonfile-6.1.0" sources."keyv-3.1.0" sources."kleur-3.0.3" sources."latest-version-5.1.0" + sources."locate-path-6.0.0" sources."lodash.flatmap-4.5.0" + sources."log-symbols-4.0.0" sources."lowercase-keys-1.0.1" sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" sources."minimist-1.2.5" + (sources."mocha-8.4.0" // { + dependencies = [ + (sources."debug-4.3.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."ms-2.1.3" + ]; + }) sources."moment-2.29.1" sources."ms-2.1.2" + sources."nanoid-3.1.20" + sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."object-inspect-1.11.0" sources."once-1.4.0" sources."open-7.4.2" sources."p-cancelable-1.1.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."package-json-6.5.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."picomatch-2.3.0" sources."pixiv-api-client-0.25.0" sources."prepend-http-2.0.0" sources."prompts-2.4.1" sources."pump-3.0.0" sources."qs-6.10.1" - sources."rc-1.2.8" + sources."randombytes-2.1.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) + sources."readdirp-3.5.0" sources."readline-sync-1.4.10" sources."register-protocol-win32-1.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" + sources."require-directory-2.1.1" sources."responselike-1.0.2" + sources."safe-buffer-5.2.1" sources."semver-6.3.0" + sources."serialize-javascript-5.0.1" sources."side-channel-1.0.4" sources."sisteransi-1.0.5" sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" - sources."strip-json-comments-2.0.1" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-8.1.1" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."universalify-2.0.0" sources."url-parse-lax-3.0.0" + sources."which-2.0.2" + sources."wide-align-1.1.3" sources."winreg-1.2.4" + sources."workerpool-6.1.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" + sources."y18n-5.0.8" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -108206,10 +108312,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.163"; + version = "1.1.166"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.163.tgz"; - sha512 = "CU0WPzr+6ZKIqCqqVrOtxMFWdzdOV18zKmC7dVBzp3snuun8JafnnmUzNJpO8IJLN/bQNSLb3riLtXFM/8Xxbg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.166.tgz"; + sha512 = "mO+iPT2dhHzlplAV3iKE6u4gUstGZxxLyMSRd1PKZqWhwhTCCGjn3/7VqbAwUt4fuhY8g0V+SAsu+MPT4H3FvQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -108254,11 +108360,11 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."convert-source-map-1.8.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-6.0.5" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."duplexer2-0.1.4" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -108322,7 +108428,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-inspect-1.4.1" @@ -108458,7 +108564,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."async-0.2.10" - sources."available-typed-arrays-1.0.4" + sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" @@ -108468,7 +108574,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -108477,6 +108583,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."glob-7.1.7" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -108499,7 +108606,7 @@ in sources."is-set-2.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" + sources."is-typed-array-1.1.8" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -108532,7 +108639,7 @@ in sources."utile-0.2.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.6" + sources."which-typed-array-1.1.7" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -108559,53 +108666,53 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.14.8" + sources."@babel/cli-7.15.4" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - (sources."@babel/core-7.15.0" // { + (sources."@babel/core-7.15.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.15.0" - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" - (sources."@babel/helper-compilation-targets-7.15.0" // { + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.15.0" + sources."@babel/helper-create-class-features-plugin-7.15.4" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.9" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.15.4" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" sources."@babel/plugin-proposal-export-namespace-from-7.14.5" @@ -108617,7 +108724,7 @@ in sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.15.4" sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -108639,24 +108746,24 @@ in sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.14.9" + sources."@babel/plugin-transform-classes-7.15.4" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" - sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.0" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" sources."@babel/plugin-transform-modules-umd-7.14.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-property-literals-7.14.5" sources."@babel/plugin-transform-react-display-name-7.15.1" sources."@babel/plugin-transform-react-jsx-7.14.9" @@ -108676,7 +108783,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.0" // { + (sources."@babel/preset-env-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -108685,16 +108792,16 @@ in sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.15.3" - sources."@babel/runtime-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -108767,11 +108874,11 @@ in sources."async-limiter-1.0.1" sources."atob-2.1.2" sources."autoprefixer-9.8.6" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."babel-core-7.0.0-bridge.0" (sources."babel-loader-8.2.2" // { dependencies = [ - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" @@ -108848,7 +108955,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -108882,7 +108989,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -108940,7 +109047,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."commander-4.1.1" sources."commondir-1.0.1" sources."component-bind-1.0.0" @@ -108967,12 +109074,12 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.16.3" // { + (sources."core-js-compat-3.17.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cosmiconfig-6.0.0" (sources."create-ecdh-4.0.4" // { @@ -109092,7 +109199,7 @@ in }) sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" - (sources."domhandler-4.2.0" // { + (sources."domhandler-4.2.2" // { dependencies = [ sources."domelementtype-2.2.0" ]; @@ -109111,7 +109218,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -109142,7 +109249,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -109245,7 +109352,7 @@ in sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -109263,6 +109370,7 @@ in sources."get-intrinsic-1.1.1" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."git-clone-0.1.0" sources."git-promise-1.0.0" @@ -109341,7 +109449,7 @@ in dependencies = [ sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domutils-2.7.0" + sources."domutils-2.8.0" ]; }) sources."http-cache-semantics-3.8.1" @@ -109848,7 +109956,7 @@ in sources."css-what-5.0.1" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domutils-2.7.0" + sources."domutils-2.8.0" sources."nth-check-2.0.0" sources."strip-ansi-3.0.1" ]; @@ -110011,7 +110119,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { + (sources."source-map-support-0.5.20" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -110371,7 +110479,7 @@ in sources."@mozilla/readability-0.4.1" sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" - sources."acorn-8.4.1" + sources."acorn-8.5.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -110396,7 +110504,7 @@ in sources."data-urls-2.0.0" sources."debug-4.3.2" sources."decimal.js-10.3.1" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" (sources."domexception-2.0.1" // { dependencies = [ @@ -110450,7 +110558,7 @@ in sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -110477,33 +110585,33 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.15.0" // { + (sources."@babel/generator-7.15.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.14.5" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.3" - sources."@babel/runtime-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/parser-7.15.5" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.4" sources."@redocly/ajv-8.6.2" - (sources."@redocly/openapi-core-1.0.0-beta.55" // { + (sources."@redocly/openapi-core-1.0.0-beta.58" // { dependencies = [ - sources."@types/node-14.17.12" + sources."@types/node-14.17.15" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" @@ -110560,11 +110668,11 @@ in sources."clsx-1.1.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110600,7 +110708,7 @@ in sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fill-range-7.0.1" sources."foreach-2.0.5" sources."fsevents-2.3.2" @@ -110656,12 +110764,12 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.3.2" + sources."mobx-6.3.3" sources."mobx-react-7.2.0" - sources."mobx-react-lite-3.2.0" + sources."mobx-react-lite-3.2.1" sources."ms-2.1.2" sources."neo-async-2.6.2" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" @@ -110748,7 +110856,7 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -111005,7 +111113,7 @@ in "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.2.727"; + version = "0.2.735"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -111032,16 +111140,16 @@ in sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" - sources."@types/node-14.17.12" + sources."@types/node-14.17.15" sources."@types/node-fetch-2.5.12" - sources."@types/vscode-1.59.0" - sources."@typescript-eslint/eslint-plugin-4.29.3" - sources."@typescript-eslint/experimental-utils-4.29.3" - sources."@typescript-eslint/parser-4.29.3" - sources."@typescript-eslint/scope-manager-4.29.3" - sources."@typescript-eslint/types-4.29.3" - sources."@typescript-eslint/typescript-estree-4.29.3" - sources."@typescript-eslint/visitor-keys-4.29.3" + sources."@types/vscode-1.60.0" + sources."@typescript-eslint/eslint-plugin-4.31.0" + sources."@typescript-eslint/experimental-utils-4.31.0" + sources."@typescript-eslint/parser-4.31.0" + sources."@typescript-eslint/scope-manager-4.31.0" + sources."@typescript-eslint/types-4.31.0" + sources."@typescript-eslint/typescript-estree-4.31.0" + sources."@typescript-eslint/visitor-keys-4.31.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -111091,7 +111199,7 @@ in sources."commander-7.2.0" sources."commandpost-1.4.0" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."css-select-4.1.3" sources."css-what-5.0.1" @@ -111143,7 +111251,7 @@ in sources."d3-zoom-3.0.0" sources."debug-4.3.2" sources."decamelize-4.0.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."denodeify-1.2.1" @@ -111152,8 +111260,8 @@ in sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.0" - sources."domutils-2.7.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { dependencies = [ @@ -111281,7 +111389,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-9.1.0" // { + (sources."mocha-9.1.1" // { dependencies = [ sources."argparse-2.0.1" (sources."debug-4.3.1" // { @@ -111299,7 +111407,7 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.23" sources."natural-compare-1.4.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."normalize-path-3.0.0" sources."nth-check-2.0.0" sources."object-inspect-1.11.0" @@ -111394,8 +111502,8 @@ in sources."tunnel-0.0.6" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typed-rest-client-1.8.5" - sources."typescript-4.3.5" + sources."typed-rest-client-1.8.6" + sources."typescript-4.4.2" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -111404,7 +111512,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.96.1" // { + (sources."vsce-1.97.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -111462,7 +111570,7 @@ in }; dependencies = [ sources."aws-sdk-1.18.0" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" sources."call-bind-1.0.2" @@ -111475,7 +111583,7 @@ in }) sources."cookie-0.1.0" sources."cookie-signature-1.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crc-0.2.0" sources."crypto-0.0.3" sources."debug-4.3.2" @@ -111497,7 +111605,7 @@ in sources."commander-1.3.2" ]; }) - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."formidable-1.0.11" sources."fresh-0.2.0" sources."function-bind-1.1.1" @@ -111551,10 +111659,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.38.1"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.38.1.tgz"; - sha512 = "Lj8nPaSYOuRhgqdyShV50fY5jKnvaRmikUNalMPmbH+tKMGgEKVkltI/lP30PEfO2T1t6R9yc2QIBLgOc3uaFw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz"; + sha512 = "F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -111724,10 +111832,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.56.0"; + version = "2.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.56.0.tgz"; - sha512 = "/nmD1aLe+rXZpTmnxzHogCt5qGGBrE+wce7LcLV1yNne+aymyCcL8vcLj2Ib2ukTXweWpr8MxAgdXVtbwY4EGA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.57.0.tgz"; + sha512 = "/gLzaqdisNlymMiQJMkFoACy7NXkOd7E67sbcOrENXuVb48QAS4PTT8VPkMNu6eQonlphGagbKhpqVmKzHJDmQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -111760,7 +111868,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.16.0" // { + (sources."@serverless/components-3.17.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -111795,16 +111903,19 @@ in sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.2.3" // { + (sources."@serverless/platform-client-china-2.2.6" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.7.0" // { + (sources."@serverless/utils-5.10.0" // { dependencies = [ + sources."cli-progress-footer-2.0.0" sources."get-stream-6.0.1" + sources."has-flag-4.0.0" + sources."supports-color-8.1.1" sources."write-file-atomic-3.0.3" ]; }) @@ -111816,10 +111927,10 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.2" + sources."@types/keyv-3.1.3" sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -111865,7 +111976,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -111880,7 +111991,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.977.0" // { + (sources."aws-sdk-2.985.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -111890,7 +112001,7 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."backo2-1.0.2" sources."balanced-match-1.0.2" sources."base64-arraybuffer-0.1.4" @@ -111977,6 +112088,12 @@ in sources."process-utils-2.6.0" ]; }) + (sources."cli-sprintf-format-1.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."cli-color-1.4.0" + ]; + }) sources."cli-width-3.0.0" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -112103,7 +112220,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fastest-levenshtein-1.0.12" sources."fastq-1.12.0" sources."fd-slicer-1.1.0" @@ -112113,11 +112230,11 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-7.0.0" + sources."filesize-8.0.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" @@ -112166,6 +112283,7 @@ in sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-ansi-4.0.1" (sources."has-binary2-1.0.3" // { dependencies = [ sources."isarray-2.0.1" @@ -112267,9 +112385,11 @@ in sources."lodash.flatten-4.4.0" sources."lodash.isplainobject-4.0.6" sources."lodash.union-4.6.0" - (sources."log-6.0.0" // { + sources."log-6.1.0" + (sources."log-node-8.0.0" // { dependencies = [ - sources."type-1.2.0" + sources."has-flag-4.0.0" + sources."supports-color-8.1.1" ]; }) (sources."logform-2.2.0" // { @@ -112315,13 +112435,13 @@ in sources."nested-error-stacks-2.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - (sources."node-abi-2.30.0" // { + (sources."node-abi-2.30.1" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."node-dir-0.1.17" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."noop-logger-0.1.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" @@ -112403,7 +112523,7 @@ in }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-alpn-1.2.0" + sources."resolve-alpn-1.2.1" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.10.1" @@ -112425,7 +112545,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.44.0" // { + (sources."simple-git-2.45.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -112586,7 +112706,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.6.3" @@ -112649,7 +112769,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -112822,7 +112942,11 @@ in sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) (sources."ws-0.4.31" // { dependencies = [ sources."commander-0.6.1" @@ -112890,7 +113014,7 @@ in sources."commander-2.9.0" sources."component-emitter-1.3.0" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" @@ -113235,10 +113359,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.692.0"; + version = "1.704.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.692.0.tgz"; - sha512 = "N/hfiyccrQRwiU1fFzG1uxKU0ODRTi7UtcZJhtRidE/DT3Vs35pWU/y4vVfXP/OegtihAwGjEirxNeL8o632mQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.704.0.tgz"; + sha512 = "vYt8Zp2O5Rce//JAqkivWKTSEGvSIvFMEPy6UM2tCUfRoQdk+398YP0l1yLsGfu8in4Q9A7H+Vy3om4fcFliYQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -113253,16 +113377,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "4.1.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; - sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.2.0.tgz"; + sha512 = "sjlGfMmnaWvTRVxGRGWyhd9ctpg4APxWAxu85O/SxekkxHhfxmePWZbaYCkeX5QQX0z1YEnKOlNt6w82E4Nzug=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -113270,14 +113394,14 @@ in sources."cookie-0.4.1" sources."cors-2.8.5" sources."debug-4.3.2" - sources."engine.io-5.1.1" - sources."engine.io-parser-4.0.2" + sources."engine.io-5.2.0" + sources."engine.io-parser-4.0.3" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" - sources."socket.io-adapter-2.3.1" + sources."socket.io-adapter-2.3.2" sources."socket.io-parser-4.0.4" sources."vary-1.1.2" sources."ws-7.4.6" @@ -113530,7 +113654,7 @@ in sources."atomic-file-1.1.5" sources."atomic-file-rw-0.2.2" sources."attach-ware-1.1.1" - sources."available-typed-arrays-1.0.4" + sources."available-typed-arrays-1.0.5" sources."bail-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -113542,6 +113666,7 @@ in sources."base64-js-1.5.1" sources."base64-url-2.3.3" sources."bash-color-0.0.4" + sources."bencode-2.0.2" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" @@ -113616,7 +113741,7 @@ in sources."continuable-para-1.2.0" sources."continuable-series-1.2.0" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cpu-percentage-1.0.3" sources."crc-3.6.0" sources."cross-spawn-6.0.5" @@ -113651,7 +113776,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -113721,6 +113846,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" @@ -113814,7 +113940,7 @@ in sources."is-set-2.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.7" + sources."is-typed-array-1.1.8" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.20" sources."is-weakmap-2.0.1" @@ -114050,6 +114176,7 @@ in sources."push-stream-11.0.1" ]; }) + sources."querystringify-2.2.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" @@ -114145,6 +114272,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" + sources."requires-port-1.0.0" sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" @@ -114218,12 +114346,19 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" + (sources."ssb-bendy-butt-0.12.3" // { + dependencies = [ + sources."ssb-keys-8.2.0" + ]; + }) + sources."ssb-bfe-3.1.1" + sources."ssb-bfe-spec-0.3.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.3.1" // { + (sources."ssb-db2-2.4.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -114277,7 +114412,9 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" + sources."ssb-typescript-2.5.0" sources."ssb-unix-socket-1.0.0" + sources."ssb-uri2-1.5.2" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -114370,6 +114507,7 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" + sources."url-parse-1.5.3" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -114384,11 +114522,11 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.6" + sources."which-typed-array-1.1.7" sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -114488,14 +114626,14 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.977.0" // { + (sources."aws-sdk-2.985.0" // { dependencies = [ sources."uuid-3.3.2" ]; }) sources."aws-sign2-0.6.0" sources."aws4-1.11.0" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" @@ -114673,7 +114811,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -115273,31 +115411,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" - sources."@babel/core-7.15.0" - sources."@babel/generator-7.15.0" - sources."@babel/helper-compilation-targets-7.15.0" - sources."@babel/helper-function-name-7.14.5" - sources."@babel/helper-get-function-arity-7.14.5" - sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.15.0" - sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.15.0" - sources."@babel/helper-optimise-call-expression-7.14.5" - sources."@babel/helper-replace-supers-7.15.0" - sources."@babel/helper-simple-access-7.14.8" - sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/core-7.15.5" + sources."@babel/generator-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.15.3" + sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.3" - sources."@babel/template-7.14.5" - sources."@babel/traverse-7.15.0" - sources."@babel/types-7.15.0" + sources."@babel/parser-7.15.5" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -115323,11 +115461,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -115343,7 +115481,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.1" @@ -115365,7 +115503,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -115604,7 +115742,7 @@ in sha512 = "EstDoqxjqWStWELh7Z0qytqUDl/ikdNEr21dveNc4fUDnhnqO2F2jHEufqoNnC3GfBji3GIUHvoXsp/I5lMbCg=="; }; dependencies = [ - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -115613,6 +115751,7 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."buffer-crc32-0.2.13" sources."callsites-3.1.0" sources."chalk-4.1.2" sources."chokidar-3.5.2" @@ -115620,11 +115759,13 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."detect-indent-6.1.0" + sources."es6-promise-3.3.1" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."glob-7.1.7" sources."glob-parent-5.1.2" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."import-fresh-3.3.0" sources."inflight-1.0.6" @@ -115633,9 +115774,11 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" + sources."magic-string-0.25.7" sources."min-indent-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + sources."mkdirp-0.5.5" sources."mri-1.1.6" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -115644,13 +115787,17 @@ in sources."picomatch-2.3.0" sources."readdirp-3.6.0" sources."resolve-from-4.0.0" + sources."rimraf-2.7.1" sources."sade-1.7.4" + sources."sander-0.5.1" + sources."sorcery-0.10.0" sources."source-map-0.7.3" + sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" - sources."svelte-preprocess-4.8.0" + sources."svelte-preprocess-4.9.4" sources."to-regex-range-5.0.1" - sources."typescript-4.3.5" + sources."typescript-4.4.2" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -115675,7 +115822,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -115721,7 +115868,7 @@ in sources."svelte2tsx-0.4.5" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."typescript-4.3.5" + sources."typescript-4.4.2" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -115751,15 +115898,15 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.4.0.tgz"; - sha512 = "W25S1UUm9Lm9VnE0TvCzL7aso/NCzDEaXLaElCUO/KaVitw0+IBicSVfM1L1c0YHK5TOFh73yQ2naCpVHEQ/OQ=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.5.0.tgz"; + sha512 = "FSdBOOo271VyF/qZnOn1PgwCdt1v4Dx0Sey+U1jgqm1vqRYjPGdip0RGrFW6ItwtkBB8rHgHk26dlVr0uCs82Q=="; }; dependencies = [ sources."@trysound/sax-0.1.1" sources."boolbase-1.0.0" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."commander-7.2.0" sources."css-select-4.1.3" sources."css-tree-1.1.3" @@ -115767,8 +115914,8 @@ in sources."csso-4.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.0" - sources."domutils-2.7.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" sources."entities-2.2.0" sources."mdn-data-2.0.14" sources."nth-check-2.0.0" @@ -115901,7 +116048,7 @@ in sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" (sources."cross-spawn-5.1.0" // { dependencies = [ @@ -116369,7 +116516,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -116496,7 +116643,7 @@ in sources."module-alias-2.2.2" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."oauth-sign-0.9.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" @@ -116560,7 +116707,7 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."base64-js-1.5.1" sources."bindings-1.5.0" (sources."bl-4.1.0" // { @@ -116572,7 +116719,7 @@ in sources."chownr-1.1.4" sources."code-point-at-1.1.0" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."delegates-1.0.0" @@ -116593,7 +116740,7 @@ in sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-2.30.0" + sources."node-abi-2.30.1" sources."node-addon-api-3.0.2" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -116623,7 +116770,7 @@ in ]; }) sources."tunnel-agent-0.6.0" - sources."usb-1.7.1" + sources."usb-1.7.2" sources."util-deprecate-1.0.2" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" @@ -116654,7 +116801,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."enhanced-resolve-2.3.0" sources."errno-0.1.8" sources."fs.realpath-1.0.0" @@ -116700,7 +116847,7 @@ in sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.7.3" - (sources."source-map-support-0.5.19" // { + (sources."source-map-support-0.5.20" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -116771,7 +116918,7 @@ in sources."crypt-0.0.2" sources."debug-4.3.2" sources."deep-equal-1.1.1" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."define-properties-1.1.3" sources."diff-4.0.2" sources."emoji-regex-8.0.0" @@ -117035,7 +117182,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.6" - sources."acorn-8.4.1" + sources."acorn-8.5.0" sources."acorn-jsx-5.3.2" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { @@ -117095,7 +117242,7 @@ in ]; }) sources."configstore-5.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" sources."debug-4.3.2" @@ -117505,7 +117652,7 @@ in sources."boundary-1.0.1" sources."buffer-from-1.1.2" sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."object-assign-4.1.1" @@ -117642,10 +117789,11 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" @@ -117751,10 +117899,11 @@ in sources."array-includes-3.1.3" sources."call-bind-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.18.5" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" + sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" @@ -117839,8 +117988,8 @@ in sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.2" - sources."@types/node-16.7.2" + sources."@types/keyv-3.1.3" + sources."@types/node-16.9.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -117856,7 +118005,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -117916,7 +118065,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.16.3" + sources."core-js-3.17.3" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -118071,7 +118220,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.9.0" // { + (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -118168,7 +118317,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-alpn-1.2.0" + sources."resolve-alpn-1.2.1" sources."responselike-2.0.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" @@ -118260,7 +118409,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -118279,10 +118428,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.132.0"; + version = "0.132.2"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.132.0.tgz"; - sha512 = "kv4WeP3O5/8mcHyuGYnqBQYdEfzSz9kEkq4H/9J966epNlGSVJ8gYC3SwT9qIITdgC0OvLr3zPltCS4dUyg2eg=="; + url = "https://registry.npmjs.org/three/-/three-0.132.2.tgz"; + sha512 = "0wcR7LxxkXMn6Gi58gEs3QvY8WpTVXA31L2VOvpjm4ZPYFRHCZC13UqynheFoS5OXDYgtBneN0dhbaNBE8iLhQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -118460,7 +118609,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -118604,6 +118753,7 @@ in (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" + sources."core-util-is-1.0.2" sources."extsprintf-1.4.0" ]; }) @@ -118706,10 +118856,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.3.5"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; - sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz"; + sha512 = "gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -118724,10 +118874,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.1.tgz"; - sha512 = "ZqqD4XK1EgITEoW1SaOnNe473K5EMr7vSYwFeqK4Fe37TjNyEwB+2vXuqW01kPujiw7tRpv3teDAl7WtP9AmIw=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.6.2.tgz"; + sha512 = "JiLQ5G7CWlswUFhBhudoX4jbfgyo/CIIED3CIrrlwcl/QSTt1gDZX+3sx1H/yTwzJRhnKgKS/AnbzbU9tgSVEA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -118805,10 +118955,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.1"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; - sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz"; + sha512 = "rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A=="; }; buildInputs = globalBuildInputs; meta = { @@ -118854,7 +119004,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.12" + sources."@types/node-14.17.15" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -118896,7 +119046,7 @@ in sources."cookie-0.4.0" sources."cookie-parser-1.4.5" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crossroads-0.12.2" sources."debug-2.6.9" @@ -118907,7 +119057,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.9" + sources."diff2html-3.4.11" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -118922,7 +119072,7 @@ in sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.2" + sources."engine.io-parser-4.0.3" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -118935,7 +119085,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."fast-safe-stringify-2.0.8" + sources."fast-safe-stringify-2.1.1" sources."fecha-4.2.1" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" @@ -119067,7 +119217,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.3.1" + sources."socket.io-adapter-2.3.2" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" @@ -119135,7 +119285,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -119292,7 +119442,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."canvas-2.8.0" @@ -119311,7 +119461,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."d3-array-2.12.1" sources."d3-color-2.0.0" sources."d3-delaunay-5.3.0" @@ -119366,7 +119516,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.15.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."nopt-5.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -119458,14 +119608,13 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.1.0.tgz"; - sha512 = "HEyf0iHnCNmWkWFIbEmMphcJwZpcBnfnU8v+Ojrndr7ihDueojHMOSikoyz/GNpdkai+QFxLboA6DDCTtFv9iQ=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.1.1.tgz"; + sha512 = "V085gNkbgbmcVC/Q3dJjmIioxcDicxMHvH0FIKOPxdplzt+qU9xGIhQy7scj0tSMYnmAPCayB5oLkkQXFb6w1w=="; }; dependencies = [ sources."@types/clone-2.1.1" - sources."@types/fast-json-stable-stringify-2.1.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-flat-polyfill-1.0.1" @@ -119483,13 +119632,13 @@ in sources."require-directory-2.1.1" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."tslib-2.2.0" + sources."tslib-2.3.1" sources."vega-event-selector-2.0.6" sources."vega-expression-4.0.1" sources."vega-util-1.16.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-16.2.0" + sources."yargs-17.1.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -119513,7 +119662,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -119594,7 +119743,7 @@ in sources."semver-diff-3.1.1" sources."signal-exit-3.0.3" sources."source-map-0.6.1" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" (sources."string-width-4.2.2" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -119634,10 +119783,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.4.tgz"; - sha512 = "MHbdFNU9C7pwXMY7UvzjdslNBRwFazy+wDe7Kv30L1Hl6BiMpkOAQ4RgvevYQAjm/NpS6gvMz7N0FFKr2qjKsw=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.5.tgz"; + sha512 = "893GcGS5oFjBK2Dakdl4I0x8rtkgI+TOi44M9PmFU6YV+kwoLIRAxIcoF55rGiHFESCq98C+yjWn1OXznWgm7A=="; }; buildInputs = globalBuildInputs; meta = { @@ -119696,14 +119845,14 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.2" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.16.0" // { + (sources."eslint-plugin-vue-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -119779,7 +119928,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.2" + sources."prettier-2.4.0" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.2.0" @@ -119820,10 +119969,10 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.5" + sources."typescript-4.4.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.10.0" // { + (sources."vue-eslint-parser-7.11.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -120024,9 +120173,9 @@ in sources."vscode-nls-4.1.2" ]; }) - sources."typescript-4.3.5" - sources."vscode-css-languageservice-5.1.4" - sources."vscode-html-languageservice-4.0.7" + sources."typescript-4.4.2" + sources."vscode-css-languageservice-5.1.5" + sources."vscode-html-languageservice-4.0.8" sources."vscode-json-languageservice-4.1.7" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" @@ -120059,7 +120208,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.59.0" + sources."@types/vscode-1.60.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -120082,7 +120231,7 @@ in sources."@webpack-cli/serve-1.5.2" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.4.1" + sources."acorn-8.5.0" sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -120099,12 +120248,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -120125,10 +120274,10 @@ in sources."clone-deep-4.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."commander-6.2.1" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."css-select-4.1.3" sources."css-what-5.0.1" @@ -120142,9 +120291,9 @@ in sources."diff-5.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.0" - sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.818" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" + sources."electron-to-chromium-1.3.833" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -120203,7 +120352,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.0.6" + sources."jest-worker-27.1.1" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -120299,7 +120448,7 @@ in sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."source-map-0.6.1" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."sprintf-js-1.0.3" sources."string-argv-0.3.1" sources."string-width-2.1.1" @@ -120315,7 +120464,7 @@ in sources."source-map-0.7.3" ]; }) - (sources."terser-webpack-plugin-5.1.4" // { + (sources."terser-webpack-plugin-5.2.4" // { dependencies = [ sources."serialize-javascript-6.0.0" ]; @@ -120331,8 +120480,8 @@ in }) sources."tslib-2.3.1" sources."tunnel-0.0.6" - sources."typed-rest-client-1.8.5" - sources."typescript-4.3.5" + sources."typed-rest-client-1.8.6" + sources."typescript-4.4.2" sources."uc.micro-1.0.6" sources."underscore-1.13.1" sources."uri-js-4.4.1" @@ -120353,7 +120502,7 @@ in sources."vscode-debugadapter-testsupport-1.49.0" sources."vscode-debugprotocol-1.49.0" sources."watchpack-2.2.0" - sources."webpack-5.51.1" + sources."webpack-5.52.0" (sources."webpack-cli-4.8.0" // { dependencies = [ sources."commander-7.2.0" @@ -120458,7 +120607,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."consolidate-0.14.5" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."dashdash-1.14.1" sources."decompress-4.2.1" @@ -120651,7 +120800,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.14.1" + sources."uglify-js-3.14.2" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -120663,7 +120812,11 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-name-3.0.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."ware-1.3.0" sources."win-fork-1.1.1" sources."wordwrap-1.0.0" @@ -120710,7 +120863,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -120859,7 +121012,7 @@ in sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" (sources."css-2.2.4" // { @@ -120879,7 +121032,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-property-2.0.2" @@ -120910,7 +121063,7 @@ in sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" - (sources."vue-eslint-parser-7.10.0" // { + (sources."vue-eslint-parser-7.11.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -121633,13 +121786,13 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.15.3" + sources."@babel/runtime-corejs3-7.15.4" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" sources."abab-2.0.5" sources."abbrev-1.1.1" - sources."acorn-8.4.1" + sources."acorn-8.5.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -121650,12 +121803,12 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" - (sources."bit-field-1.5.2" // { + (sources."bit-field-1.5.3" // { dependencies = [ sources."ansi-regex-5.0.0" sources."fs-extra-10.0.0" @@ -121685,8 +121838,8 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.16.3" - sources."core-util-is-1.0.2" + sources."core-js-pure-3.17.3" + sources."core-util-is-1.0.3" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -121697,7 +121850,7 @@ in sources."debug-4.3.2" sources."decimal.js-10.3.1" sources."decompress-response-4.2.1" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" @@ -121753,7 +121906,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.15.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."nopt-5.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -121821,7 +121974,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -121891,7 +122044,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -121968,7 +122121,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."columnify-1.5.4" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -121989,7 +122142,7 @@ in sources."decompress-response-3.3.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."deepcopy-2.1.0" sources."deepmerge-4.2.2" sources."defaults-1.0.3" @@ -122005,8 +122158,8 @@ in sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.0" - sources."domutils-2.7.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" @@ -122046,7 +122199,7 @@ in sources."eslint-visitor-keys-3.0.0" (sources."espree-8.0.0" // { dependencies = [ - sources."acorn-8.4.1" + sources."acorn-8.5.0" ]; }) sources."esprima-4.0.1" @@ -122074,8 +122227,8 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.0.1" - sources."fast-safe-stringify-2.0.8" + sources."fast-redact-3.0.2" + sources."fast-safe-stringify-2.1.1" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.0" // { @@ -122452,17 +122605,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.51.1"; + version = "5.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz"; - sha512 = "xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.52.0.tgz"; + sha512 = "yRZOat8jWGwBwHpco3uKQhVU7HYaNunZiJ4AkAVQkPCUGoZk/tiIXiwG+8HIy/F+qsiZvSOa+GLQOj3q5RKRYg=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -122480,17 +122633,17 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.4.1" + sources."acorn-8.5.0" sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.8" + sources."browserslist-4.17.0" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001252" + sources."caniuse-lite-1.0.30001255" sources."chrome-trace-event-1.0.3" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.818" + sources."electron-to-chromium-1.3.833" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -122507,7 +122660,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" - sources."jest-worker-27.0.6" + sources."jest-worker-27.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -122523,7 +122676,7 @@ in sources."schema-utils-3.1.1" sources."serialize-javascript-6.0.0" sources."source-map-0.6.1" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."supports-color-8.1.1" sources."tapable-2.2.0" (sources."terser-5.7.2" // { @@ -122531,7 +122684,7 @@ in sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.1.4" + sources."terser-webpack-plugin-5.2.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" sources."webpack-sources-3.2.0" @@ -122561,7 +122714,7 @@ in sources."@webpack-cli/info-1.3.0" sources."@webpack-cli/serve-1.5.2" sources."clone-deep-4.0.1" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" @@ -122619,10 +122772,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.0.0.tgz"; - sha512 = "ya5cjoBSf3LqrshZn2HMaRZQx8YRNBE+tx+CQNFGaLLHrvs4Y1aik0sl5SFhLz2cW1O9/NtyaZhthc+8UiuvkQ=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.1.1.tgz"; + sha512 = "Kl1mnCEw8Cy1Kw173gCxLIB242LfPKEOj9WoKhKz/MbryZTNrILzOJTk8kiczw/YUEPzn3gcltCQv6hDsLudRg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -122630,13 +122783,13 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/http-proxy-1.17.7" sources."@types/json-schema-7.0.9" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/retry-0.12.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."ansi-html-0.0.7" + sources."ansi-html-community-0.0.8" sources."ansi-regex-6.0.0" sources."anymatch-3.1.2" sources."array-flatten-2.1.2" @@ -122658,7 +122811,7 @@ in sources."call-bind-1.0.2" sources."chokidar-3.5.2" sources."clean-stack-2.2.0" - sources."colorette-1.3.0" + sources."colorette-1.4.0" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ @@ -122675,7 +122828,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."deep-equal-1.1.1" @@ -122709,7 +122862,7 @@ in sources."faye-websocket-0.11.4" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.2" + sources."follow-redirects-1.14.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-monkey-1.0.3" @@ -122774,14 +122927,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lodash-4.17.21" - sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - (sources."mem-8.1.1" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) - sources."memfs-3.2.2" + sources."memfs-3.2.4" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -122810,7 +122957,6 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.2.1" - sources."p-defer-1.0.0" sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-map-4.0.0" @@ -122912,12 +123058,12 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."wbuf-1.7.3" - sources."webpack-dev-middleware-5.0.0" + sources."webpack-dev-middleware-5.1.0" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-8.2.0" + sources."ws-8.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -123013,7 +123159,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -123043,7 +123189,7 @@ in sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.18.0" // { + (sources."bittorrent-tracker-9.18.2" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -123097,7 +123243,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cpus-1.0.3" sources."create-torrent-5.0.1" sources."debug-2.6.9" @@ -123261,8 +123407,8 @@ in sources."ms-2.1.2" ]; }) - sources."smart-buffer-1.1.15" - sources."socks-1.1.10" + sources."smart-buffer-4.2.0" + sources."socks-2.6.1" sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" @@ -123280,7 +123426,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.4" // { + (sources."torrent-discovery-9.4.6" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -123307,7 +123453,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.5.4" // { + (sources."webtorrent-1.5.5" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -123319,7 +123465,7 @@ in sources."winreg-1.2.4" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.3" + sources."ws-7.5.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -123514,12 +123660,12 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.15.3" + sources."@babel/runtime-7.15.4" sources."@gar/promisify-1.1.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.8.2" // { + (sources."@npmcli/arborist-2.8.3" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -123559,7 +123705,7 @@ in sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" sources."@types/node-15.14.9" - sources."@types/vinyl-2.0.5" + sources."@types/vinyl-2.0.6" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { dependencies = [ @@ -123581,7 +123727,7 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" + sources."are-we-there-yet-1.1.7" (sources."argparse-1.0.10" // { dependencies = [ sources."sprintf-js-1.0.3" @@ -123674,8 +123820,8 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.16.3" - sources."core-util-is-1.0.2" + sources."core-js-3.17.3" + sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" @@ -123936,7 +124082,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.4" + sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -124310,7 +124456,11 @@ in sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) (sources."vinyl-2.2.1" // { dependencies = [ sources."clone-2.1.2" @@ -124439,10 +124589,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "3.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-3.1.0.tgz"; - sha512 = "Dwm75vWiWPsZhZXRUmneeZQlMbRXJBDLMy+QGDyKDID2+Dkp6LCzlXTrW7VOmU66K1/w8dEcJ5r3zFCDW0kx1Q=="; + url = "https://registry.npmjs.org/zx/-/zx-4.2.0.tgz"; + sha512 = "/4f7FaJecA9I655KXKXIHO3CFNYjAz2uSmTz6v2eNlKdrQKyz4VyF3RjqFuP6nQG+Hd3+NjOvrVNBkv8Ne9d4Q=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -124450,7 +124600,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.2" + sources."@types/node-16.9.0" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" @@ -124462,10 +124612,13 @@ in sources."combined-stream-1.0.8" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" + sources."duplexer-0.1.2" + sources."event-stream-3.3.4" sources."fast-glob-3.2.7" sources."fastq-1.12.0" sources."fill-range-7.0.1" sources."form-data-3.0.1" + sources."from-0.1.7" sources."fs-extra-10.0.0" sources."glob-parent-5.1.2" sources."globby-12.0.2" @@ -124477,19 +124630,25 @@ in sources."is-number-7.0.0" sources."isexe-2.0.0" sources."jsonfile-6.1.0" + sources."map-stream-0.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."minimist-1.2.5" - sources."node-fetch-2.6.1" + sources."node-fetch-2.6.2" sources."path-type-4.0.0" + sources."pause-stream-0.0.11" sources."picomatch-2.3.0" + sources."ps-tree-1.2.0" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."slash-4.0.0" + sources."split-0.3.3" + sources."stream-combiner-0.0.4" sources."supports-color-7.2.0" + sources."through-2.3.8" sources."to-regex-range-5.0.1" sources."universalify-2.0.0" sources."which-2.0.2" diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index 5717dd07b423..23f2cb5cd651 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -351,7 +351,8 @@ with self; parsexp = janePackage { pname = "parsexp"; - hash = "0rvbrf8ggh2imsbhqi15jzyyqbi3m5hzvy2iy2r4skx6m102mzpd"; + version = "0.14.1"; + hash = "1nr0ncb8l2mkk8pqzknr7fsqw5kpz8y102kyv5bc0x7c36v0d4zy"; minimumOCamlVersion = "4.04.2"; meta.description = "S-expression parsing library"; propagatedBuildInputs = [ base sexplib0 ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index a1d457f8775f..a6867aac63ad 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -31,9 +31,17 @@ buildDunePackage rec { useDune2 = true; minimumOCamlVersion = "4.06"; - buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ]; + buildInputs = + if lib.versionAtLeast version "1.7.0" then + [ ] + else + [ yojson stdlib-shims ocaml-syntax-shims ]; - propagatedBuildInputs = [ ppx_yojson_conv_lib result ]; + propagatedBuildInputs = + if lib.versionAtLeast version "1.7.0" then + [ ] + else + [ ppx_yojson_conv_lib result ]; meta = with lib; { description = "Jsonrpc protocol implementation in OCaml"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index f81def4a7b40..869e9f633540 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -9,16 +9,21 @@ , octavius , dune-build-info , uutf +, re , pp , csexp , cmdliner }: -buildDunePackage { +buildDunePackage rec { pname = "lsp"; inherit (jsonrpc) version src; useDune2 = true; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = + if lib.versionAtLeast version "1.7.0" then + "4.12" + else + "4.06"; # unvendor some (not all) dependencies. # They are vendored by upstream only because it is then easier to install @@ -28,22 +33,24 @@ buildDunePackage { rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner} ''; - buildInputs = [ - cppo - ppx_yojson_conv_lib - ocaml-syntax-shims - octavius - dune-build-info - omd - cmdliner - ] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp; + buildInputs = + if lib.versionAtLeast version "1.7.0" then + [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ] + else + [ cppo + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + dune-build-info + omd + cmdliner + ]; propagatedBuildInputs = [ csexp jsonrpc - stdlib-shims uutf - ]; + ] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims; meta = jsonrpc.meta // { description = "LSP protocol implementation in OCaml"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix index a47cd414fb1e..42c077e24a87 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "visitors"; - version = "20210316"; + version = "20210608"; useDune2 = true; @@ -13,13 +13,14 @@ buildDunePackage rec { repo = pname; rev = version; domain = "gitlab.inria.fr"; - sha256 = "12d45ncy3g9mpcs6n58aq6yzs5qz662msgcr7ccms9jhiq44m8f7"; + sha256 = "1p75x5yqwbwv8yb2gz15rfl3znipy59r45d1f4vcjdghhjws6q2a"; }; propagatedBuildInputs = [ ppxlib ppx_deriving result ]; meta = with lib; { homepage = "https://gitlab.inria.fr/fpottier/visitors"; + changelog = "https://gitlab.inria.fr/fpottier/visitors/-/raw/${version}/CHANGES.md"; license = licenses.lgpl21; description = "An OCaml syntax extension (technically, a ppx_deriving plugin) which generates object-oriented visitors for traversing and transforming data structures"; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix index 40191722ab2b..6a1e6af55b20 100644 --- a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.20"; + version = "3.1.23"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gitpython-developers"; repo = "GitPython"; rev = version; - sha256 = "1ygrxn8br2ff87j02ibijxzxa0ax9lgjdviwddslqxiarfggik9h"; + sha256 = "sha256-1+jMg5pOrYJBgv/q9FFnR5Ujc8pwEPZHfLssNnt8nmA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/Markups/default.nix b/nixpkgs/pkgs/development/python-modules/Markups/default.nix index d997b120d3bf..bacfe95a9a13 100644 --- a/nixpkgs/pkgs/development/python-modules/Markups/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Markups/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Markups"; - version = "3.1.1"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d"; + sha256 = "2954d53656d9ec84f2f6c077e91a1de534e05647f20d327757283bbb5a857770"; }; checkInputs = [ markdown docutils pygments pyyaml ]; diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index e7e057b5a8c3..551e26e71add 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dWHioxNpNuvUTC8FkkKTsoRs4x+eHUfDb4rpgeIGaIA="; + sha256 = "sha256-c+E3ypmN69IyE0HagefrYN8bdCY7amRxa/PGoIX4/cQ="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/nixpkgs/pkgs/development/python-modules/aioeagle/default.nix b/nixpkgs/pkgs/development/python-modules/aioeagle/default.nix new file mode 100644 index 000000000000..8862758880c3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioeagle/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "aioeagle"; + version = "1.1.0"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "117nb50cxwrixif2r6fxmr9v0jxkcamm816v48hbhyc660w6xvk4"; + }; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aioeagle" ]; + + meta = with lib; { + description = "Python library to control EAGLE-200"; + homepage = "https://github.com/home-assistant-libs/aioeagle"; + changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 4e90ea115c6f..51ba773d8b2d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , mock +, noiseprotocol , protobuf , pytest-asyncio , pytestCheckHook @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "8.0.0"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,10 +21,11 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fd77sbtgEhExV/d/LHkF9sheVz7G2SrNXyZsMNeJ4UY="; + sha256 = "sha256-Z5PebH/x53lo62sHjBH/6H05UhXax3sVfYx5T0uw38s="; }; propagatedBuildInputs = [ + noiseprotocol protobuf zeroconf ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix index 36b1c2353459..501c70e3ee47 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -2,27 +2,46 @@ , buildPythonPackage , fetchFromGitHub , aiohttp -, flake8 , jinja2 -, pytestCheckHook +, markupsafe , pytest-aiohttp +, pytestCheckHook +, pythonOlder , pyyaml }: buildPythonPackage rec { pname = "aiohttp-swagger"; - version = "1.0.5"; + version = "1.0.15"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cr0hn"; repo = pname; - rev = "5a59e86f8c5672d2cc97dd35dc730c2f809d95ce"; # corresponds to 1.0.5 on PyPi, no tag on GitHub - sha256 = "1vpfk5b3f7s9qzr2q48g776f39xzqppjwm57scfzqqmbldkk5nv7"; + rev = version; + sha256 = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q="; }; - propagatedBuildInputs = [ aiohttp jinja2 pyyaml ]; + propagatedBuildInputs = [ + aiohttp + jinja2 + markupsafe + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + pytest-aiohttp + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "markupsafe~=1.1.1" "markupsafe>=1.1.1" \ + --replace "jinja2~=2.11.2" "jinja2>=2.11.2" + ''; - checkInputs = [ flake8 pytestCheckHook pytest-aiohttp ]; + pythonImportsCheck = [ "aiohttp_swagger" ]; meta = with lib; { description = "Swagger API Documentation builder for aiohttp"; diff --git a/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix b/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix index e728c7dc7c5f..5e8e9327c4f5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-+BmymfRKwNPlksYcAUb/5cZYeOD5h85YhobmsNFJVE8="; + sha256 = "sha256-xZPNEynj0kbeika15ZDEIRUe519V6Asaw+CEiBu7VL4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/amcrest/default.nix b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix index dc132d102f26..478ab1811e48 100644 --- a/nixpkgs/pkgs/development/python-modules/amcrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.8.0"; + version = "1.8.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "180c0g840vh8dg4f08j0r29pdnhisav93d3axfvicd8fsb2cn36g"; + sha256 = "sha256-a23AjLRNghu5CT3GHvnti0BHnku9CxLP1EkE0GrwB3w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index ed7bb44349d2..7ff5e8bb35c9 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-37WCiH0uYRRh8yxNwz9OW0LcyNS9Kr2l1J662JYaPhg="; + sha256 = "sha256-zDy3dwhCNBtCAwflF/grdNsRllNUHJHMx1PQThHjcnw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 9605539a9cb6..3bee7edbf520 100644 --- a/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rl7ZELiLAVuCOkR6NVCUB5c6AtW/rFniDxB3E9ZPnK8="; + sha256 = "sha256-rXhXzqjefsKvfsFky4XJd+RaF5z/TRWDg6+IYFIfP2w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/nixpkgs/pkgs/development/python-modules/anyio/default.nix index ac34c336cad3..f043936f7d72 100644 --- a/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.3.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-bMnAijFLXZSgTWsalT/J4sJ0Jrc1kFaQHJArwXnQFaQ="; + sha256 = "sha256-JQf+OWHV2Vok5FmP7mlzeqbKUlxB+FC1c3ruX2aQEEs="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 66f9444f0edf..18f6b9859af5 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9684"; + version = "9.0.9792"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uRwNvYrea3oexJ3Rcoa9oUMXa+gSnha2K0NM8e/A09k="; + sha256 = "sha256-st4h/ck7hxIx2cZ241C4hEFJvFsTqHmawAB4zsfQ/oU="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 04e21ac9a68e..7f235485b757 100644 --- a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.20.0"; + version = "0.21.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg="; + sha256 = "sha256-GKvljxm2N4pC8Mh+UOW170VPB3va9X9BuQXp6OJ/SSQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index 160a90a0e6d0..5afd91f52f3e 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.7.0"; + version = "2.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GFAT2OZ3R8PA8BtyQWuL14QX2h30jHH3baU8YH71QbY="; + sha256 = "8c8852eb00a09e45c403086e10965cb6d13e5cd203a1688d91e9c81aa080d052"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 9d172701bbcc..1f4c78ed1bed 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.1.0"; + version = "16.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3654c8ace2b8868d0ea9c4c78c74f51e86e23330c7d8a636d132253747e6f3f4"; + sha256 = "ee40fa76d84b82e37e1d8a364649de25bb1e0c6c07f182f145a3ade44ec43711"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index c7aa05d25bd2..98e4a0e849ad 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "9.0.0"; + version = "9.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da"; + sha256 = "cd35e81c4a3cf812ade4bdcf1f7ccf4b5b78a801ef967340012a6ac9fe61ded2"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 06f0ae30aff6..dea350699952 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "4.0.0"; + version = "5.0.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42"; + sha256 = "2d5163c49f91636809ef1cacd48d91130803594855f43afe0f2b31fc5f02d53c"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 75e77c594008..59f3e7189f95 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "9.0.0"; + version = "9.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "36a508fe40f904723485586e9088092e6f65cdb82bc86efc42d615499c256829"; + sha256 = "f738d9e6db8f6da6bb4e84e59dd0548c8adef948357a447337e78d1035ac960a"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix index 9b7444a6ecb1..71cdfe6e4c6f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-relay"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "38f6dd9d122a316efa921e72933e01ec4d76ed39d4682655b17a997079e8b20a"; + sha256 = "c93b7550e64b6734bf23ce57ca974a3ea929b734c58d1fe3669728c4fd2d2eb3"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 3683a70ac1a9..5166c8ead8e4 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "19.0.0"; + version = "20.0.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; + sha256 = "622dca4484be64f9f5ce335d327dffabf3e71e14e8a3f4a1051dc85a5c3ebbca"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 661a507291d1..42cd78d285c2 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-servicefabric"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; + sha256 = "4c6f3de2526a27af78aecae248604f941c4d059fbcf2265912a380e3c788735d"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index 9fc5abe968bd..1c9cb2e94570 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "4.0.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e57437a933e7dea9b0618fe790e0dadc63f9857735361ac8b5f5e8062b9c2a0d"; + sha256 = "0b10542600cd268d6369681c3367373a925eedcda5414eacbd3fbc9a0bdf1f24"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index 611508b42450..99ff8bbb4e68 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.3.2"; + version = "7.3.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6c9bef0bfb4ac2bb8158fdfb3938884cd42542be3162ac288fa8df4e254d3810"; + sha256 = "1c2133909a086bd4329135d6affcc05628e3a7da27afca584a0de8c21fc4e1ac"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix index b00c03a09c14..0d6b534b4aa0 100644 --- a/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,20 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: +{ lib +, buildPythonPackage +, fetchPypi +, html5lib +, lxml +, pytestCheckHook +, pythonOlder +, soupsieve +}: buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.9.3"; + version = "4.10.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25"; + sha256 = "sha256-wjrSPFIdgYlVpBUaZ9gVgDGdS/VI09SfQiOuBB/5iJE="; }; - checkInputs = [ pytest ]; - checkPhase = '' - py.test $out/${python.sitePackages}/bs4/tests - ''; + propagatedBuildInputs = [ + html5lib + lxml + soupsieve + ]; + + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ soupsieve ]; + pythonImportsCheck = [ "bs4" ]; meta = with lib; { homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; diff --git a/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/nixpkgs/pkgs/development/python-modules/bidict/default.nix index 8ad3534170d5..8e32a0830035 100644 --- a/nixpkgs/pkgs/development/python-modules/bidict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bidict/default.nix @@ -1,5 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools-scm +{ lib +, buildPythonPackage +, fetchPypi , sphinx , hypothesis , py @@ -7,21 +8,23 @@ , pytest-benchmark , sortedcollections , sortedcontainers -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "bidict"; - version = "0.21.2"; - disabled = !isPy3k; + version = "0.21.3"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"; + sha256 = "sha256-1QvYH65140GY/8lJeaDrCTn/mts+8yvMk6kT2LPj7R0="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sphinx ]; + propagatedBuildInputs = [ + sphinx + ]; checkInputs = [ hypothesis @@ -32,6 +35,8 @@ buildPythonPackage rec { sortedcontainers ]; + pythonImportsCheck = [ "bidict" ]; + meta = with lib; { homepage = "https://github.com/jab/bidict"; description = "Efficient, Pythonic bidirectional map data structures and related functionality"; diff --git a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index ad97a5f04c8b..ad20467f162d 100644 --- a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ="; + sha256 = "sha256-Dt9jCkRxpIYnrsC4QM87jhCQEZHTKPZRFWBCBFneKC4="; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix index ac8cf39cff2f..9dea05cac9ea 100644 --- a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "bitlist"; - version = "0.3.1"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "04dz64r21a39p8wph5qlhvs5y873qgk6xxjlzw8n695b8jm3ixir"; + sha256 = "sha256-IL1tpP/F6O3BvJab6aC6r6PhRgKFpLp9aXmOK1rQXaU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/black/default.nix b/nixpkgs/pkgs/development/python-modules/black/default.nix index 2b968fb991a7..772ad57e7fe3 100644 --- a/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook , aiohttp , aiohttp-cors -, appdirs , attrs , click , colorama @@ -10,6 +9,7 @@ , mypy-extensions , pathspec , parameterized +, platformdirs , regex , tomli , typed-ast @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.7b0"; + version = "21.8b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "06d27adq6v6p8wspi0wwqz2pnq34p5jhnqvijbin54yyj5j3qdy8"; + sha256 = "sha256-VwYI0oqjrxeSuYxKM326xjZ4d7R7EriKtCCVz8GmJ8I="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -59,12 +59,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp aiohttp-cors - appdirs attrs click colorama mypy-extensions pathspec + platformdirs regex tomli typed-ast # required for tests and python2 extra diff --git a/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix b/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix index 1445c2046fb0..624d4f490e3c 100644 --- a/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "06ky5kahh8dm1d7ckid3fdwizvkh3g4aycm39r00kwxdlfca7bgf"; + sha256 = "sha256-g/V1//Jo8wnoOHEotF2ElVm+vzTIwZ6EzssJg6WJw6g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/blspy/default.nix b/nixpkgs/pkgs/development/python-modules/blspy/default.nix index 9592deccc6cc..1c5363ed7afe 100644 --- a/nixpkgs/pkgs/development/python-modules/blspy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.5"; + version = "1.0.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uDXzAdGzfyRbsMVllLNd3DK8F/GfovdX293z5Mel6eg="; + hash = "sha256-sULXnecEs8VI687pR9EK9jjYWlrB4tV4dt7Kzekaxb4="; }; patches = [ @@ -32,6 +32,13 @@ buildPythonPackage rec { rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; # pinned by blspy hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; }; + sodium_src = fetchFromGitHub { + owner = "AmineKhaldi"; + repo = "libsodium-cmake"; + rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by blspy + sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; + fetchSubmodules = true; + }; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index 416163a744b8..a480c6d37083 100644 --- a/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -1,38 +1,50 @@ -diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt -index 255e3bb..5f99c3a 100644 ---- a/python-bindings/CMakeLists.txt -+++ b/python-bindings/CMakeLists.txt -@@ -6,8 +6,7 @@ include(FetchContent) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6922167..23d8da6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH + include(FetchContent) - FetchContent_Declare( - pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 -+ SOURCE_DIR @pybind11_src@ + FetchContent_Declare(Sodium +- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git +- # Latest commit at the moment this was added here +- # Anchored to libsodium v1.0.18 +- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 ++ URL @sodium_src@ ) - FetchContent_MakeAvailable(pybind11 relic) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index faecc61..3272116 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,18 +4,9 @@ set (CMAKE_CXX_STANDARD 17) - # CMake 3.14+ - include(FetchContent) + set(SODIUM_PCH "on" CACHE STRING "") + set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") + set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "") + FetchContent_MakeAvailable(Sodium) -if (DEFINED ENV{RELIC_MAIN}) - set(RELIC_GIT_TAG "origin/main") -else () -- set(RELIC_GIT_TAG "b7b2266a0e4ee6f628f61d3ab638f524a18b52f1") +- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 +- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7") -endif () - --message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") -- + message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") + FetchContent_Declare( relic -- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git -- GIT_TAG ${RELIC_GIT_TAG} +- GIT_REPOSITORY https://github.com/Chia-Network/relic.git +- GIT_TAG ${RELIC_GIT_TAG} + SOURCE_DIR @relic_src@ ) - FetchContent_MakeAvailable(relic) + + # Relic related options +diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt +index 5a8c381..d9aa940 100644 +--- a/python-bindings/CMakeLists.txt ++++ b/python-bindings/CMakeLists.txt +@@ -1,8 +1,7 @@ + + FetchContent_Declare( + pybind11 +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11 relic) diff --git a/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix index 4e480514bca9..99d5b00d6390 100644 --- a/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.19"; + version = "0.2.23"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-HxLy3tGMn2KDfD37yKLoImpfXGoaoGB6VEanNu/WMnk="; + sha256 = "sha256-1mqxtL/9OFg3r+5/dkZlH4qRvRHsHMqHvYPEfCjSrr4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 48ac17f66d67..e5b6b6cc1cd7 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-j+MygstaOt3TMz8rEZE5OBYVZXWtrUyIuSO+qagKrjk="; + sha256 = "sha256-tCszN+sy4Z6nOwULj9ra5/TtW4YYi32fkbMKub5i2Xk="; }; sourceRoot = "source/${pname}"; diff --git a/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix b/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix index 1b32a1d5f7cc..012a4055a01c 100644 --- a/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YSG4Aj9gd72NOgDSYU0kPn/nZz9Pza9FE9WoG/H4PWw="; + hash = "sha256-XbmK7ZJnUy3Zg9XWt0t/Qb2k5qIlu4vIbxdDFYFjFPI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 30400fcdaf56..5a80bb1dc360 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tGRnCsuOLqZmWBcITF0TzgQ7kW6e7wZyhtObyU5Pasw="; + sha256 = "sha256-9jwD75leV02N5B7RaLF2DbC6GjhoDQMmkfFIO9MJ4Es="; }; # Use upstream z3 implementation diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index be8106f97f43..0b4b0fc94d00 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9684"; + version = "9.0.9792"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yza6Q0kxDXHOXxZcDFt43I621dSGI+bzTUrxWAQkGFQ="; + sha256 = "sha256-lCRZj0/L/XNcnJNiLxPY2mCFZowV6hLEpHOEiCsyQ/0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix b/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix index c18aab859fff..a4dcf314fdbb 100644 --- a/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.8"; + version = "0.1.11"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-YQfcVF+/eEgSLhq0EIFjMlVUT/4w2S5C1/rbkNpKszo="; + sha256 = "sha256-PXx7PKkqTb5slP8Z3z6yuWYrSEJSeGe75LmEvTFLKbQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "000vkyqlbq35fg6k4c05qh52iw8m4xbzyh94y038zr9p0yjlr019"; + sha256 = "sha256-sztmQeNECR8KSWd+CwkWOip7DAr/pnacjaIvuakymcs="; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/cogapp/default.nix b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix index c996c23d9ae8..022ab5a0b29c 100644 --- a/nixpkgs/pkgs/development/python-modules/cogapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "5e5da2bcfc4e4750c66cecb80ea4eaed1ef4fddd3787c989d4f5bfffb1152d6a"; + sha256 = "c43e374ee5ca2a35fbc68556f598bd8578eabe8a890487980bba56945b5ce9c6"; }; # there are no tests diff --git a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 1e522059c5be..06a5b227d29a 100644 --- a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "8.1.11"; + version = "8.1.12"; src = fetchPypi { inherit pname version; - sha256 = "cd9d1b27edd9345a2a32b365a511f8457c5c1a8f107546fe1ef9063dd15aac00"; + sha256 = "84e2db897731461a1d6bccd17923c7e8cd0f2512df018287b62fea55fd61891d"; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/nixpkgs/pkgs/development/python-modules/datasets/default.nix index 27ee2ebedcf9..0c1b8137bc98 100644 --- a/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { changelog = "https://github.com/huggingface/datasets/releases/tag/${version}"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix b/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix index ba9c298a2e82..f8da613d98bc 100644 --- a/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension"; homepage = "https://github.com/pytries/DAWG-Python"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix b/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix new file mode 100644 index 000000000000..75555569e235 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, pbr, six, wrapt, callPackage }: + +buildPythonPackage rec { + pname = "debtcollector"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c7a9fac814ab5904e23905516b18356cc907e7d27c05da58d37103f001967846"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ six wrapt ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "debtcollector" ]; + + meta = with lib; { + description = "A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner"; + homepage = "https://github.com/openstack/debtcollector"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix b/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix new file mode 100644 index 000000000000..cc3171da6d6e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, debtcollector +, stestr +}: + +buildPythonPackage rec { + pname = "debtcollector-tests"; + inherit (debtcollector) version; + + src = debtcollector.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + debtcollector + stestr + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 35ac416d5992..10ed4c62e764 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-W51Y9tZB1Uyp175+hWCpXChwL+MBpDWjudF87F1MRso="; + hash = "sha256-ULxVoZuMNDL0Win/+55RnbkCPZ8OI8nhSKshvJOMFQ4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index f74b53a831b3..537531cd9747 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,5 +1,5 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 101492f..4ee7cfb 100644 +index 101492fc..4ee7cfbe 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py @@ -630,6 +630,7 @@ class Session(object): diff --git a/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 8b87ec7bda7a..09851260233f 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 51017f2..46654ab 100644 +index 3c0e1b94..e995a20f 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -398,7 +398,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ diff --git a/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch b/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch index 2879716f704d..7d3fd5abfc2d 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,27 +1,25 @@ diff --git a/setup.py b/setup.py -index cfec60d..32ca206 100644 +index e7487100..10d36520 100644 --- a/setup.py +++ b/setup.py -@@ -24,7 +24,6 @@ elif "--abi" in sys.argv: - from setuptools import setup # noqa +@@ -12,7 +12,6 @@ import sys + sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -import versioneer # noqa del sys.path[0] -@@ -86,7 +85,7 @@ if __name__ == "__main__": - if not os.getenv("SKIP_CYTHON_BUILD"): - cython_build() +@@ -141,13 +140,13 @@ if __name__ == "__main__": + if platforms is not None: + extras["platforms"] = platforms - cmds = versioneer.get_cmdclass() + cmds = {} - cmds["bdist_wheel"] = bdist_wheel - - extras = {} -@@ -96,7 +95,7 @@ if __name__ == "__main__": + override_build(cmds) + override_build_py(cmds) - setup( + setuptools.setup( name="debugpy", - version=versioneer.get_version(), + version="@version@", @@ -29,7 +27,7 @@ index cfec60d..32ca206 100644 long_description=long_description, long_description_content_type="text/markdown", diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py -index baa5a7c..5355327 100644 +index baa5a7c5..53553272 100644 --- a/src/debugpy/__init__.py +++ b/src/debugpy/__init__.py @@ -27,7 +27,6 @@ __all__ = [ diff --git a/nixpkgs/pkgs/development/python-modules/deemix/default.nix b/nixpkgs/pkgs/development/python-modules/deemix/default.nix index 53cd0df8335a..21c39e6d7b87 100644 --- a/nixpkgs/pkgs/development/python-modules/deemix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.4.3"; + version = "3.4.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cSLjbowG98pbEzGB17Rkhli90xeOyzOcEglXb5SeNJE="; + sha256 = "sha256-HZg2zys92gH1j8WWgrzH3fpxoFDi+LPULmvlkUeB9Fw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/denonavr/default.nix b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix index e4e36a196fe0..94d3f73950f5 100644 --- a/nixpkgs/pkgs/development/python-modules/denonavr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/denonavr/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.8"; + version = "0.10.9"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "scarface-4711"; repo = pname; rev = version; - sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk"; + sha256 = "sha256-Y0sFRKnKZAdP95EyE3h1g92AJeT0Xkshjjwfv/vnfW8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix index c6e309335289..40c20a40c20c 100644 --- a/nixpkgs/pkgs/development/python-modules/deprecated/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deprecated/default.nix @@ -1,21 +1,33 @@ -{ lib, fetchPypi, buildPythonPackage, - wrapt, pytest, tox }: +{ lib +, fetchPypi +, buildPythonPackage +, wrapt +, pytestCheckHook +}: buildPythonPackage rec { - pname = "Deprecated"; - version = "1.2.12"; + pname = "deprecated"; + version = "1.2.13"; src = fetchPypi { - inherit pname version; - sha256 = "6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1"; + pname = "Deprecated"; + inherit version; + sha256 = "sha256-Q6xTNdqQwxwkugKK9TapHUHVP55pAd2wIbzFcs5E440="; }; - propagatedBuildInputs = [ wrapt ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + wrapt + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "deprecated" ]; + meta = with lib; { homepage = "https://github.com/tantale/deprecated"; description = "Python @deprecated decorator to deprecate old python classes, functions or methods"; - platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ tilpner ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix index 266160fc17f8..04885072c678 100644 --- a/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.9.0"; + version = "2.9.1"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "69433ea312264a541acf1e3e9748e44783ad33381e48e6a7230762e02f005276"; + sha256 = "6c1fc68b0f4b1fb21b208a3e5dc19a3b11bab2812c06f827d5fdbd24001a1910"; }; buildInputs = [ django pytz tox ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 21ed5c685c07..39a44245f4a3 100644 --- a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "368595b3c2623edeaca5beea5f12887424c384edd6f7052cf442443075084313"; + sha256 = "cd3cb1ac26a3658bd694b82f00eaab98903bd2edff34956e90c187c9ab5c0dae"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix b/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix index 12f81d644a8e..0f30113ba2ff 100644 --- a/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; rev = "v${version}"; - sha256 = "1zhq7cai47649njjp3m8zaglsv9ci6ci855dymyip8qx5ppnkfj0"; + sha256 = "17jldscmsq5lwp3pnjlxg56k3vfpr7rj4qbcbzkzhphifrfgm729"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dpath/default.nix b/nixpkgs/pkgs/development/python-modules/dpath/default.nix index 8756557e64ca..bfbeeaea0070 100644 --- a/nixpkgs/pkgs/development/python-modules/dpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.0.2"; + version = "2.0.4"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64="; + sha256 = "0qjaa4sjw0m4b91mm18074wpkhir3xx7s87qwckmzpfb165gk837"; }; # use pytest as nosetests hangs diff --git a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 7406e6dc21b3..91317eb9f093 100644 --- a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.18.0"; + version = "11.19.0"; src = fetchPypi { inherit pname version; - sha256 = "fa512c87521809e93502fc6a27b1d57ffbcef2281468c8f93575eab6a9ad5f05"; + sha256 = "a56d200c47d7cd19f697e232a616342b224079f43abf4748bc55fb0c1de4346f"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix b/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix new file mode 100644 index 000000000000..0b1e5ebc53f5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "dungeon-eos"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl"; + }; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "dungeon_eos" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/dungeon-eos"; + description = "A package that simulates PMD EoS dungeon generation"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ marius851000 xfix ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 17cf944bf14b..442ac5904b2f 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,16 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.14.1"; + # In 7.14.0, the package was intentionally made incompatible with + # the OSS version of elasticsearch - don't update past 7.13.x until + # there's a clear path forward. See + # https://github.com/elastic/elasticsearch-py/issues/1639 for more + # info. + version = "7.13.1"; src = fetchPypi { inherit pname version; - sha256 = "f928898fe06869516f2603f9a96a6f166c06888233806b31ac6568bac0266501"; + sha256 = "d6bcca0b2e5665d08e6fe6fadc2d4d321affd76ce483603078fc9d3ccd2bc0f9"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index ab09f0edf360..538de4ba7de9 100644 --- a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -1,15 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.1"; pname = "elementpath"; - disabled = isPy27; # uses incompatible class syntax + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1zghj0v1s03ahynx7sczag7iaam757ypwl1lm0ym6j37dnq8vnxk"; + sha256 = "1imjilhmbw08469irlbr3am5zksbg327n7mznxfixrigq9d65qx6"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix b/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix index d72db523a21c..0f2ca79d6411 100644 --- a/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix @@ -1,30 +1,27 @@ { lib , buildPythonPackage +, envoy-utils , fetchFromGitHub , httpx , pytest-asyncio , pytest-raises -, pytest-runner , pytestCheckHook , respx }: buildPythonPackage rec { pname = "envoy-reader"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "jesserizzo"; repo = "envoy_reader"; rev = version; - sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6"; + sha256 = "sha256-nPB1Fvb1qwLHeFkXP2jXixD2ZGA09MtS1qXRhYGt0fM="; }; - nativeBuildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ + envoy-utils httpx ]; @@ -35,6 +32,11 @@ buildPythonPackage rec { respx ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=5.2" "" + ''; + pythonImportsCheck = [ "envoy_reader" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/envoy-utils/default.nix b/nixpkgs/pkgs/development/python-modules/envoy-utils/default.nix new file mode 100644 index 000000000000..6f04704a8b5f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/envoy-utils/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, zeroconf +}: + +buildPythonPackage rec { + pname = "envoy-utils"; + version = "0.0.1"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "envoy_utils"; + inherit version; + sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c"; + }; + + propagatedBuildInputs = [ + zeroconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "envoy_utils" ]; + + meta = with lib; { + description = "Python utilities for the Enphase Envoy"; + homepage = "https://pypi.org/project/envoy-utils/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/nixpkgs/pkgs/development/python-modules/eventlet/default.nix index 11c18b61ae52..92ff2cdacaf6 100644 --- a/nixpkgs/pkgs/development/python-modules/eventlet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eventlet/default.nix @@ -1,13 +1,16 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder , dnspython -, enum34 , greenlet , monotonic , six , nose +, pyopenssl +, iana-etc +, libredirect }: buildPythonPackage rec { @@ -19,25 +22,36 @@ buildPythonPackage rec { sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b"; }; - propagatedBuildInputs = [ dnspython greenlet monotonic six ] - ++ lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = [ dnspython greenlet pyopenssl six ] + ++ lib.optional (pythonOlder "3.5") monotonic; - prePatch = '' - substituteInPlace setup.py \ - --replace "dnspython >= 1.15.0, < 2.0.0" "dnspython" + checkInputs = [ nose ]; + + doCheck = !stdenv.isDarwin; + + preCheck = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + + export EVENTLET_IMPORT_VERSION_ONLY=0 ''; - checkInputs = [ nose ]; + checkPhase = '' + runHook preCheck + + nosetests --exclude test_getaddrinfo --exclude test_hosts_no_network - doCheck = false; # too much transient errors to bother + runHook postCheck + ''; # unfortunately, it needs /etc/protocol to be present to not fail - #pythonImportsCheck = [ "eventlet" ]; + # pythonImportsCheck = [ "eventlet" ]; meta = with lib; { - homepage = "https://pypi.python.org/pypi/eventlet/"; + homepage = "https://github.com/eventlet/eventlet/"; description = "A concurrent networking library for Python"; + maintainers = with maintainers; [ SuperSandro2000 ]; license = licenses.mit; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index c568583dd378..d278b8bcf410 100644 --- a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.5.0"; + version = "4.5.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MtWcqsbKls9I7Oj0UlJzWtHsNfAxk4+ojSgK50ljEfs="; + sha256 = "0pj6rcink4awjyq1v30camilqr03kd0sb2p03fk9v4lm63d8w28f"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index 2e0e5c65d06b..98c7922c18f0 100644 --- a/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.6.0"; + version = "1.6.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ecz8l2nXGNN+RbOC5kproCWGtiKvoDcaa9hXZtciVfM="; + sha256 = "sha256-DQapOE+3nanyFkzpbjTrnU4upGIVBwgF6m/TwXRZC0c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fasttext/default.nix b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix index f3bddec76bd3..e478b3f9a4b6 100644 --- a/nixpkgs/pkgs/development/python-modules/fasttext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fasttext/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "Python module for text classification and representation learning"; homepage = "https://fasttext.cc/"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix b/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix index 62287487e3b7..379ed954dae0 100644 --- a/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for using finalfusion, word2vec, and fastText word embeddings"; homepage = "https://github.com/finalfusion/finalfusion-python/"; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; license = licenses.blueOak100; }; diff --git a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index 9e6fb1cee78a..b7b81b6b4469 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.3.1"; + version = "3.3.2"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "13rlpdf3ipm39zpc62sywn8qjn6gwfbgr43x7lqpxr28br2jcg3j"; + sha256 = "1js1nbal020ilqdrmd471zjab9jj6489fxy4583n55bh5fyiac6i"; }; # See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch diff --git a/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index 556317ed41f3..42e3eabec74e 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -8,8 +8,6 @@ , pytz , faker , six -, enum34 -, isPy27 , mock , blinker , pytest-flask @@ -20,27 +18,34 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "0.4.0"; + version = "0.5.1"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = version; - sha256 = "sha256-jM0QJ/klbWh3qho6ZQOH2n1qaguK9C98QIuSfqpI8xA="; + sha256 = "18vrmknyxw6adn62pz3kr9kvazfgjgl4pgimdf8527fyyiwcqy15"; }; - postPatch = '' - # https://github.com/python-restx/flask-restx/pull/341 - substituteInPlace requirements/install.pip \ - --replace "Flask>=0.8, <2.0.0" "Flask>=0.8, !=2.0.0" \ - --replace "werkzeug <2.0.0" "werkzeug !=2.0.0" - ''; - - propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] - ++ lib.optionals isPy27 [ enum34 ]; + propagatedBuildInputs = [ + aniso8601 + flask + jsonschema + pytz + six + werkzeug + ]; - checkInputs = [ pytestCheckHook faker mock pytest-flask pytest-mock pytest-benchmark blinker ]; + checkInputs = [ + blinker + faker + mock + pytest-benchmark + pytest-flask + pytest-mock + pytestCheckHook + ]; pytestFlagsArray = [ "--benchmark-disable" diff --git a/nixpkgs/pkgs/development/python-modules/flexmock/default.nix b/nixpkgs/pkgs/development/python-modules/flexmock/default.nix index a5382c04b006..6061f04d627b 100644 --- a/nixpkgs/pkgs/development/python-modules/flexmock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.8"; + version = "0.10.9"; src = fetchPypi { inherit pname version; - sha256 = "6820031c39b298646194a3f0b2b693322bb7f44b39dbaf1c54b0ae68b3d768fa"; + sha256 = "9c128b7cf31fac5340062c9c2cf1e0b12c601ee2d5c10ef39cc191036fb2e688"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/flynt/default.nix b/nixpkgs/pkgs/development/python-modules/flynt/default.nix new file mode 100644 index 000000000000..3c09106c94b8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flynt/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, astor +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flynt"; + version = "0.66"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ikamensh"; + repo = "flynt"; + rev = version; + hash = "sha256-DV433wqLjF5k4g8J7rj5gZfaw+Y4/TDOoFKo3eKDjZ4="; + }; + + propagatedBuildInputs = [ astor ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "command line tool to automatically convert a project's Python code from old format style strings into Python 3.6+'s f-strings"; + homepage = "https://github.com/ikamensh/flynt"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/glfw/default.nix b/nixpkgs/pkgs/development/python-modules/glfw/default.nix new file mode 100644 index 000000000000..107f7afb9690 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, glfw3 }: + +buildPythonPackage rec { + pname = "glfw"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "FlorianRhiem"; + repo = "pyGLFW"; + rev = "v${version}"; + sha256 = "1ygcwnh0x07yi87wkxykw566g74vfi8n0w2rzypidhdss14x3pvf"; + }; + + # Patch path to GLFW shared object + patches = [ ./search-path.patch ]; + postPatch = '' + substituteInPlace glfw/library.py --replace "@GLFW@" '${glfw3}/lib' + ''; + propagatedBuildInputs = [ glfw3 ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "glfw" ]; + + meta = with lib; { + description = "Python bindings for GLFW"; + homepage = "https://github.com/FlorianRhiem/pyGLFW"; + license = licenses.mit; + maintainers = [ maintainers.McSinyx ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/glfw/search-path.patch b/nixpkgs/pkgs/development/python-modules/glfw/search-path.patch new file mode 100644 index 000000000000..0c4a42ceb362 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/glfw/search-path.patch @@ -0,0 +1,11 @@ +diff --git a/glfw/library.py b/glfw/library.py +index 20387e1..9bdd62a 100644 +--- a/glfw/library.py ++++ b/glfw/library.py +@@ -189,5 +189,4 @@ elif sys.platform == 'win32': + except OSError: + pass + else: +- glfw = _load_library(['glfw', 'glfw3'], ['.so', '.dylib'], +- _get_library_search_paths(), _glfw_get_version) ++ glfw = _load_library(['glfw', 'glfw3'], ['.so', '.dylib'], ['@GLFW@'], _glfw_get_version) diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 4e1dbf8c465a..737df80f39a3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -9,7 +9,6 @@ , google-cloud-testutils , libcst , proto-plus -, pytest , pytest-asyncio , pytestCheckHook , mock @@ -17,18 +16,13 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "bd1fe84efd2e45042d95c7e5713e0a0365ec8138df062c07fab761233202ab6f"; + sha256 = "7d7218ffdd17d64184e1de69ef016f1f070bb0c888785510c4731948b078067d"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"' - ''; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 4895661cb421..89d0c1f873dc 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.25.1"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "5ecf7c802cc6cf9cd79e79924616d8b7d35ba026f3313a4d90b8b4a28c72d93d"; + sha256 = "15ca1f9c8165b584c2d593620354cd3b17c007e87cfd1abd1eebd2c08eb5d109"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 8c4b964b2b83..00276d581761 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8="; + sha256 = "8f8e513cae105ba17c4d3949091bd816cbf6075c6ac91b1f7acb4d40359f8a5a"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 9992dc7bc76f..98c4fc55044d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM="; + sha256 = "44be4673ad0a327ea6447967216e124fcd4c7487ca886f000446f6db209988af"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index c2a08fd7bee5..9a5469d9891a 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PQjTAqSzjCBPH58nZHAc6Oa12NSDVvt2E0ZHewTFZfY="; + sha256 = "d3d436fab7f50f69bdd47655871ac923e4dcbaf8538808bbe31cf0a3cbdf3514"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index d86a40d57b6a..b521854c4b18 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.3.2"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sC80RGY4lDVebpoz2hDGH5WfyrAjaOKTSDp/BhGmZS0="; + sha256 = "69764c406c8e1a95b66a84c042b7023c13eaef3bf79e493e60edd9ce62e8f2e4"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 6b3f6079124b..59661f260c3b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.7.1"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d52d386617c110c35043f6ff37ccb50d9f37c75b1e5586409ed64a3e8ae61038"; + sha256 = "2653c11615480141d359938a4efe9d131425171ec9cec26b6bf1c1231e1ac470"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index c6e1021f3430..e84e7cc06dbf 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ="; + sha256 = "53fe3d903363fb17db155fd05f5356d9b310a519fbebd53903aa426a31cad706"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 80f53182843b..7c414cc1321f 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "3c2d533a524d35c036d0387e8b2e0c7ce6aa7cdaa80392ec7fe68bce6cd2f152"; + sha256 = "3750fd988082b880ed1ec6f3d59c4f29f4cd0df3804a58d6c151d4bf15d3a597"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index dcf4028aeef7..be3abb363711 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.42.0"; + version = "1.42.1"; src = fetchPypi { inherit pname version; - sha256 = "c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae"; + sha256 = "b37ec5b0cd69aacb09270674c4c14873898cbc77624d17fef41ec0cb08004866"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index f750e7bd54ef..697489602daf 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.3.2"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XkHNIu7KWPUpgBceIBqzWgYPCay+Ud1/nM0KbeRnHk0="; + sha256 = "7da158734db646867deb125c144a7a1692a48a134692c4dc54ba420f89db64ae"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index c76cd53a8296..f29604c9da30 100644 --- a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.0.0"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc="; + sha256 = "36d682161fdcbfa29681212c210fabecbf6849a505a0cbc54b7f70a10a5278a2"; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; - checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # prevent shadowing imports diff --git a/nixpkgs/pkgs/development/python-modules/growattserver/default.nix b/nixpkgs/pkgs/development/python-modules/growattserver/default.nix index 02c8bce05a27..18d6cd4dabb1 100644 --- a/nixpkgs/pkgs/development/python-modules/growattserver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/growattserver/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.0.2"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = version; - sha256 = "sha256-0i7pMJ4gAVOkvj2uYZJygr3rehgIAfyxq9cWbozwRIQ="; + sha256 = "sha256-Vooy+czqhrsWVw35zJb5paC5G0WwOlI5hF8PXxJG0cY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 0e095126676d..eb27a5596bc2 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.39.0"; + version = "1.40.0"; src = fetchPypi { inherit pname version; - sha256 = "39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805"; + sha256 = "d440f2bc089ff628618c536904d5bc39d0b44f7afdda4c4c1ecd15fcf385bfba"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix new file mode 100644 index 000000000000..6c946b826252 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, python-gvm +, pythonOlder +}: + +buildPythonPackage rec { + pname = "gvm-tools"; + version = "21.6.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = pname; + rev = "v${version}"; + sha256 = "1n9alryf52xkwxwagmq8bdn3a8scnmgh3qfdjwj6jybcyk36rv6n"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + python-gvm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/greenbone/gvm-tools/pull/520 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/greenbone/gvm-tools/commit/db65495181ca339610b1007a33cc13285a470242.patch"; + sha256 = "069rg742pxjd36vap0xp6367rd69pji4yfxbycc7z0b8gvf80w5z"; + }) + ]; + + pythonImportsCheck = [ "gvmtools" ]; + + meta = with lib; { + description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; + homepage = "https://github.com/greenbone/gvm-tools"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hacking/default.nix b/nixpkgs/pkgs/development/python-modules/hacking/default.nix new file mode 100644 index 000000000000..2c345691216d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hacking/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, flake8 +, stestr +, eventlet +, ddt +, testtools +, testscenarios +}: + +buildPythonPackage rec { + pname = "hacking"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "flake8<3.9.0,>=3.8.0" "flake8" + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + flake8 + ]; + + checkInputs = [ + ddt + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "hacking" ]; + + meta = with lib; { + description = "OpenStack Hacking Guideline Enforcement"; + homepage = "https://github.com/openstack/hacking"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hg-commitsigs/default.nix b/nixpkgs/pkgs/development/python-modules/hg-commitsigs/default.nix new file mode 100644 index 000000000000..5c195bfe19f1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hg-commitsigs/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchhg +, stdenv +, python3 +}: + +stdenv.mkDerivation rec { + pname = "hg-commitsigs"; + # Latest tag is 11 years old. + version = "unstable-2021-01-08"; + + src = fetchhg { + url = "https://foss.heptapod.net/mercurial/commitsigs"; + rev = "b53eb6862bff"; + sha256 = "sha256-PS1OhC9MiVFD7WYlIn6FavD5TyhM50WoV6YagI2pLxU="; + }; + + # Not sure how the tests are supposed to be run, and they 10 years old... + doCheck = false; + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + install -D $src/commitsigs.py \ + $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + ''; + + meta = with lib; { + description = "Automatic signing of changeset hashes"; + longDescription = '' + This packages provides a Mercurial extension that lets you sign + the changeset hash when you commit. The signature is embedded + directly in the changeset itself; there wont be any extra + commits. Either GnuPG or OpenSSL can be used to sign the hashes. + ''; + homepage = "https://foss.heptapod.net/mercurial/commitsigs"; + maintainers = with maintainers; [ yoctocell ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; # same as Mercurial + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 0fce65f2b8bd..d5db12bd2d94 100644 --- a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Download and publish models and other files on the huggingface.co hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index c3232c1811a8..8146d47c7b25 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.2.13"; + version = "2.2.14"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lKdFHynKraN+eUeO1hFzoNsdMzRgmnBHQzPuKLH0Xvs="; + sha256 = "sha256-hQpI69jBEtKYQuB+lx4oF2Ud77IajlAPYWl8IxtSTNo="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix b/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix new file mode 100644 index 000000000000..388b7be391e0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "isounidecode"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-TbCpYsY0GCbJpprKq8L5I6WxJNU6M1voku8pFzvDHFs="; + }; + + pythonImportsCheck = [ "isounidecode" ]; + + # no real tests included, fails to run + doCheck = false; + + meta = with lib; { + description = "Python package for conversion and transliteration of unicode into ascii or iso-8859-1"; + homepage = "https://github.com/redvasily/isounidecode"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jax/default.nix b/nixpkgs/pkgs/development/python-modules/jax/default.nix new file mode 100644 index 000000000000..f0b4d6e26324 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage, fetchFromGitHub, lib +# propagatedBuildInputs +, absl-py, numpy, opt-einsum +# checkInputs +, jaxlib, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jax"; + version = "0.2.19"; + + # Fetching from pypi doesn't allow us to run the test suite. See https://discourse.nixos.org/t/pythonremovetestsdir-hook-being-run-before-checkphase/14612/3. + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "jax-v${version}"; + sha256 = "sha256-pVn62G7pydR7ybkf7gSbu0FlEq2c0US6H2GTBAljup4="; + }; + + # jaxlib is _not_ included in propagatedBuildInputs because there are + # different versions of jaxlib depending on the desired target hardware. The + # JAX project ships separate wheels for CPU, GPU, and TPU. Currently only the + # CPU wheel is packaged. + propagatedBuildInputs = [ absl-py numpy opt-einsum ]; + + checkInputs = [ jaxlib pytestCheckHook ]; + # NOTE: Don't run the tests in the expiremental directory as they require flax + # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2. + # Not a big deal, this is how the JAX docs suggest running the test suite + # anyhow. + pytestFlagsArray = [ "-W ignore::DeprecationWarning" "tests/" ]; + + meta = with lib; { + description = "Differentiate, compile, and transform Numpy code"; + homepage = "https://github.com/google/jax"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix new file mode 100644 index 000000000000..7761c0372994 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -0,0 +1,90 @@ +# For the moment we only support the CPU and GPU backends of jaxlib. The TPU +# backend will require some additional work. Those wheels are located here: +# https://storage.googleapis.com/jax-releases/libtpu_releases.html. + +# For future reference, the easiest way to test the GPU backend is to run +# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib.override { cudaSupport = true; }" +# export XLA_FLAGS=--xla_gpu_force_compilation_parallelism=1 +# python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'" +# python -c "from jax import random; random.PRNGKey(0)" +# python -c "from jax import random; x = random.normal(random.PRNGKey(0), (100, 100)); x @ x" +# There's no convenient way to test the GPU backend in the derivation since the +# nix build environment blocks access to the GPU. See also: +# * https://github.com/google/jax/issues/971#issuecomment-508216439 +# * https://github.com/google/jax/issues/5723#issuecomment-913038780 + +{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config, fetchPypi +, fetchurl, isPy39, lib, stdenv +# propagatedBuildInputs +, absl-py, flatbuffers, scipy, cudatoolkit_11 +# Options: +, cudaSupport ? config.cudaSupport or false +}: + +assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1"; + +let + device = if cudaSupport then "gpu" else "cpu"; +in +buildPythonPackage rec { + pname = "jaxlib"; + version = "0.1.71"; + format = "wheel"; + + # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting + # all of them is a pain, so we focus on 3.9, the current nixpkgs python3 + # version. + disabled = !isPy39; + + src = { + cpu = fetchurl { + url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; + sha256 = "sha256:0rqhs6qabydizlv5d3rb20dbv6612rr7dqfniy9r6h4kazdinsn6"; + }; + gpu = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda111/jaxlib-${version}+cuda111-cp39-none-manylinux2010_x86_64.whl"; + sha256 = "sha256:065kyzjsk9m84d138p99iymdiiicm1qz8a3iwxz8rspl43rwrw89"; + }; + }.${device}; + + # Prebuilt wheels are dynamically linked against things that nix can't find. + # Run `autoPatchelfHook` to automagically fix them. + nativeBuildInputs = [ autoPatchelfHook ] ++ lib.optional cudaSupport addOpenGLRunpath; + # Dynamic link dependencies + buildInputs = [ stdenv.cc.cc ]; + + # jaxlib contains shared libraries that open other shared libraries via dlopen + # and these implicit dependencies are not recognized by ldd or + # autoPatchelfHook. That means we need to sneak them into rpath. This step + # must be done after autoPatchelfHook and the automatic stripping of + # artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the + # patchPhase. Dependencies: + # * libcudart.so.11.0 -> cudatoolkit_11.lib + # * libcublas.so.11 -> cudatoolkit_11 + # * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib + preInstallCheck = lib.optional cudaSupport '' + shopt -s globstar + + addOpenGLRunpath $out/**/*.so + + for file in $out/**/*.so; do + rpath=$(patchelf --print-rpath $file) + # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to + # <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib. + patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file + done + ''; + + # pip dependencies and optionally cudatoolkit. + propagatedBuildInputs = [ absl-py flatbuffers scipy ] ++ lib.optional cudaSupport cudatoolkit_11; + + pythonImportsCheck = [ "jaxlib" ]; + + meta = with lib; { + description = "XLA library for JAX"; + homepage = "https://github.com/google/jax"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index bf671fcb1bac..86f435bc8f3d 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.16.1"; + version = "1.16.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R/RKMxSilv8JJW5om+l99vvrZYHjEEK1OCdsYWuxA74="; + sha256 = "sha256-QTisaO0LNjZ+dltHCqyWDQDNCGTqc8woMSwqsoyfhbk="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/nixpkgs/pkgs/development/python-modules/josepy/default.nix index c46e937194dc..02f7319d7ff9 100644 --- a/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a5a182eb499665d99e7ec54bb3fe389f9cbc483d429c9651f20384ba29564269"; + sha256 = "51cce8d97ced0556aae0ce3161b26d5f0f54bc42c749d3c606edc6d97d9802dc"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index b05c6bd343fa..07f317a8aba5 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-core"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; rev = "v${version}"; - sha256 = "08j1bm9g58576sswcrpfczaki24nlqqaypp7qv1rxxwsyp5pq6h6"; + sha256 = "sha256-pIYDY+pie4xqH11UHBal7/+MVmJDgNCFVpSD9we9ZPA="; }; propagatedBuildInputs = [ minio redis ]; diff --git a/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix b/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix new file mode 100644 index 000000000000..9eeb42b0b8c4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, betamax +, hacking +, iso8601 +, lxml +, oauthlib +, os-service-types +, oslo-config +, oslo-utils +, pbr +, pycodestyle +, pyyaml +, requests +, requests-kerberos +, requests-mock +, six +, stestr +, stevedore +, testresources +, testtools +}: + +buildPythonPackage rec { + pname = "keystoneauth1"; + version = "4.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "93605430a6d1424f31659bc5685e9dc1be9a6254e88c99f00cffc0a60c648a64"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + betamax + iso8601 + lxml + oauthlib + os-service-types + pbr + requests + requests-kerberos + six + stevedore + ]; + + checkInputs = [ + hacking + oslo-config + oslo-utils + pycodestyle + pyyaml + requests-mock + stestr + testresources + testtools + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "keystoneauth1" ]; + + meta = with lib; { + description = "Authentication Library for OpenStack Identity"; + homepage = "https://github.com/openstack/keystoneauth"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index 98b8a7c9e558..59b7f451c61a 100644 --- a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.0.0"; + version = "7.7.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "0vdvpqiypxis8wny7q39qps050zi13l66pnpa47040q6bar0d4xw"; + sha256 = "sha256-KIeo4CvJS8ZPlEHmrt7BPXdgA2RplHpb0j2ha4gyUxU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/mediafile/default.nix b/nixpkgs/pkgs/development/python-modules/mediafile/default.nix index 5d11d253b6d9..eb7fc8ca60ff 100644 --- a/nixpkgs/pkgs/development/python-modules/mediafile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mediafile/default.nix @@ -1,8 +1,5 @@ { buildPythonPackage -, enum34 -, fetchpatch , fetchPypi -, isPy27 , lib , mutagen , six @@ -10,30 +7,14 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.6.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o/tSAHu8FTr6LZoMHvegr9uCZovNLHS9KkP2U9y4uko="; + sha256 = "sha256-19K5DZMstRWu/6+N/McEdM1swedI5qr15kmnIAMA60Y="; }; - propagatedBuildInputs = [ mutagen six ] ++ lib.optional isPy27 enum34; - - # NB: Remove in the next release - patches = [ - (fetchpatch { - url = "https://github.com/beetbox/mediafile/commit/0ff753d493a1a7f406cb3378545ffe2c85a9afa3.patch"; - sha256 = "sha256-AQ7YedoYPmLqt4a/odgghIKOY61i9YfA0To0RVFqlk8="; - }) - (fetchpatch { - url = "https://github.com/beetbox/mediafile/commit/f0fb4e5111d9dfaa3b38d196ec41fcd237d97953.patch"; - sha256 = "sha256-5O6RiAqkQEz3Bvqjwwv/LOS33nSIBnT2H/vasGGVrpI="; - }) - (fetchpatch { - url = "https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4.patch"; - sha256 = "sha256-SMH0XhCaKLDNB4M8VmZWfGuuelfY5xladZyQYtXtP18="; - }) - ]; + propagatedBuildInputs = [ mutagen six ]; meta = with lib; { description = "MediaFile is a simple interface to the metadata tags for many audio file formats."; diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index e9c12548269f..f9535ac0f31f 100644 --- a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "6.0.2"; + version = "7.0.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4="; + sha256 = "0y5zsay9b6xgibs6m4gckw63jip35vsdfajsh1nw2zcb2xs1a7qs"; }; propagatedBuildInputs = [ @@ -112,6 +112,9 @@ buildPythonPackage rec { disabledTests = [ # Tests require a git repository "test_get_version" + # https://github.com/mitmproxy/mitmproxy/commit/36ebf11916704b3cdaf4be840eaafa66a115ac03 + # Tests require terminal + "test_integration" ]; pythonImportsCheck = [ "mitmproxy" ]; diff --git a/nixpkgs/pkgs/development/python-modules/mutf8/default.nix b/nixpkgs/pkgs/development/python-modules/mutf8/default.nix index e25d5a893863..ce783bbb5ff9 100644 --- a/nixpkgs/pkgs/development/python-modules/mutf8/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mutf8/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "mutf8"; - version = "1.0.3"; + version = "1.0.5"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "TkTech"; repo = pname; rev = "v${version}"; - sha256 = "0p9xczkhrf9d3n44k6kxbnk9sm831k5gkiagk6vm75vcmzm7zdqc"; + sha256 = "0blp6gb7q3f7if326xard8zlfg2rcmb3a7mxvaxgkvxigipjb9af"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch b/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch new file mode 100644 index 000000000000..4356052d8715 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch @@ -0,0 +1,36 @@ +From c5d32ef5d656b0aa4b2c1fc61c901d40bf2fb96a Mon Sep 17 00:00:00 2001 +From: Alexander Ben Nasrallah <me@abn.sh> +Date: Mon, 19 Jul 2021 17:24:41 +0200 +Subject: [PATCH] Revert "Fix MacOS wheels platform tag" + +This reverts commit d1e89fd3d7391084cdf35b0806cb5d2a4b413654. +--- + cpydist/__init__.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/cpydist/__init__.py b/cpydist/__init__.py +index 0e7f341..2619d7a 100644 +--- a/cpydist/__init__.py ++++ b/cpydist/__init__.py +@@ -41,7 +41,7 @@ from distutils.command.install import install + from distutils.command.install_lib import install_lib + from distutils.core import Command + from distutils.dir_util import mkpath, remove_tree +-from distutils.sysconfig import get_config_vars, get_python_version ++from distutils.sysconfig import get_python_version + from distutils.version import LooseVersion + from subprocess import check_call, Popen, PIPE + +@@ -57,9 +57,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") + with open(version_py, "rb") as fp: + exec(compile(fp.read(), version_py, "exec")) + +-if "MACOSX_DEPLOYMENT_TARGET" in get_config_vars(): +- get_config_vars()["MACOSX_DEPLOYMENT_TARGET"] = "11.0" +- + COMMON_USER_OPTIONS = [ + ("byte-code-only", None, + "remove Python .py files; leave byte code .pyc only"), +-- +2.31.1 + diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index 0856b30758dc..211bdec41fe0 100644 --- a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -13,6 +13,15 @@ in buildPythonPackage rec { sha256 = "1zb5wf65rnpbk0lw31i4piy0bq09hqa62gx7bh241zc5310zccc7"; }; + patches = [ + # mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. + # This makes the installation with nixpkgs fail. I suspect, that's + # because stdenv.targetPlatform.darwinSdkVersion is (currently) set to + # 10.12. The patch reverts + # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 + ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch + ]; + propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; # Tests are failing (TODO: unknown reason) @@ -31,6 +40,6 @@ in buildPythonPackage rec { homepage = "https://github.com/mysql/mysql-connector-python"; changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; license = [ lib.licenses.gpl2Only ]; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ neosimsim turion ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix b/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix index 26e1d7304184..04e4cd77baf2 100644 --- a/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.9.0"; + version = "0.9.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3c23803671a3d920efa175af5828870bdff60ba2a3fcbf1d5b48bb81d68219c6"; + sha256 = "35adbcc746b95e3ac92e949a161811f5aa2602b9eb1ef241b5ea6f09bb220997"; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; meta = with lib;{ - homepage = "https://github.com/alimanfoo/numcodecs"; + homepage = "https://github.com/zarr-developers/numcodecs"; license = licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index f9c27b4c79a3..312170ee36c2 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -1,23 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }: +{ lib +, buildPythonPackage +, cython +, enum34 +, fetchPypi +, nine +, numpy +, pytestCheckHook +, python-utils +}: buildPythonPackage rec { pname = "numpy-stl"; - version = "2.16.0"; + version = "2.16.3"; src = fetchPypi { inherit pname version; - sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742"; + sha256 = "95890627001efb2cb8d17418730cdc1bdd64b8dbb9862b01a8e0359d79fe863e"; }; - checkInputs = [ pytest pytest-runner ]; + propagatedBuildInputs = [ + cython + enum34 + nine + numpy + python-utils + ]; - checkPhase = "py.test"; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ cython numpy nine python-utils enum34 ]; + pythonImportsCheck = [ "stl" ]; meta = with lib; { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; homepage = "https://github.com/WoLpH/numpy-stl/"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix index 985d4e199e18..5db17a83e8f3 100644 --- a/nixpkgs/pkgs/development/python-modules/openrazer/common.nix +++ b/nixpkgs/pkgs/development/python-modules/openrazer/common.nix @@ -1,12 +1,12 @@ { lib , fetchFromGitHub }: rec { - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "sha256-ptB0jP0kp1Liynkfz0B0OMw6xNQG1s8IvxhgNAdEytM="; + sha256 = "133szhi0xsfbnjw47xbvyidflxd8fp7pv78vk5wf9s5ch3hpnvxs"; }; meta = with lib; { homepage = "https://openrazer.github.io/"; diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix new file mode 100644 index 000000000000..5e7442ebc5f0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, fetchPypi +, appdirs +, cryptography +, ddt +, dogpile_cache +, hacking +, jmespath +, jsonpatch +, jsonschema +, keystoneauth1 +, munch +, netifaces +, os-service-types +, oslo-config +, oslotest +, pbr +, prometheus-client +, requests-mock +, requestsexceptions +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "openstacksdk"; + version = "0.59.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PfdgzScjmKv6yM6+Yu64LLxJe7JdTdcHV290qM6avw0="; + }; + + propagatedBuildInputs = [ + appdirs + cryptography + dogpile_cache + jmespath + jsonpatch + keystoneauth1 + munch + netifaces + os-service-types + pbr + requestsexceptions + ]; + + checkInputs = [ + ddt + hacking + jsonschema + oslo-config + oslotest + prometheus-client + requests-mock + stestr + testscenarios + ]; + + checkPhase = '' + stestr run -e <(echo " + openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none + openstack.tests.unit.test_stats.TestStats.test_list_projects + openstack.tests.unit.test_stats.TestStats.test_projects + openstack.tests.unit.test_stats.TestStats.test_servers + openstack.tests.unit.test_stats.TestStats.test_servers_no_detail + ") + ''; + + pythonImportsCheck = [ "openstack" ]; + + meta = with lib; { + description = "An SDK for building applications to work with OpenStack"; + homepage = "https://github.com/openstack/openstacksdk"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/os-service-types/default.nix b/nixpkgs/pkgs/development/python-modules/os-service-types/default.nix new file mode 100644 index 000000000000..990af2ce6b9d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/os-service-types/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, six +, callPackage +}: + +buildPythonPackage rec { + pname = "os-service-types"; + version = "1.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ pbr six ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "os_service_types" ]; + + meta = with lib; { + description = "Python library for consuming OpenStack sevice-types-authority data"; + homepage = "https://github.com/openstack/os-service-types"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix b/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix new file mode 100644 index 000000000000..33f641d14c58 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, keystoneauth1 +, os-service-types +, oslotest +, requests-mock +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "os-service-types-tests"; + inherit (os-service-types) version; + + src = os-service-types.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + os-service-types + keystoneauth1 + oslotest + requests-mock + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix b/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix new file mode 100644 index 000000000000..8d0f9d51fb00 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cliff +, oslo-i18n +, oslo-utils +, openstacksdk +, pbr +, requests-mock +, simplejson +, stestr +}: + +buildPythonPackage rec { + pname = "osc-lib"; + version = "2.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ianpk32vwdllpbk4zhfifqb5b064cbmia2hm02lcrh2m76z0zi5"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + cliff + openstacksdk + oslo-i18n + oslo-utils + simplejson + ]; + + checkInputs = [ + requests-mock + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "osc_lib" ]; + + meta = with lib; { + description = "OpenStackClient Library"; + homepage = "https://github.com/openstack/osc-lib"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix new file mode 100644 index 000000000000..d3d90bfb2235 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bash +, coreutils +, eventlet +, fasteners +, fixtures +, iana-etc +, libredirect +, oslo-config +, oslo-utils +, oslotest +, pbr +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-concurrency"; + version = "4.4.1"; + + src = fetchPypi { + pname = "oslo.concurrency"; + inherit version; + sha256 = "6449cfbd15dbab20cf9907bbb2f057e0e5267f97161223d2b516cc8226b17ec3"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + + substituteInPlace oslo_concurrency/tests/unit/test_processutils.py \ + --replace "/bin/bash" "${bash}/bin/bash" \ + --replace "/bin/true" "${coreutils}/bin/true" \ + --replace "/usr/bin/env" "${coreutils}/bin/env" \ + --replace "/usr/bin/true" "${coreutils}/bin/true" + ''; + + propagatedBuildInputs = [ + fasteners + oslo-config + oslo-utils + pbr + ]; + + checkInputs = [ + eventlet + fixtures + oslotest + stestr + ]; + + checkPhase = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + + stestr run + ''; + + pythonImportsCheck = [ "oslo_concurrency" ]; + + meta = with lib; { + description = "Oslo Concurrency library"; + homepage = "https://github.com/openstack/oslo.concurrency"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix new file mode 100644 index 000000000000..fface886eb94 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, debtcollector +, netaddr +, oslo-i18n +, pbr +, pyyaml +, requests +, rfc3986 +, stevedore +, callPackage +}: + +buildPythonPackage rec { + pname = "oslo-config"; + version = "8.7.1"; + + src = fetchPypi { + pname = "oslo.config"; + inherit version; + sha256 = "a0c346d778cdc8870ab945e438bea251b5f45fae05d6d99dfe4953cca2277b60"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + debtcollector + netaddr + oslo-i18n + pbr + pyyaml + requests + rfc3986 + stevedore + ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix {}; + }; + + pythonImportsCheck = [ "oslo_config" ]; + + meta = with lib; { + description = "Oslo Configuration API"; + homepage = "https://github.com/openstack/oslo.config"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix b/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix new file mode 100644 index 000000000000..82400e67ea58 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, oslo-config +, docutils +, oslo-log +, oslotest +, requests-mock +, sphinx +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "oslo-config-tests"; + inherit (oslo-config) version; + + src = oslo-config.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + oslo-config + docutils + oslo-log + oslotest + requests-mock + sphinx + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix new file mode 100644 index 000000000000..b4e52abd4237 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, debtcollector, oslotest, stestr, pbr }: + +buildPythonPackage rec { + pname = "oslo.context"; + version = "3.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "f578ea38569cf0a677e2167178196b21a54175471358c4320ddfd5c97c52f4d1"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + debtcollector + pbr + ]; + + checkInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_context" ]; + + meta = with lib; { + description = "Oslo Context library"; + homepage = "https://github.com/openstack/oslo.context"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix new file mode 100644 index 000000000000..c0c9dff04334 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, alembic +, oslo-config +, oslo-context +, oslo-utils +, oslotest +, pbr +, sqlalchemy +, sqlalchemy_migrate +, stestr +, testresources +, testscenarios +}: + +buildPythonPackage rec { + pname = "oslo-db"; + version = "11.0.0"; + + src = fetchPypi { + pname = "oslo.db"; + inherit version; + sha256 = "0cd5679868c0a0d194c916cc855348890820c3183b34a039af1e8698dac7afbf"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + alembic + oslo-config + oslo-context + oslo-utils + sqlalchemy + sqlalchemy_migrate + testresources + testscenarios + ]; + + checkInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_db" ]; + + meta = with lib; { + description = "Oslo Database library"; + homepage = "https://github.com/openstack/oslo.db"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix new file mode 100644 index 000000000000..cdb6767c7a52 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, oslotest +, pbr +, testscenarios +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-i18n"; + version = "5.1.0"; + + src = fetchPypi { + pname = "oslo.i18n"; + inherit version; + sha256 = "6bf111a6357d5449640852de4640eae4159b5562bbba4c90febb0034abc095d0"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + nativeBuildInputs = [ pbr ]; + + checkInputs = [ + oslotest + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_i18n" ]; + + meta = with lib; { + description = "Oslo i18n library"; + homepage = "https://github.com/openstack/oslo.i18n"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix new file mode 100644 index 000000000000..1e4598ead653 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, oslo-config +, oslo-context +, oslo-serialization +, oslo-utils +, oslotest +, pbr +, pyinotify +, python-dateutil +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-log"; + version = "4.6.0"; + + src = fetchPypi { + pname = "oslo.log"; + inherit version; + sha256 = "dad5d7ff1290f01132b356d36a1bb79f98a3929d5005cce73e849ed31b385ba7"; + }; + + propagatedBuildInputs = [ + oslo-config + oslo-context + oslo-serialization + oslo-utils + pbr + python-dateutil + ] ++ lib.optionals stdenv.isLinux [ + pyinotify + ]; + + checkInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_log" ]; + + meta = with lib; { + description = "oslo.log library"; + homepage = "https://github.com/openstack/oslo.log"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix new file mode 100644 index 000000000000..e6b8d0d0c422 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msgpack +, oslo-utils +, oslotest +, pbr +, pytz +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-serialization"; + version = "4.2.0"; + + src = fetchPypi { + pname = "oslo.serialization"; + inherit version; + sha256 = "3007e1b017ad3754cce54def894054cbcd05887e85928556657434b0fc7e4d83"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ msgpack oslo-utils pytz ]; + + checkInputs = [ oslotest stestr ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_serialization" ]; + + meta = with lib; { + description = "Oslo Serialization library"; + homepage = "https://github.com/openstack/oslo.serialization"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix new file mode 100644 index 000000000000..3707a196d03e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, debtcollector +, eventlet +, fixtures +, iso8601 +, netaddr +, netifaces +, oslo-i18n +, oslotest +, packaging +, pbr +, pyparsing +, pytz +, stestr +, testscenarios +, pyyaml +, iana-etc +, libredirect +}: + +buildPythonPackage rec { + pname = "oslo-utils"; + version = "4.10.0"; + + src = fetchPypi { + pname = "oslo.utils"; + inherit version; + sha256 = "9646e6570ed08a79f21b03acfb60d32a3ac453d76304f8759b1211a59ce372cb"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + debtcollector + iso8601 + netaddr + netifaces + oslo-i18n + packaging + pyparsing + pytz + ]; + + checkInputs = [ + ddt + eventlet + fixtures + oslotest + stestr + testscenarios + pyyaml + ]; + + checkPhase = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + + stestr run + ''; + + pythonImportsCheck = [ "oslo_utils" ]; + + meta = with lib; { + description = "Oslo Utility library"; + homepage = "https://github.com/openstack/oslo.utils"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslotest/default.nix b/nixpkgs/pkgs/development/python-modules/oslotest/default.nix new file mode 100644 index 000000000000..66e06c8b3e72 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslotest/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fixtures +, pbr +, subunit +, callPackage +}: + +buildPythonPackage rec { + pname = "oslotest"; + version = "4.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "360ad2c41ba3ad6f059c7c6e7291450d082c2e5dbb0012e839a829978053dfe6"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + fixtures + subunit + ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix {}; + }; + + pythonImportsCheck = [ "oslotest" ]; + + meta = with lib; { + description = "Oslo test framework"; + homepage = "https://github.com/openstack/oslotest"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix b/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix new file mode 100644 index 000000000000..3c07a35c17d8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, oslo-config +, oslotest +, stestr +}: + +buildPythonPackage rec { + pname = "oslotest-tests"; + inherit (oslotest) version; + + src = oslotest.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + oslotest + oslo-config + stestr + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix b/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix index 3cb0bc49e724..3821ecb132af 100644 --- a/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osmpythontools/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "osmpythontools"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mocnik-science"; repo = "osm-python-tools"; rev = "v${version}"; - sha256 = "0r72z7f7kmvvbd9zvgci8rwmfj85xj34mb3x5dj3jcv5ij5j72yh"; + sha256 = "1m5ai9h1zbp79x0vb138fmyh2hg8lqp859s7j33lra9hds6wb40a"; }; # Upstream setup.py has test dependencies in `install_requires` argument. diff --git a/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix index cd51747d5678..1ad8a7564dd0 100644 --- a/nixpkgs/pkgs/development/python-modules/pathspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd"; + sha256 = "sha256-5WRJlDWiZz1Yb2shMLtblfBKO6Bvgbj4lbZRo8dqq7E="; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index b4238e6594f0..96eaa96aef85 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.47"; + version = "2.1.49"; src = fetchPypi { inherit pname version; - sha256 = "0928d0316caac840db528030fc741930e8be22a3fa6a8635308fb8443a0a0c6a"; + sha256 = "af536388eeede93111d8ef0af4a80cbb3d847c1a1470c6f34f3abe83deac1b91"; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix new file mode 100644 index 000000000000..2318a2cf60be --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "poetry-semver"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-2Am2Eqons5vy0PydMbT0gJsOlyZGxfGc+kbHJbdjiBA="; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A semantic versioning library for Python."; + homepage = "https://github.com/python-poetry/semver"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/poetry2conda/default.nix b/nixpkgs/pkgs/development/python-modules/poetry2conda/default.nix new file mode 100644 index 000000000000..7f5268a23dc4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/poetry2conda/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, toml +, poetry +, poetry-semver +, pyyaml +}: + +buildPythonApplication rec { + pname = "poetry2conda"; + version = "0.3.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dojeda"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UqNoEGgStvqtxhYwExk7wO4SvATaM2kGaFbB5ViJa7U="; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + poetry-semver + toml + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + pyyaml + ]; + + meta = with lib; { + description = "A script to convert a Python project declared on a pyproject.toml to a conda environment"; + homepage = "https://github.com/dojeda/poetry2conda"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix index 518840d415a9..cb87f352154c 100644 --- a/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix @@ -31,7 +31,11 @@ buildPythonPackage rec { url = "https://github.com/jmschrei/pomegranate/commit/42d14bebc44ffd4a778b2a6430aa845591b7c3b7.patch"; sha256 = "0f9cx0fj9xkr3hch7jyrn76zjypilh5bqw734caaw6g2m49lvbff"; }) - ]; + ] ++ [ + # Likely an upstream test bug and not a real problem: + # https://github.com/jmschrei/pomegranate/issues/939 + ./disable-failed-on-nextworkx-2.6.patch + ] ; propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch b/nixpkgs/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch new file mode 100644 index 000000000000..484ca4f9cbc8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch @@ -0,0 +1,26 @@ +Test started failing after upgrading networkx 2.5.1 -> 2.6.2: + https://github.com/jmschrei/pomegranate/issues/939 + +Failures look benigh. +--- a/tests/test_bayesian_network.py ++++ b/tests/test_bayesian_network.py +@@ -1057,7 +1057,8 @@ def test_exact_structure_learning_exclude_edges(): + assert_not_equal(model.structure[-2], (d-1,)) + assert_equal(model.structure[-2], (1,)) + +-def test_exact_dp_structure_learning_exclude_edges(): ++# disabled for https://github.com/jmschrei/pomegranate/issues/939 ++def disabled_exact_dp_structure_learning_exclude_edges(): + for X in datasets: + X = X.copy() + X[:,1] = X[:,-1] +@@ -1139,7 +1140,8 @@ def test_constrained_parents_structure_learning_exclude_edges(): + assert_equal(model.structure[7], (2,)) + assert_equal(model.structure[4], (0,)) + +-def test_constrained_slap_structure_learning_exclude_edges(): ++# disabled for https://github.com/jmschrei/pomegranate/issues/939 ++def disabled_constrained_slap_structure_learning_exclude_edges(): + for X in datasets: + X = X.copy() + X[:,1] = X[:,-1] diff --git a/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/nixpkgs/pkgs/development/python-modules/pontos/default.nix new file mode 100644 index 000000000000..8ee1e6d784e3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytestCheckHook +, pythonOlder +, colorful +, tomlkit +, git +, requests +}: + +buildPythonPackage rec { + pname = "pontos"; + version = "21.7.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = pname; + rev = "v${version}"; + sha256 = "12z74fp21kv6jf4cwc4hd5xvl5lilhmpprcqimdg85pcddc4zwc2"; + }; + + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + colorful + tomlkit + requests + ]; + + checkInputs = [ + git + pytestCheckHook + ]; + + disabledTests = [ + # Signing fails + "test_find_no_signing_key" + "test_find_signing_key" + "test_find_unreleased_information" + ]; + + pythonImportsCheck = [ "pontos" ]; + + meta = with lib; { + description = "Collection of Python utilities, tools, classes and functions"; + homepage = "https://github.com/greenbone/pontos"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/poolsense/default.nix b/nixpkgs/pkgs/development/python-modules/poolsense/default.nix index 0ffdf8952277..10e50804ef58 100644 --- a/nixpkgs/pkgs/development/python-modules/poolsense/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poolsense/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "poolsense"; - version = "0.0.8"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp"; + sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index 9f752626e5e9..7739c33f7ca2 100644 --- a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.14.0"; + version = "2.15.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "sha256-I4butM9mM3EsfMnt6DaE1TyMr8prWfecc4CYtRxtIGw="; + sha256 = "sha256-PCWt1429+2ooplF4DVwxGsQN0X8WDrOVSgxZ2kClBac="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index b5c488c0838c..60844bdc9e6f 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.53.1"; + version = "3.53.2"; src = fetchPypi { inherit pname version; - sha256 = "ef72be284e7f2b61ac0894b44165926f13f5d995b2bf3cd8a8dedc6224b255a7"; + sha256 = "8c150baaa33448c1e34a2cafa5108285d96f2c877bdf64fcbd77f26cb135435d"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index a6af74b3e4e9..f0135a50e7c5 100644 --- a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "5.2.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "1jd3rr8dydfaxz5g8idpwacp4bnbmhg74dwz7qwmzn34336s4ji6"; + sha256 = "0fykqr0agdlrhsy2s4yzadyslyjlhgr9iyj2f7s8hz9j400dhj3h"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix b/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix index 83dd2f5fae3c..19fa273c0466 100644 --- a/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix @@ -2,14 +2,15 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.5.18"; + version = "21.9.1"; src = fetchPypi { inherit pname version; - sha256 = "0n448nkm2i4gnsq48vbj8sldmyx0b7c7rvzijg8h2pxdrmilbqql"; + sha256 = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32"; }; patches = [ + # substitute library paths for libpulse and librt (substituteAll { src = ./library-paths.patch; libpulse = "${libpulseaudio.out}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix index f2afba4d2d52..4d97b535606f 100644 --- a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.1.7"; + version = "3.1.8"; src = fetchPypi { inherit pname version; - sha256 = "c343b90c4f3d529a0fbee8bec2b3e35d444f32e92d5ce974fe590544360fe310"; + sha256 = "a7e6c7c77cab39e1559c98e4290c5138247b15d3a26a76a23b2737c159f3f905"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix b/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix index 1c2593d5a6df..47337335fb6c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.9.2"; + version = "0.1.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-t5b2PuHC+ZY2uh+ryS+bjTS7kReZi0Rvlvkr98JFyH4="; + sha256 = "sha256-TDFkEz8I0/YoAFhWSYkLqL4+R4yiqAu+QncEieAlh2A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyfma/default.nix b/nixpkgs/pkgs/development/python-modules/pyfma/default.nix index e41d51c17719..2e26cee84da4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfma/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyfma"; - version = "0.1.4"; + version = "0.1.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = "v${version}"; - sha256 = "1wkcl41j2d1yflc5dl30ys1yxx68w9zn3vj8brwkm1ar9jnfmg4h"; + rev = version; + sha256 = "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn"; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index b530dfe0b5b1..66129553b736 100644 --- a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.19"; + version = "1.5.20"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/kuh2RboWWoOs4KX0PyhNlYgKI8q2SyiWvMJvprg/8w="; + sha256 = "ce76ce598ac910fbae6aae0db00aac21d19d62bdc8c616ed6e6a6a395dc44513"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix b/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix new file mode 100644 index 000000000000..df511b1c4c0f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, requests }: + +buildPythonPackage rec { + pname = "pylyrics"; + version = "1.1.0"; + + src = fetchPypi { + pname = "PyLyrics"; + inherit version; + extension = "zip"; + sha256 = "sha256-xfNujvDtO0h6kkLONMGfloTkGKW7/9XTZ9wdFgS0zQs="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + requests + ]; + + pythonImportsCheck = [ "PyLyrics" ]; + + # tries to connect to lyrics.wikia.com + doCheck = false; + + meta = with lib; { + description = "A Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs "; + homepage = "https://github.com/geekpradd/PyLyrics"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/nixpkgs/pkgs/development/python-modules/pymazda/default.nix index 66ab62d927b3..3065fbc14587 100644 --- a/nixpkgs/pkgs/development/python-modules/pymazda/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymazda/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.2.0"; + version = "0.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tEe70gvEglxqECiPjS3k29zZi70OSGMv6JxhrXqPhnY="; + sha256 = "sha256-Dg7oVNEjKZB6zksm1We2JGBW+cGkOOQOP3bS4CNL4q8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix b/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix index 8c00975d08bf..5195840c3119 100644 --- a/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Morphological analyzer/inflection engine for Russian and Ukrainian"; homepage = "https://github.com/kmike/pymorphy2"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix index bee9dd492479..ac1f9f980bef 100644 --- a/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix +++ b/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Russian dictionaries for pymorphy2"; homepage = "https://github.com/kmike/pymorphy2-dicts/"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pysma/default.nix b/nixpkgs/pkgs/development/python-modules/pysma/default.nix index f538830a7fbe..9efd55e32429 100644 --- a/nixpkgs/pkgs/development/python-modules/pysma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.5"; + version = "0.6.6"; src = fetchPypi { inherit pname version; - sha256 = "0kabwx8mi2kkbxxg7abnxwggxvidjrzgp5yidiyll5iba0ghhgnw"; + sha256 = "sha256-ahSc45fIoYvFc0QOt8LV44J3mlJe8uTkwTLJ6cu8gKo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix new file mode 100644 index 000000000000..8346074c9c51 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, keystoneauth1 +, oslo-i18n +, oslo-serialization +, oslo-utils +, pbr +, requests +, prettytable +, requests-mock +, simplejson +, stestr +, stevedore +}: + +buildPythonPackage rec { + pname = "python-cinderclient"; + version = "8.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b57b432b2ac9161c2482a569a023211d2d3d0ada81c4da62c8f6e47f0b2bf82d"; + }; + + propagatedBuildInputs = [ + simplejson + keystoneauth1 + oslo-i18n + oslo-utils + pbr + prettytable + requests + stevedore + ]; + + checkInputs = [ + ddt + oslo-serialization + requests-mock + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "cinderclient" ]; + + meta = with lib; { + description = "OpenStack Block Storage API Client Library"; + homepage = "https://github.com/openstack/python-cinderclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix new file mode 100644 index 000000000000..27b85215e655 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonOlder +, paramiko +, lxml +, defusedxml +}: + +buildPythonPackage rec { + pname = "python-gvm"; + version = "21.6.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = pname; + rev = "v${version}"; + sha256 = "070qpj2y7834i50lhkkbv93s77j91js06zs1bpbmplppiraxqmyz"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + paramiko + lxml + defusedxml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/greenbone/python-gvm/pull/552 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/greenbone/python-gvm/commit/e48afa614ba9cf69d9b22ce1a4642c625acbaa06.patch"; + sha256 = "0f5wfdymp5dcjk1xb7ynsf0g6idjg2ifwgggp4agic5nkh1k1inl"; + }) + ]; + + disabledTests = [ + # No running SSH available + "test_connect_error" + ] ++ lib.optionals stdenv.isDarwin [ + "test_feed_xml_error" + ]; + + pythonImportsCheck = [ "gvm" ]; + + meta = with lib; { + description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; + homepage = "https://github.com/greenbone/python-gvm"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix new file mode 100644 index 000000000000..d91a3a9d3139 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, keystoneauth1 +, openssl +, oslo-config +, oslo-serialization +, pbr +, requests-mock +, stestr +, testresources +, testscenarios +}: + +buildPythonPackage rec { + pname = "python-keystoneclient"; + version = "4.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12jsiw82x2zcn8sf78xisf85kr28gl3jqj46a0wxx59v91p44j02"; + }; + + propagatedBuildInputs = [ + keystoneauth1 + oslo-config + oslo-serialization + pbr + ]; + + checkInputs = [ + openssl + requests-mock + stestr + testresources + testscenarios + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "keystoneclient" ]; + + meta = with lib; { + description = "Client Library for OpenStack Identity"; + homepage = "https://github.com/openstack/python-keystoneclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 5d13a50a11fd..8a9fca2c5d0f 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk="; + sha256 = "sha256-RuZfCvYeO4mthZrg06UhwPp57qvuUI1yYyne5nzIHhE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 4daaaa1617d1..48c9f9a404d3 100644 --- a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.7"; + version = "0.5.8"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Dl/9aiCb8RYcSGEkO9X51Oaqg7FOv5mWYIDZs9fpOIg="; + sha256 = "sha256-16XEah5rgem/L8A/zo1zPrifrU15VMk652rFLZcvjig="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix index 4bb12ab7237c..6d6c5c90fdfe 100644 --- a/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-nomad/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-nomad"; - version = "1.2.1"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0ivkfdrmb4wpyawvwrgm3jvx6hn49vqjpwbkmkmamigghqqwacx3"; + sha256 = "087a7d5d2af9fd8ce5da70d29e4b456c6b8b0ea3cd16613ed50f6eb8ad6cdba6"; }; propagatedBuildInputs = [ requests ]; @@ -14,6 +14,8 @@ buildPythonPackage rec { # Tests require nomad agent doCheck = false; + pythonImportsCheck = [ "nomad" ]; + meta = with lib; { description = "Python client library for Hashicorp Nomad"; homepage = "https://github.com/jrxFive/python-nomad"; diff --git a/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix new file mode 100644 index 000000000000..afc8a51988ed --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, iso8601 +, keystoneauth1 +, openssl +, oslo-i18n +, oslo-serialization +, pbr +, prettytable +, requests-mock +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "python-novaclient"; + version = "17.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU="; + }; + + propagatedBuildInputs = [ + iso8601 + keystoneauth1 + oslo-i18n + oslo-serialization + pbr + prettytable + ]; + + checkInputs = [ + ddt + openssl + requests-mock + stestr + testscenarios + ]; + + checkPhase = '' + stestr run -e <(echo " + novaclient.tests.unit.test_shell.ShellTest.test_osprofiler + novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler + ") + ''; + + pythonImportsCheck = [ "novaclient" ]; + + meta = with lib; { + description = "Client library for OpenStack Compute API"; + homepage = "https://github.com/openstack/python-novaclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix new file mode 100644 index 000000000000..d538c01acc66 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, osc-lib +, pbr +, python-cinderclient +, python-keystoneclient +, python-novaclient +, requests-mock +, stestr +}: + +buildPythonPackage rec { + pname = "python-openstackclient"; + version = "5.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0abc6666378c5a7db83ec83515a8524fb6246a919236110169cc5c216ac997ea"; + }; + + propagatedBuildInputs = [ + osc-lib + pbr + python-cinderclient + python-keystoneclient + python-novaclient + ]; + + checkInputs = [ + ddt + stestr + requests-mock + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "openstackclient" ]; + + meta = with lib; { + description = "OpenStack Command-line Client"; + homepage = "https://github.com/openstack/python-openstackclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/tools/admin/swiftclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix index 512a7f620923..b932d5c51e4c 100644 --- a/nixpkgs/pkgs/tools/admin/swiftclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix @@ -2,14 +2,16 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.11.0"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "3972f8b1986e60ea786ad01697e6882f331209ae947ef8b795531940f1e0732b"; + sha256 = "sha256-MTtEShTQ+bYoy/PoxS8sQnFlj56KM9QiKFHC5PD3t6A="; }; - propagatedBuildInputs = [ requests six pbr setuptools ]; + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ requests six setuptools ]; # For the tests the following requirements are needed: # https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt @@ -27,6 +29,6 @@ buildPythonApplication rec { homepage = "https://github.com/openstack/python-swiftclient"; description = "Python bindings to the OpenStack Object Storage API"; license = licenses.asl20; - maintainers = with maintainers; [ c0deaddict ]; + maintainers = with maintainers; [ c0deaddict SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix index 288af6f7efca..593635ab42f8 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -67,6 +67,6 @@ in buildPythonPackage { changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; license = licenses.unfree; # Includes CUDA and Intel MKL. platforms = platforms.linux; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 0de0015ab1ec..05f88ca64721 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -304,6 +304,8 @@ in buildPythonPackage rec { passthru = { inherit cudaSupport; cudaArchList = final_cudaArchList; + # At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. + blasProvider = blas.provider; }; meta = with lib; { @@ -311,7 +313,7 @@ in buildPythonPackage rec { homepage = "https://pytorch.org/"; license = licenses.bsd3; platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; - maintainers = with maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds + maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds # error: use of undeclared identifier 'noU'; did you mean 'no'? broken = stdenv.isDarwin; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index c07199b741e8..4e3200c3fe70 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9684"; + version = "9.0.9792"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pf+LUFatC16a8EScoNYZKCXiaCINPRRn+6R1Op4GMRE="; + sha256 = "sha256-8AF7dCvQvBDjITRwi40KqMXcgiJpmKcK16ys1ybFIyk="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix index 6da6b7803828..7016fbbb9576 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.7.1"; + version = "2.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-YczzB95RyOdRGEye1pUqCZxegtp6kjCtUUHYyHD0WP0="; + sha256 = "sha256-SmbsEN6vZ28ihgUggtcF2AjbmUVaqLLweh7cKipr6u4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix new file mode 100644 index 000000000000..c67d911a3eda --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, pytest, setuptools-scm }: + +buildPythonPackage rec { + pname = "qmk_dotty_dict"; + version = "1.3.0.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + doCheck = false; + + meta = with lib; { + description = "Dictionary wrapper for quick access to deeply nested keys"; + homepage = "https://github.com/pawelzny/dotty_dict"; + license = licenses.mit; + maintainers = with maintainers; [ babariviere ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 6b78252de651..9c19f91b20f4 100644 --- a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -5,11 +5,12 @@ , pytestCheckHook , hypothesis , pandas +, numpy }: buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.5.0"; + version = "1.6.0"; disabled = pythonOlder "3.5"; @@ -18,9 +19,13 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-Omo9ActReimYDK9dARG0s32Qq61neDELRechbnwRfwU="; + sha256 = "sha256-dJz6OzzjqWZwzDVJzJVUshK0HDP/Bz5cML0TrwVVcvg="; }; + propagatedBuildInputs = [ + numpy + ]; + checkInputs = [ pytestCheckHook hypothesis diff --git a/nixpkgs/pkgs/development/python-modules/relatorio/default.nix b/nixpkgs/pkgs/development/python-modules/relatorio/default.nix index 9e673de92669..597eb37c7560 100644 --- a/nixpkgs/pkgs/development/python-modules/relatorio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/relatorio/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.9.3"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1d5d08f5323a1cdf6d860cd13c3408482a822d9924899927a8c7cd2ebeaa8699"; + sha256 = "6b9390eab696bdf569639ff58794fb9ef8ff19f94feea5b505a6ba06d0cfd026"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/responses/default.nix b/nixpkgs/pkgs/development/python-modules/responses/default.nix index ebb4716cd895..e052a51d859a 100644 --- a/nixpkgs/pkgs/development/python-modules/responses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/responses/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.13.4"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lHZ3XYVtPCSuZgu+vin7bXidStFqzXI++/tu4gmQuJk="; + sha256 = "sha256-k/d0p2LuDifA2dfgYieu2p/59faTkvcrtsa3P4djVj4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix b/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix index 62cdb5bbf32e..104a6f12a675 100644 --- a/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "rnc2rng"; - version = "2.6.5"; + version = "2.6.6"; src = fetchPypi { inherit pname version; - sha256 = "d354afcf0bf8e3b1e8f8d37d71a8fe5b1c0cf75cbd4b71364a9d90b5108a16e5"; + sha256 = "5a01d157857b5f010a94167e7092cc49efe2531d58e013f12c4e60b8c4df78f1"; }; propagatedBuildInputs = [ rply ]; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index 749c7815fb17..3cc833b561ef 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "09k008252x3l4agl9f8ai4a9mn0dp3m5s81mp1hnsf0hribb0s96"; + sha256 = "19pmjd9z3g9xpbri363lzd0gi1xa06aiyw2wjnxwqmd73x6pw695"; }; checkInputs = [ jsonschema ]; diff --git a/nixpkgs/pkgs/development/python-modules/rq/default.nix b/nixpkgs/pkgs/development/python-modules/rq/default.nix index abed10521d92..731204b78e62 100644 --- a/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rq"; - version = "1.9.0"; + version = "1.10"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "1drw7yqgsk1z9alv4hwj44a3sggmr20msdzdcdaxzdcqgb3qdpk8"; + sha256 = "16k5qz5k3v232dzv99bxxw52jr2hb5ra08b6dkhqya98wjviq8l5"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/nixpkgs/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix index a177d22f5d4f..cba6ddc0acf6 100644 --- a/nixpkgs/pkgs/development/python-modules/scp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.6"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CnL514LpaLCbEU1WB/lrHxb+mUKFevs1U5nt1VNy/PE="; + sha256 = "ddbdb3ef8c068aa1fd37a5fa65a122a80673c9fd73fdc5668a4604f99ccf5943"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index f7cc04c4eebc..81276f4e338d 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix @@ -23,17 +23,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ semantic-version setuptools toml ]; - # no tests doCheck = false; pythonImportsCheck = [ "setuptools_rust" ]; - passthru.tests.pyo3 = callPackage ./pyo3-test {}; + passthru.tests.pyo3 = callPackage ./pyo3-test { }; meta = with lib; { description = "Setuptools plugin for Rust support"; homepage = "https://github.com/PyO3/setuptools-rust"; changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index d79b741d278e..09f7a3056fbd 100644 --- a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.5"; + version = "11.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QLxp7WrYXJDGVG/MZ+GpvzYZ8gyLwconqikgs581voI="; + sha256 = "sha256-XVn/GBcTTthvsRJOnCZ0yOF3nUwbBZ2dfMJZsJXnE6U="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index 90fae07c475d..d1ea00b7f3e5 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,26 +1,19 @@ -{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }: +{ lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript +, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips +}: buildPythonPackage rec { pname = "skytemple-files"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1i3045bqg9h7kcx83nlrm1pmikfpi817n0gb8da29m3mqzk7lwws"; + sha256 = "1gpmgdas7x1zmszs9hlxjb6nk683901cy1kc0gyhz0rzdn5jg3lb"; fetchSubmodules = true; }; - patches = [ - # fix patching https://github.com/SkyTemple/skytemple-files/pull/128 - # merged, remove for next update - (fetchpatch { - url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch"; - sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI="; - }) - ]; - postPatch = '' substituteInPlace skytemple_files/patch/arm_patcher.py \ --replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\"" @@ -28,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ armips ]; - propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; + propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; doCheck = false; # requires Pokémon Mystery Dungeon ROM pythonImportsCheck = [ "skytemple_files" ]; diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 745e2775985d..bb91bad3ff1d 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0jkx75z8j03jfr9kzd40ip0fy24sfc7f2x430mf48xin272mc87q"; + sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d"; }; buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 6027df2be521..5d17a907caeb 100644 --- a/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Tokenizer and sentence splitter for German and English web texts"; homepage = "https://github.com/tsproisl/SoMaJo"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix b/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix index 0ac1edfd5034..32506c2d9e74 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Align tokenizations for spaCy and transformers"; homepage = "https://github.com/explosion/spacy-alignments"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix b/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix index 670174a057e9..969338d41062 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Toolkit for multi-domain Chinese word segmentation (spaCy fork)"; homepage = "https://github.com/explosion/spacy-pkuseg"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix b/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix index 1d02460167bf..c13ca4072074 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2"; homepage = "https://github.com/explosion/spacy-transformers"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 25e0aa6d6ce1..f5cf0fbd3b65 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "sphinx-inline-tabs"; - version = "2021.04.11.beta9"; + version = "2021.08.17.beta10"; format = "flit"; src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-inline-tabs"; rev = version; - sha256 = "sha256-UYrLQAXPProjpGPQNkju6+DmzjPG+jbjdKveoeViVTY="; + sha256 = "sha256-T3OqK0eXNiBs2zQURCSPLc8aIyf2an32UyDh4qSmxQ4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 5930c7e71b7a..f7fd32a3aff4 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "2.3.0"; + version = "2.4.1"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1aae1005935ae8e6499750b4ef1c8251a14ba16e025d0c0154fe2b6bf45defc0"; + sha256 = "282223309bbaf34cd20a8fe1ba346fe8642f403a8930607e77a8cb08ae81fc5f"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/stestr/default.nix b/nixpkgs/pkgs/development/python-modules/stestr/default.nix new file mode 100644 index 000000000000..88259dc718e1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/stestr/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cliff +, fixtures +, future +, pbr +, subunit +, testtools +, voluptuous +, callPackage +}: + +buildPythonPackage rec { + pname = "stestr"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "fb492cbdf3d3fdd6812645804efc84a99a68bb60dd7705f15c1a2949c8172bc4"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + cliff + fixtures + future + pbr + subunit + testtools + voluptuous + ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "stestr" ]; + + meta = with lib; { + description = "A parallel Python test runner built around subunit"; + homepage = "https://github.com/mtreinish/stestr"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/stestr/tests.nix b/nixpkgs/pkgs/development/python-modules/stestr/tests.nix new file mode 100644 index 000000000000..7a5d47b5dcfe --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/stestr/tests.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, ddt +, sqlalchemy +, stestr +, subunit2sql +}: + +buildPythonPackage rec { + pname = "stestr-tests"; + inherit (stestr) version; + + src = stestr.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + stestr + ]; + + checkPhase = '' + export PATH=$out/bin:$PATH + export HOME=$TMPDIR + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix b/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix new file mode 100644 index 000000000000..78035910397d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, oslo-concurrency +, oslo-db +, pbr +, python-dateutil +, stestr +}: + +buildPythonPackage rec { + pname = "subunit2sql"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-c+Dg6moKiv30M0mmwGQSOEbc94gfH//ZnF7lnBgv8EU="; + }; + + propagatedBuildInputs = [ + oslo-db + pbr + python-dateutil + ]; + + checkInputs = [ + mock + oslo-concurrency + stestr + ]; + + checkPhase = '' + export PATH=$out/bin:$PATH + export HOME=$TMPDIR + + stestr run -e <(echo " + subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_failing_test_ids_from_runs_by_key_value + subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_id_from_test_id + subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_test_run_dict_by_run_meta_key_value + subunit2sql.tests.migrations.test_migrations.TestWalkMigrations.test_sqlite_opportunistically + subunit2sql.tests.test_shell.TestMain.test_main + subunit2sql.tests.test_shell.TestMain.test_main_with_targets + ") + ''; + + pythonImportsCheck = [ "subunit2sql" ]; + + meta = with lib; { + description = "Command to Read a subunit file or stream and put the data in a SQL DB"; + homepage = "https://opendev.org/opendev/subunit2sql"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/telfhash/default.nix b/nixpkgs/pkgs/development/python-modules/telfhash/default.nix index ddb265bf033a..86386ad48a90 100644 --- a/nixpkgs/pkgs/development/python-modules/telfhash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telfhash/default.nix @@ -2,32 +2,34 @@ , buildPythonPackage , fetchFromGitHub , capstone +, packaging , pyelftools , tlsh , nose }: -buildPythonPackage { +buildPythonPackage rec { pname = "telfhash"; - version = "unstable-2021-01-29"; + version = "0.9.8"; src = fetchFromGitHub { owner = "trendmicro"; repo = "telfhash"; - rev = "b5e398e59dc25a56a28861751c1fccc74ef71617"; - sha256 = "jNu6qm8Q/UyJVaCqwFOPX02xAR5DwvCK3PaH6Fvmakk="; + rev = "v${version}"; + sha256 = "124zajv43wx9l8rvdvmzcnbh0xpzmbn253pznpbjwvygfx16gq02"; }; - patches = [ ./telfhash-new-tlsh-hash.patch ]; - # The tlsh library's name is just "tlsh" postPatch = '' - substituteInPlace requirements.txt --replace "python-tlsh" "tlsh" + substituteInPlace requirements.txt \ + --replace "python-tlsh" "tlsh" \ + --replace "py-tlsh" "tlsh" ''; propagatedBuildInputs = [ capstone pyelftools tlsh + packaging ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch b/nixpkgs/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch deleted file mode 100644 index 3984a4c1e810..000000000000 --- a/nixpkgs/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/telfhash/grouping.py b/telfhash/grouping.py -index c62f8d9..4ee9f0b 100644 ---- a/telfhash/grouping.py -+++ b/telfhash/grouping.py -@@ -32,10 +32,10 @@ import tlsh - def get_combination(telfhash_data): - - # -- # TLSH hash is 70 characters long. if the telfhash is not 70 -+ # The new TLSH hash is 72 characters long. if the telfhash is not 72 - # characters in length, exclude from the list - # -- files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 70] -+ files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 72] - - # - # get the combination of all the possible pairs of filenames -diff --git a/telfhash/telfhash.py b/telfhash/telfhash.py -index f2bbd25..c6e346c 100755 ---- a/telfhash/telfhash.py -+++ b/telfhash/telfhash.py -@@ -132,7 +132,7 @@ def get_hash(symbols_list): - symbol_string = ",".join(symbols_list) - encoded_symbol_string = symbol_string.encode("ascii") - -- return tlsh.forcehash(encoded_symbol_string).lower() -+ return tlsh.forcehash(encoded_symbol_string) - - - def elf_get_imagebase(elf): diff --git a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index 7813797a2f31..d5d26050eeeb 100644 --- a/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -115,6 +115,6 @@ in buildPythonPackage rec { description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index 62980dcca8c4..ce91599da992 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -54,6 +54,6 @@ in buildPythonPackage { changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix index c5bd0ad11145..9c9490bd8853 100644 --- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ danieldk pashashocky ]; + maintainers = with maintainers; [ pashashocky ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 3015e8d7ebb9..137d67124458 100644 --- a/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.12.3"; + version = "0.12.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "02c39c333435b8f6dc62cc79bb5bf35fc7f0eb144a1a748be3b7c065ee3e85ae"; + sha256 = "3e180d9f9f8b69176b5ef36311b6161f5b793b538eb2dfd4babbb4d3fb1e374e"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/python-modules/ueagle/default.nix b/nixpkgs/pkgs/development/python-modules/ueagle/default.nix new file mode 100644 index 000000000000..fc61123377aa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ueagle/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "ueagle"; + version = "0.0.2"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jcalbert"; + repo = "uEagle"; + rev = version; + sha256 = "1hxwk5alalvmhc31y917dxsnbiwq1xci2krma3235581319xr3w7"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "uEagle" ]; + + meta = with lib; { + description = "Python library Rainforest EAGLE devices"; + homepage = "https://github.com/jcalbert/uEagle"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 8a687534005e..120a0fc436fd 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.0.8"; + version = "4.1.1"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "sha256-E9BRgyMz+3Xl8Q1zsnVtvW44FXTqs29U1oK4te0myq4="; + sha256 = "sha256-qh/rtZDE6L1IQJjzE+ns0eSG1BKbES7s3A/35hc+tXg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix b/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix new file mode 100644 index 000000000000..906829363108 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrdict +, cairosvg +, pillow +, pytestCheckHook +, setuptools-scm +, six +, svgwrite +, xmldiff +}: + +buildPythonPackage rec { + pname = "wavedrom"; + version = "2.0.3.post2"; + src = fetchPypi { + inherit pname version; + sha256 = "239b3435ff116b09007d5517eed755fc8591891b7271a1cd40db9e400c02448d"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrdict + svgwrite + six + ]; + + checkInputs = [ + pytestCheckHook + xmldiff + pillow + cairosvg + ]; + + disabledTests = [ + "test_upstream" # requires to clone a full git repository + ]; + + pythonImportsCheck = [ "wavedrom" ]; + + meta = { + description = "WaveDrom compatible Python command line"; + homepage = "https://github.com/wallento/wavedrompy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ airwoodix ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix b/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix index 6aa8599653b1..72a2f013928d 100644 --- a/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "wordfreq"; - version = "2.5"; + version = "2.5.1"; disabled = isPy27; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; rev = "v${version}"; - sha256 = "09wzraddbdw3781pk2sxlz8knax9jrcl24ymz54wx6sk0gvq95i7"; + sha256 = "1lw7kbsydd89hybassnnhqnj9s5ch9wvgd6pla96198nrq9mj7fw"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix index 233f77613fe8..f74332e53649 100644 --- a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.2"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F7977Tb8iu/pRy6YhginJgK0N0G3CjPpHjomLTFf1F8="; + sha256 = "c5a2e948746da6fe504e8404284f457d8e98da6df5047c6bb3f71b18882e9d2a"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index 960dd227388d..a2bd27d9f1d8 100644 --- a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -1,34 +1,48 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , elementpath , lxml -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.7.1"; pname = "xmlschema"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "0vf0gj1sbv9f7gjm3zbyl0b8pkrn00yzx57ddff0h2kazv8jlpwi"; + sha256 = "124wq44aqzxrh92ylm44rry9dsyb68drgzbhzacrm511n1j0ziww"; }; - propagatedBuildInputs = [ elementpath ]; + propagatedBuildInputs = [ + elementpath + ]; - checkInputs = [ lxml pytest ]; + checkInputs = [ + lxml + pytestCheckHook + ]; # Ignore broken fixtures, and tests for files which don't exist. # For darwin, we need to explicity say we can't reach network - checkPhase = '' - pytest tests \ - --ignore=tests/test_factory.py \ - --ignore=tests/test_schemas.py \ - --ignore=tests/test_memory.py \ - --ignore=tests/test_validation.py \ - -k 'not element_tree_import_script and not export_remote' - ''; + disabledTests = [ + "export_remote" + "element_tree_import_script" + ]; + + disabledTestPaths = [ + "tests/test_schemas.py" + "tests/test_memory.py" + "tests/test_validation.py" + ]; + + pythonImportsCheck = [ "xmlschema" ]; meta = with lib; { description = "XML Schema validator and data conversion library for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/yangson/default.nix b/nixpkgs/pkgs/development/python-modules/yangson/default.nix index 1b63a94cb273..fec15464bd9d 100644 --- a/nixpkgs/pkgs/development/python-modules/yangson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.9"; + version = "1.4.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1qb8zssyj504yrj1jnkrzv65xlfv5bl14knan76pjzbpl0xpaq6z"; + sha256 = "sha256-R7ZcG4FStESPDWnFD6WIDD8sugvil9ybVK0J2qQC+zU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/youless-api/default.nix b/nixpkgs/pkgs/development/python-modules/youless-api/default.nix new file mode 100644 index 000000000000..805f99c02288 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/youless-api/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromBitbucket +, pythonOlder +, certifi +, chardet +, idna +, nose +, requests +, six +, urllib3 +}: + +buildPythonPackage rec { + pname = "youless-api"; + version = "0.13"; + + disabled = pythonOlder "3.7"; + + src = fetchFromBitbucket { + owner = "jongsoftdev"; + repo = "youless-python-bridge"; + rev = version; + sha256 = "sha256-Vywzd8wZG4eI/U69fPYuLpF54zAeuCv3Q81z5UcMGjc="; + }; + + propagatedBuildInputs = [ + certifi + chardet + idna + requests + six + urllib3 + ]; + + checkInputs = [ + nose + ]; + + pythonImportsCheck = [ "youless_api" ]; + + meta = with lib; { + description = "Python library for YouLess sensors"; + homepage = "https://pypi.org/project/youless-api/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix index 4341e659bed0..40ffae5e80fd 100644 --- a/nixpkgs/pkgs/development/r-modules/default.nix +++ b/nixpkgs/pkgs/development/r-modules/default.nix @@ -456,6 +456,7 @@ let mvtnorm = [ pkgs.libiconv ]; statmod = [ pkgs.libiconv ]; rsvg = [ pkgs.librsvg.dev ]; + ssh = with pkgs; [ libssh ]; }; packagesRequireingX = [ diff --git a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 8111f6e53cdf..d06b362e2ce4 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -623,13 +623,6 @@ in buildInputs = [ taglib ]; }; - thrift = attrs: { - # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125 - # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd. - buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0") - "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\""; - }; - timfel-krb5-auth = attrs: { buildInputs = [ libkrb5 ]; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 338c711e5274..bb06e269aeb1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.18.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-j5VLxtu8Xg1fwDYWYJXGFUkfpgauG/5NauSniSZ7G2w="; + sha256 = "sha256-3ep90G6LW83XGyS9b465u8/SznJRZBhEV/YQU8fua1s="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-1lFGczzcN4QPsIpEVQiSmNS7L+9rlSfxi+gopt2E7Ec="; + cargoSha256 = "sha256-UtFGuJ6HEUtonH43iuum1hrhnYesQpkyqPTVcqWAoiA="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 78df8883cf9b..e87a6be9cc55 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.158.0"; + version = "0.159.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-Wl+Jux20gtl+upaKcFF3ub5TetNUf2GwfenH+Ddvqfw="; + sha256 = "sha256-NGYaevL6Jpv5rkYlSzIFMIn36ds7ecOJtEToQIzbOsU="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 6f3b62fc6e42..443d9b4b1e69 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1aas07r5x2f7byzslfdqxi5dr0gwg5dy2qznnrs7w83ziqw6lxkm"; + sha256 = "1yf725lfwhvkc1mvzqpl9wchwq2z4pz3z7bp0qlbgdym8z66x8wm"; }; - vendorSha256 = "10b6ny1fq6iwvhgq5293cdvd55mq3xgr2sc9kqshvjznwimfnb5z"; + vendorSha256 = "0jg8a6vx2n71awr2zdkiisx76qcnj3qj6vj1w9m1c9kczz3mc7m3"; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 06bff61fcdd1..e2a20da68da0 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.11.0"; + version = "10.12.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-mti93UDFgHQKJt3z1sjCkT71TZtwh2YnhTyUCi5tS5c="; + sha256 = "sha256-kujY7Qgis2pie0WVQAokVopD3TYkjjBnqhw6XZTG16o="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-NEW1qXOxFPmDFUTciJkqwutZd3+sVkHgoZgQO8Gsdwk="; + vendorSha256 = "sha256-4Jz57VjdQX+LJexEZau4pd8nIQPt0HGzCjHRj7uPox4="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/build-managers/build2/default.nix b/nixpkgs/pkgs/development/tools/build-managers/build2/default.nix new file mode 100644 index 000000000000..2e0622ec7e4b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/build2/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + pname = "build2"; + version = "0.13.0"; + + src = fetchurl { + url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz"; + sha256 = "01hmr5y8aa28qchwy9ci8x5q746flwxmlxarmy4w9zay9nmvryms"; + }; + + dontConfigure = true; + dontInstall = true; + + buildPhase = '' + runHook preBuild + ./build.sh --local --trust yes --install-dir "$out" "$CXX" + runHook postBuild + ''; + + meta = with lib; { + homepage = "https://www.build2.org/"; + description = "build2 build system"; + license = licenses.mit; + longDescription = '' + build2 is an open source (MIT), cross-platform build toolchain + that aims to approximate Rust Cargo's convenience for developing + and packaging C/C++ projects while providing more depth and + flexibility, especially in the build system. + + build2 is a hierarchy of tools consisting of a general-purpose + build system, package manager (for package consumption), and + project manager (for project development). It is primarily aimed + at C/C++ projects as well as mixed-language projects involving + one of these languages (see bash and rust modules, for example). + ''; + platforms = platforms.all; + maintainers = with maintainers; [ hiro98 r-burns ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index f1aa4204a045..a575b0ee3be5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, +{ lib, stdenv, fetchFromGitHub, fetchgit, fetchHex, erlang, makeWrapper, writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }: let - version = "3.16.1"; + version = "3.17.0"; owner = "erlang"; - deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; }; + deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { pname = "rebar3"; inherit version erlang; @@ -16,7 +16,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "0dhwlx7zykf9y3znk2k8fxrq5j43jy3c3gd76k74q34p1xbajgzr"; + sha256 = "02sk3whrbprzlih4pgcsd6ngmassfjfmkz21gwvb7mq64pib40k6"; }; buildInputs = [ erlang ]; @@ -39,16 +39,6 @@ let HOME=. escript bootstrap ''; - - patches = [ - # TODO: remove this on next rebar3 release - (fetchpatch { - name = "escriptize-erl-libs"; - url = "https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21.patch"; - sha256 = "01xjaqnhmjlxqdgb8ph15wssjq5crdhjslxnndbs5f0kscqpq14c"; - }) - ]; - checkPhase = '' HOME=. escript ./rebar3 ct ''; @@ -98,7 +88,7 @@ let update-source-version rebar3 "$latest" --version-key=version --print-changes --file="$nix_path/default.nix" tmpdir=$(mktemp -d) cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir" - (cd "$tmpdir" && rebar3 nix lock -o "$nix_path/rebar-deps.nix") + (cd "$tmpdir" && rebar3 as test nix lock -o "$nix_path/rebar-deps.nix") else echo "rebar3 is already up-to-date" fi diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 34c4821aaeca..8882feaf3c92 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -1,6 +1,6 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }: +in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: let self = packages // (overrides self packages); packages = with self; { @@ -16,11 +16,11 @@ let }; relx = builder { name = "relx"; - version = "4.4.0"; + version = "4.5.0"; src = fetchHex { pkg = "relx"; - version = "4.4.0"; - sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; + version = "4.5.0"; + sha256 = "sha256-3bWPIMzmymP1onJeklgW3XITR2aYo/PDy0+ownIgLFI="; }; beamDeps = [ bbmustache ]; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 68cd3d449cad..ad6ac4fc2e5f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,18 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake }: stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-uK060F7d7/pTCNbGqdKCzxgPrPPbGjNwuUOt176z7EM="; + hash = "sha256-BhpYOL7+IlBpkzeFjfy6KLO7ail472KQWFfQX/sXLGo="; }; nativeBuildInputs = [ cmake ]; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocm-cmake "$version" + ''; + meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; diff --git a/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix b/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix index 3095d661ab35..5814ab90e6d9 100644 --- a/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "ccloud-cli"; - version = "1.25.0"; + version = "1.39.0"; # To get the latest version: # curl -L https://cnfl.io/ccloud-cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 src = fetchurl (if stdenv.hostPlatform.isDarwin then { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz"; - sha256 = "0306jg36dpccwyy239r2xvw3bvsrnrdc88390g26fhcb0048qmgb"; + sha256 = "0jqpmnx3izl4gv02zpx03z6ayi3cb5if4rnyl1374yaclx44k1gd"; } else { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz"; - sha256 = "02sly7cxqlrfd6chamlp05k9ar93mpfrkx5183js0hf595nlki61"; + sha256 = "0936hipcl37w4mzzsnjlz4q1z4j9094i4irigzqwg14gdbs7p11s"; }); nativeBuildInputs = [ autoPatchelfHook ]; + dontStrip = stdenv.isDarwin; + installPhase = '' mkdir -p $out/{bin,share/doc/ccloud-cli} cp ccloud $out/bin/ diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 21dbbcf0b72c..6eac6d52b799 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { - version = "1.3.0"; + version = "1.3.1"; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U="; + vendorSha256 = "sha256-IlQ83lhRiobjvXa4FvavwLAXe7Bi7oLXRAr+1kvIHhc="; doCheck = false; @@ -17,11 +17,11 @@ buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4="; + sha256 = "sha256-EUvwKQgQTX8wX9h/rMlCYuB0S/OhPo4Ynlz5QQOWJlU="; }; meta = with lib; { - maintainers = with maintainers; [ bricewge ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; description = "Command line client for the Drone continuous integration server"; }; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index e2d40630905c..b7da1970da2b 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -19,9 +19,6 @@ , zlib }: let - pname = "github-actions-runner"; - version = "2.279.0"; - deps = (import ./deps.nix { inherit fetchurl; }); nugetPackages = map (x: { @@ -29,63 +26,20 @@ let path = "${x}"; }) deps; - nugetSource = linkFarm "${pname}-${version}-packages" nugetPackages; + nugetSource = linkFarm "nuget-packages" nugetPackages; dotnetSdk = dotnetCorePackages.sdk_3_1; runtimeId = "linux-x64"; - - disabledTest = [ - # Self-updating is patched out, hence this test will fail - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" - ] ++ map - # Online tests - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") - [ - "CompositeActionWithActionfile_CompositeContainerNested" - "CompositeActionWithActionfile_CompositePrestepNested" - "CompositeActionWithActionfile_MaxLimit" - "CompositeActionWithActionfile_Node" - "DownloadActionFromGraph" - "DownloadActionFromGraph_Legacy" - "NotPullOrBuildImagesMultipleTimes" - "NotPullOrBuildImagesMultipleTimes_Legacy" - "RepositoryActionWithActionYamlFile_DockerHubImage" - "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" - "RepositoryActionWithActionfileAndDockerfile" - "RepositoryActionWithActionfileAndDockerfile_Legacy" - "RepositoryActionWithActionfile_DockerHubImage" - "RepositoryActionWithActionfile_DockerHubImage_Legacy" - "RepositoryActionWithActionfile_Dockerfile" - "RepositoryActionWithActionfile_Dockerfile_Legacy" - "RepositoryActionWithActionfile_DockerfileRelativePath" - "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" - "RepositoryActionWithActionfile_Node" - "RepositoryActionWithActionfile_Node_Legacy" - "RepositoryActionWithDockerfile" - "RepositoryActionWithDockerfile_Legacy" - "RepositoryActionWithDockerfileInRelativePath" - "RepositoryActionWithDockerfileInRelativePath_Legacy" - "RepositoryActionWithDockerfilePrepareActions_Repository" - "RepositoryActionWithInvalidWrapperActionfile_Node" - "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" - "RepositoryActionWithWrapperActionfile_PreSteps" - "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" - ] ++ map - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") - [ - "EnsureDotnetsdkBashDownloadScriptUpToDate" - "EnsureDotnetsdkPowershellDownloadScriptUpToDate" - ]; - testFilterXml = lib.concatStringsSep "&" disabledTest; in stdenv.mkDerivation rec { - inherit pname version; + pname = "github-runner"; + version = "2.281.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} - sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; + rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version} + sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0="; }; nativeBuildInputs = [ @@ -125,7 +79,7 @@ stdenv.mkDerivation rec { # Disable specific tests substituteInPlace src/dir.proj \ --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${testFilterXml}'" + "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'" # We don't use a Git checkout substituteInPlace src/dir.proj \ @@ -180,6 +134,49 @@ stdenv.mkDerivation rec { doCheck = true; + disabledTests = [ + # Self-updating is patched out, hence this test will fail + "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" + ] ++ map + # Online tests + (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") + [ + "CompositeActionWithActionfile_CompositeContainerNested" + "CompositeActionWithActionfile_CompositePrestepNested" + "CompositeActionWithActionfile_MaxLimit" + "CompositeActionWithActionfile_Node" + "DownloadActionFromGraph" + "DownloadActionFromGraph_Legacy" + "NotPullOrBuildImagesMultipleTimes" + "NotPullOrBuildImagesMultipleTimes_Legacy" + "RepositoryActionWithActionYamlFile_DockerHubImage" + "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" + "RepositoryActionWithActionfileAndDockerfile" + "RepositoryActionWithActionfileAndDockerfile_Legacy" + "RepositoryActionWithActionfile_DockerHubImage" + "RepositoryActionWithActionfile_DockerHubImage_Legacy" + "RepositoryActionWithActionfile_Dockerfile" + "RepositoryActionWithActionfile_Dockerfile_Legacy" + "RepositoryActionWithActionfile_DockerfileRelativePath" + "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" + "RepositoryActionWithActionfile_Node" + "RepositoryActionWithActionfile_Node_Legacy" + "RepositoryActionWithDockerfile" + "RepositoryActionWithDockerfile_Legacy" + "RepositoryActionWithDockerfileInRelativePath" + "RepositoryActionWithDockerfileInRelativePath_Legacy" + "RepositoryActionWithDockerfilePrepareActions_Repository" + "RepositoryActionWithInvalidWrapperActionfile_Node" + "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" + "RepositoryActionWithWrapperActionfile_PreSteps" + "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" + ] ++ map + (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") + [ + "EnsureDotnetsdkBashDownloadScriptUpToDate" + "EnsureDotnetsdkPowershellDownloadScriptUpToDate" + ]; + checkInputs = [ git ]; checkPhase = '' @@ -240,6 +237,10 @@ stdenv.mkDerivation rec { # Stripping breaks the binaries dontStrip = true; + preFixup = '' + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so + ''; + postFixup = '' fix_rpath() { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1 diff --git a/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix new file mode 100644 index 000000000000..a7021411b4c3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -0,0 +1,61 @@ +{ fetchFromGitHub +, lib +, openssl +, pkg-config +, protobuf +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "prisma-engines"; + version = "2.30.2"; + + src = fetchFromGitHub { + owner = "prisma"; + repo = "prisma-engines"; + rev = version; + sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg="; + }; + + cargoPatches = [ + # Remove test from compilation targets: + # they add time to an already long compilation and some fail out-of-the-box. + ./no_tests.patch + ]; + + # Use system openssl. + OPENSSL_NO_VENDOR = 1; + + cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM="; + + outputs = [ "out" "lib" "bin" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf ]; + + preBuild = '' + export OPENSSL_DIR=${lib.getDev openssl} + export OPENSSL_LIB_DIR=${openssl.out}/lib + + export PROTOC=${protobuf}/bin/protoc + export PROTOC_INCLUDE="${protobuf}/include"; + + export SQLITE_MAX_VARIABLE_NUMBER=250000 + export SQLITE_MAX_EXPR_DEPTH=10000 + ''; + + postInstall = '' + cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node + ''; + + # Tests are long to compile + doCheck = false; + + meta = with lib; { + description = "A collection of engines that power the core stack for Prisma"; + homepage = "https://www.prisma.io/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/prisma-engines/no_tests.patch b/nixpkgs/pkgs/development/tools/database/prisma-engines/no_tests.patch new file mode 100644 index 000000000000..fb88d92e485d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/prisma-engines/no_tests.patch @@ -0,0 +1,459 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 1070c7a30..310f7302f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -479,18 +479,6 @@ version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +-[[package]] +-name = "bitvec" +-version = "0.19.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +-dependencies = [ +- "funty", +- "radium", +- "tap", +- "wyz", +-] +- + [[package]] + name = "block-buffer" + version = "0.7.3" +@@ -706,19 +694,6 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "console" +-version = "0.14.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +-dependencies = [ +- "encode_unicode", +- "lazy_static", +- "libc", +- "terminal_size", +- "winapi", +-] +- + [[package]] + name = "const_fn" + version = "0.4.5" +@@ -1011,24 +986,12 @@ dependencies = [ + "uuid", + ] + +-[[package]] +-name = "dtoa" +-version = "0.4.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +- + [[package]] + name = "either" + version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +-[[package]] +-name = "encode_unicode" +-version = "0.3.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +- + [[package]] + name = "encoding" + version = "0.2.33" +@@ -1114,18 +1077,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "enum_dispatch" +-version = "0.3.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" +-dependencies = [ +- "once_cell", +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "enumflags2" + version = "0.7.1" +@@ -1261,12 +1212,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "funty" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +- + [[package]] + name = "futures" + version = "0.3.13" +@@ -1573,15 +1518,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "html-escape" +-version = "0.2.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233" +-dependencies = [ +- "utf8-width", +-] +- + [[package]] + name = "http" + version = "0.2.3" +@@ -1744,21 +1680,6 @@ version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +-[[package]] +-name = "insta" +-version = "1.7.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244" +-dependencies = [ +- "console", +- "lazy_static", +- "serde", +- "serde_json", +- "serde_yaml", +- "similar", +- "uuid", +-] +- + [[package]] + name = "instant" + version = "0.1.9" +@@ -1804,34 +1725,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "introspection-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "barrel", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "introspection-connector", +- "introspection-core", +- "migration-connector", +- "pretty_assertions", +- "quaint", +- "serde_json", +- "sql-datamodel-connector", +- "sql-introspection-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "user-facing-errors", +-] +- + [[package]] + name = "ipconfig" + version = "0.2.2" +@@ -2178,39 +2071,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "migration-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "bigdecimal", +- "chrono", +- "connection-string", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "migration-connector", +- "migration-core", +- "once_cell", +- "pretty_assertions", +- "prisma-value", +- "quaint", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "tempfile", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "url", +- "user-facing-errors", +-] +- + [[package]] + name = "mime" + version = "0.3.16" +@@ -2517,19 +2377,6 @@ dependencies = [ + "socket2 0.4.0", + ] + +-[[package]] +-name = "nom" +-version = "6.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +-dependencies = [ +- "bitvec", +- "funty", +- "lexical-core", +- "memchr", +- "version_check", +-] +- + [[package]] + name = "ntapi" + version = "0.3.6" +@@ -2773,18 +2620,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "parse-hyperlinks" +-version = "0.19.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff" +-dependencies = [ +- "html-escape", +- "nom", +- "percent-encoding", +- "thiserror", +-] +- + [[package]] + name = "pbkdf2" + version = "0.7.5" +@@ -3388,72 +3223,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "query-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "anyhow", +- "base64 0.13.0", +- "chrono", +- "colored", +- "datamodel-connector", +- "indoc", +- "insta", +- "prisma-value", +- "query-test-macros", +- "query-tests-setup", +- "serde_json", +- "tokio", +- "tracing", +- "tracing-futures", +- "uuid", +-] +- +-[[package]] +-name = "query-test-macros" +-version = "0.1.0" +-dependencies = [ +- "darling", +- "indoc", +- "itertools 0.10.0", +- "proc-macro2", +- "query-tests-setup", +- "quote", +- "syn", +-] +- +-[[package]] +-name = "query-tests-setup" +-version = "0.1.0" +-dependencies = [ +- "async-trait", +- "colored", +- "datamodel", +- "datamodel-connector", +- "enum_dispatch", +- "enumflags2", +- "indoc", +- "itertools 0.10.0", +- "lazy_static", +- "migration-core", +- "mongodb-datamodel-connector", +- "nom", +- "parse-hyperlinks", +- "prisma-models", +- "query-core", +- "regex", +- "request-handlers", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "thiserror", +- "tokio", +- "tracing", +- "tracing-error", +- "tracing-futures", +- "tracing-subscriber", +-] +- + [[package]] + name = "quick-error" + version = "1.2.3" +@@ -3469,12 +3238,6 @@ dependencies = [ + "proc-macro2", + ] + +-[[package]] +-name = "radium" +-version = "0.5.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +- + [[package]] + name = "rand" + version = "0.7.3" +@@ -3922,18 +3685,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "serde_yaml" +-version = "0.8.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +-dependencies = [ +- "dtoa", +- "linked-hash-map", +- "serde", +- "yaml-rust", +-] +- + [[package]] + name = "serial_test" + version = "0.5.1" +@@ -4028,12 +3779,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "similar" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" +- + [[package]] + name = "simple-mutex" + version = "1.1.5" +@@ -4372,12 +4117,6 @@ version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +-[[package]] +-name = "tap" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +- + [[package]] + name = "tempfile" + version = "3.2.0" +@@ -4392,16 +4131,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "terminal_size" +-version = "0.1.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +-dependencies = [ +- "libc", +- "winapi", +-] +- + [[package]] + name = "test-cli" + version = "0.1.0" +@@ -5094,12 +4823,6 @@ dependencies = [ + "user-facing-error-macros", + ] + +-[[package]] +-name = "utf8-width" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa" +- + [[package]] + name = "uuid" + version = "0.8.2" +@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" + dependencies = [ + "winapi", + ] +- +-[[package]] +-name = "wyz" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +- +-[[package]] +-name = "yaml-rust" +-version = "0.4.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +-dependencies = [ +- "linked-hash-map", +-] +diff --git a/Cargo.toml b/Cargo.toml +index 2411986ea..2eb2bb82d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -3,7 +3,6 @@ members = [ + "introspection-engine/connectors/introspection-connector", + "introspection-engine/connectors/sql-introspection-connector", + "introspection-engine/core", +- "introspection-engine/introspection-engine-tests", + "libs/datamodel/connectors/datamodel-connector", + "libs/datamodel/connectors/sql-datamodel-connector", + "libs/datamodel/connectors/mongodb-datamodel-connector", +@@ -12,14 +11,12 @@ members = [ + "migration-engine/connectors/sql-migration-connector", + "migration-engine/connectors/mongodb-migration-connector", + "migration-engine/core", +- "migration-engine/migration-engine-tests", + "query-engine/connectors/query-connector", + "query-engine/connectors/sql-query-connector", + "query-engine/connectors/mongodb-query-connector", + "query-engine/core", + "query-engine/query-engine", + "query-engine/query-engine-node-api", +- "query-engine/connector-test-kit-rs/query-engine-tests", + "query-engine/request-handlers", + "prisma-fmt", + "libs/datamodel/core", diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 6661dfce8fba..348111c5e4f9 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.4"; + version = "0.6.5"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-etnHr0epu7L/qIYNnJ2NOEL1ZmE/U62KpXSsiWsJJn0="; + sha256 = "sha256-JUvwp4Ptu1URWO7wyeOCjwjGW4S0XqYZwNjCyR3H/rc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/development/tools/database/termdbms/default.nix b/nixpkgs/pkgs/development/tools/database/termdbms/default.nix new file mode 100644 index 000000000000..b045669ef902 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/termdbms/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "termdbms"; + version = "unstable-2021-09-04"; + + src = fetchFromGitHub { + owner = "mathaou"; + repo = "termdbms"; + rev = "d46e72c796e8aee0def71b8e3499b0ebe5ca3385"; + sha256 = "1c3xgidhmvlcdw7v5gcqzv27cb58f1ix8sfd4r14rfz7c8kbv37v"; + }; + + vendorSha256 = "0h9aw68niizd9gs0i890g6ij13af04qgpfy1g5pskyr4ryx0gn26"; + + patches = [ ./viewer.patch ]; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + meta = with lib; { + homepage = "https://github.com/mathaou/termdbms/"; + description = "A TUI for viewing and editing database files"; + license = licenses.mit; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/termdbms/viewer.patch b/nixpkgs/pkgs/development/tools/database/termdbms/viewer.patch new file mode 100644 index 000000000000..1b95c71de46b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/termdbms/viewer.patch @@ -0,0 +1,12 @@ +diff --git a/viewer/viewer.go b/viewer/viewer.go +index fcf850e..b0a0f8d 100644 +--- a/viewer/viewer.go ++++ b/viewer/viewer.go +@@ -5,7 +5,6 @@ import ( + "github.com/charmbracelet/bubbles/viewport" + tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/lipgloss" +- "github.com/mattn/go-runewidth" + "math" + "runtime" + "strings" diff --git a/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 11fa78f1f02e..5ac113fda3e0 100644 --- a/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -25,11 +25,11 @@ buildPythonApplication rec { pname = "devpi-client"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "74ff365efeaa7b78c9eb7f6d7bd349ccd6252a6cdf879bcb4137ee5ff0fb127a"; + sha256 = "24ac6d94108996efad4ff5185dabb1e5120ae238134b8175d6de2ca9e766cd92"; }; buildInputs = [ glibcLocales ]; diff --git a/nixpkgs/pkgs/development/tools/esbuild/default.nix b/nixpkgs/pkgs/development/tools/esbuild/default.nix index ad88f368e8ad..5399e863f949 100644 --- a/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.24"; + version = "0.12.25"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-oD8QjjolEfmfxs+Q4duVUCbEp74HzIWaPrmH8Vn1H+o="; + sha256 = "sha256-2qYfev8x+DmtujIRNgwblTD31Lr+WvQQ/XXjjBOVusE="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/nixpkgs/pkgs/development/tools/frugal/default.nix b/nixpkgs/pkgs/development/tools/frugal/default.nix index a392bee26fdb..af87dbf2d193 100644 --- a/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.7"; + version = "3.14.8"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mCfM2G+FhKDwPg0NqLIAe8F5MRZVJ0tcIY9FBuLpRpE="; + sha256 = "sha256-oCqN9iG4+vBvIJoW1v4ww9SALlhcX5bEgqSjTArPQ2g="; }; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/nixpkgs/pkgs/development/tools/go-migrate/default.nix index d07e3cd80d32..261da1ddbdf7 100644 --- a/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Database migrations. CLI and Golang library"; maintainers = with maintainers; [ offline ]; license = licenses.mit; + mainProgram = "migrate"; }; } diff --git a/nixpkgs/pkgs/development/tools/go-task/default.nix b/nixpkgs/pkgs/development/tools/go-task/default.nix index 4c7d20bb74b9..3887a1591483 100644 --- a/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.7.0"; + version = "3.7.3"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-EksCnhSde25hradmKaDSOfIa/QnMAlIbgbQWX6k5v+4="; + sha256 = "sha256-/NeOMLfYU37Ra7RG/vofq+45Thky6kfGDcgnQxVLVGo="; }; - vendorSha256 = "sha256-Y2Yuc2pcxW0M1CJfN3dezPB9cg6MvOUg5A+yFHCwntk="; + vendorSha256 = "sha256-NU0Mgt8TJE/uE9/f2pFLRT0x6ZgCDbRcomlMFkA+juA="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 3512c1bf087c..2c37a5281b73 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.42.0"; + version = "1.42.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-xwJZfWDtA/6HkYZmGyhL/44xU8qLmJ2kk3Uqft0yivE="; + sha256 = "sha256-lhpljK4odn+j+Cb3sp1/cMnBRrLNhWxVoRIO2PDqMHo="; }; - vendorSha256 = "sha256-lOVGyxQcWG99hO+Eff2cNA5gW4DhsDrBY5Ejj0s4v4Q="; + vendorSha256 = "sha256-Z4lNGWLKagKHbVOy6MiKyuSlXwUCYlkvnvk5zS4vl1A="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gops/default.nix b/nixpkgs/pkgs/development/tools/gops/default.nix index bc9cba9df5f7..83da3588b275 100644 --- a/nixpkgs/pkgs/development/tools/gops/default.nix +++ b/nixpkgs/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "sha256-9QEhc0OVCrIdIY220PDn2+CjUsCF84l6QRQS0HjDEZY="; + sha256 = "sha256-eHcCi9D5TpRWxC39SnOD2GW3qyNBR69bHb8f/Gb+qAI="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/heroku/default.nix b/nixpkgs/pkgs/development/tools/heroku/default.nix index 35fccf0e62ee..18a031cd23b0 100644 --- a/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.51.0"; + version = "7.59.0"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "0wcqk4iy4r57k6fd6l0732yp5mclqfla1lfvx96ay45jnhh7rknx"; + sha256 = "0whkm8xi918m4y0wjdbma42kl4cc6chakjn5chi75aqd5y3qanpp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/htmlq/default.nix b/nixpkgs/pkgs/development/tools/htmlq/default.nix new file mode 100644 index 000000000000..2dedd39e9419 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/htmlq/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "htmlq"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "mgdm"; + repo = "htmlq"; + rev = "v${version}"; + sha256 = "sha256-Q2zjrHKFWowx2yB1cdGxPnNnc8yQJz65HaX0yIqbHks="; + }; + + cargoSha256 = "sha256-pPtKPVSdEtEPmQPpNRJ4uyguDRAW0YvKgdUw5OAtbjA="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + doCheck = false; + + meta = with lib; { + description = "Like jq, but for HTML"; + homepage = "https://github.com/mgdm/htmlq"; + license = licenses.mit; + maintainers = with maintainers; [ siraben nerdypepper ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix index c09344d8d53d..48e349abd849 100644 --- a/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.78.0"; + version = "0.79.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-03CuKNQtKdhD6fFYfsmeNR18oRGL5vWG7Lb+srNw8XU="; + sha256 = "sha256-ZlFjG6zlS/VLZjU4SXuDviFh6lsKeuNpIXYnHi2QB7s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index f9121e1e206f..9e852793ab7a 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-dolx2P7bnGiK3azMkwj75+ZA3qYr3rCUSLhMPtK85zA="; + sha256 = "sha256-KC/m+I4uOBS0bJb5yvxSkj+1Jlq+bekLTqHlz4vqv8I="; }; - cargoSha256 = "sha256-GPetK2uGB4HIPr/3DdTA0HNHELS8V1MqPtpgilubo9k="; + cargoSha256 = "sha256-et7V7orw2msv30nJ9sntzEQoeN1YqhHMnHOUt4a6e2I="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/nixpkgs/pkgs/development/tools/luaformatter/default.nix index 5fb82b0fb4c9..00d96a687a63 100644 --- a/nixpkgs/pkgs/development/tools/luaformatter/default.nix +++ b/nixpkgs/pkgs/development/tools/luaformatter/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { description = "Code formatter for Lua"; homepage = "https://github.com/Koihik/LuaFormatter"; license = licenses.asl20; + platforms = platforms.all; maintainers = with maintainers; [ figsoda SuperSandro2000 ]; mainProgram = "lua-format"; }; diff --git a/nixpkgs/pkgs/development/tools/mask/default.nix b/nixpkgs/pkgs/development/tools/mask/default.nix new file mode 100644 index 000000000000..25ab4ceab5f5 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/mask/default.nix @@ -0,0 +1,25 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mask"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "jakedeichert"; + repo = pname; + rev = "v${version}"; + sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc"; + }; + + cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963"; + + # tests require mask to be installed + doCheck = false; + + meta = with lib; { + description = "A CLI task runner defined by a simple markdown file"; + homepage = "https://github.com/jakedeichert/mask"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 3b1b54e6547a..018e65754d9d 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , substituteAll , binutils , asciidoctor @@ -14,18 +15,25 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.4"; + version = "4.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZewR1srksfKCxehhAg3i8m+0OvmOSF+24njbtcc1GQY="; + hash = "sha256-zsJoaaxYVV78vsxq2nbOh9ZAU1giKp8Kh6qJFL120CQ="; }; outputs = [ "out" "man" ]; patches = [ + # Use the shell builtin pwd for the basedir test + # See https://github.com/ccache/ccache/pull/933 + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/58fd1fbe75a1b5dc3f9151947ace15164fdef91c.patch"; + sha256 = "BoBn4YSDy8pQxJ+fQHSsrUZDBVeLFWXIQ6CunDwMO7o="; + }) + # When building for Darwin, test/run uses dwarfdump, whereas on # Linux it uses objdump. We don't have dwarfdump packaged for # Darwin, so this patch updates the test to also use objdump on diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index 3945389e8cd1..00d593f75107 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; + sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; }; buildInputs = [ ocaml findlib ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; - changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md"; + changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; license = lib.licenses.mit; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 6965d5fa0abb..4cdd0b8e3e24 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.9.1"; + version = "3.10.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6"; + sha256 = "09k19bygxl766dmshrp5df3i99jfm8bmamb4jggm62p3hg19bzkv"; }; nativeBuildInputs = [ cppo menhir ]; diff --git a/nixpkgs/pkgs/development/tools/oshka/default.nix b/nixpkgs/pkgs/development/tools/oshka/default.nix new file mode 100644 index 000000000000..bf31a9d9f311 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/oshka/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "oshka"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "k1LoW"; + repo = pname; + rev = "v${version}"; + sha256 = "1niyy7yiynpwa2cvcj4r3305v8ca4324q512839y79s3izd6a1lf"; + }; + + vendorSha256 = "08aj3nmj8angizkd3rbwbm7qzqxwrgfm1rka2x2a096z6mc3f4k4"; + + ldflags = [ + "-w" + "-s" + "-X github.com/k1LoW/oshka/version.Version=${version}" + ]; + + # Tests requires a running Docker instance + doCheck = false; + + meta = with lib; { + description = "Tool for extracting nested CI/CD supply chains and executing commands"; + homepage = "https://github.com/k1LoW/oshka"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/pactorio/default.nix b/nixpkgs/pkgs/development/tools/pactorio/default.nix index 3790440f1b8b..63c3c10ca36d 100644 --- a/nixpkgs/pkgs/development/tools/pactorio/default.nix +++ b/nixpkgs/pkgs/development/tools/pactorio/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { GEN_COMPLETIONS = "1"; meta = with lib; { - description = "Mod package for factorio"; + description = "Mod packager for factorio"; homepage = "https://github.com/figsoda/pactorio"; changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json index f16877e94655..36dd834d4d0f 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json @@ -4,6 +4,7 @@ "date": "2019-09-20T18:06:06+08:00", "path": "/nix/store/wqz9v9znaiwhhqi19hgig9bn0yvl4i9s-tree-sitter-agda", "sha256": "1wpfj47l97pxk3i9rzdylqipy849r482fnj3lmx8byhalv7z1vm6", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json index abb86b305459..090ee63616ec 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json @@ -4,6 +4,7 @@ "date": "2021-03-04T14:15:26-08:00", "path": "/nix/store/nvlvdv02wdy4dq4w19bvzq6nlkgvpj20-tree-sitter-bash", "sha256": "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 8b8315e4abdc..eefde83db98b 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "3953034ee61e8639100b063092d4280e047ca9e9", - "date": "2021-06-21T12:18:46+02:00", - "path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp", - "sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c", + "rev": "87c1aba089207f0fcc022ed88138af5a3e4cf454", + "date": "2021-09-05T21:16:06+01:00", + "path": "/nix/store/wx1asjwcpcmizavl7z756q55z3mvn714-tree-sitter-c-sharp", + "sha256": "1c1s2x7bpirsrkr6cqj9v4czpgavyf6b9dg290l9v7vd9fg3zh6v", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 9ed735f1e3fa..4e8c4521613f 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "008008e30a81849fca0c79291e2b480855e0e02c", - "date": "2021-05-26T09:13:01-07:00", - "path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c", - "sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2", + "rev": "d09ab34013de8a30d97a1912fc30811f1172515f", + "date": "2021-08-16T09:37:46-07:00", + "path": "/nix/store/94lp3b3hgap1baci006329zl2i168scm-tree-sitter-c", + "sha256": "0wf85g82p5j1vlw7rphfcpwch4b8sbvp4kk095aqmmcsm7d7dxl4", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index 0037ab6c42d4..3da60411f95c 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -4,6 +4,7 @@ "date": "2021-08-13T15:03:50-05:00", "path": "/nix/store/4aqsac34f0pzpa889067dqci743axrmx-tree-sitter-comment", "sha256": "0fqhgvpd391nxrpyhxcp674h8qph280ax6rm6dz1pj3lqs3grdka", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 4de8502e4151..95a0ea8a478d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "53afc568b70e4b71ee799501f34c876ad511f56e", - "date": "2021-08-13T10:48:59-05:00", - "path": "/nix/store/6gj41lh1fnnmcrz4c1bk3ncw0kpm97nm-tree-sitter-cpp", - "sha256": "02avniqmb5hgpkzwmkgxhrxk296dbkra9miyi5pax461ab4j7a9r", + "rev": "5bb411db33c86b108c891fb2c1473ddc9fad9701", + "date": "2021-08-17T11:20:29-07:00", + "path": "/nix/store/a23w5pnww3wryjs1vimp5ggvgq9bg0rl-tree-sitter-cpp", + "sha256": "1gxd40ipbzjhlk2amsk09v67cjxk4wal60kxycnb04lp6wxwlm8b", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index 924eea489cee..9b67d955eeb5 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "94e10230939e702b4fa3fa2cb5c3bc7173b95d07", - "date": "2021-03-04T15:25:23-08:00", - "path": "/nix/store/0q3y4zhphdcc54qijbx2pdp8li9idk64-tree-sitter-css", - "sha256": "0y90nsfbh13mf33yahbk7zklbv7124rpm0v19qydz6nv1f9hpywd", + "rev": "7c390622166517b01445e0bb08f72831731d3088", + "date": "2021-08-17T11:20:41-07:00", + "path": "/nix/store/wx5dzm92k2zv53r5p2s3jv1sak8xdk57-tree-sitter-css", + "sha256": "01r63dqxhgvsc1gkfy0mqsq98dmvc2hdw3c5zdkzdbry8zqpyn8s", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 32459e77ef01..53cac3040afc 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -4,6 +4,7 @@ "date": "2021-03-04T10:06:18-08:00", "path": "/nix/store/09b9drfnywcy1i8wlw6slnn76ch40kqk-tree-sitter-embedded-template", "sha256": "0c9l4i6kwb29zp05h616y3vk2hhcfc8bhdf9m436bk47pfy2zabg", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 85e2f5e71b80..e4d5751ab8b2 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,10 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "bc689e2ef264e2cba499cfdcd16194e8f5fe87d2", - "date": "2021-03-09T16:47:45-05:00", - "path": "/nix/store/3h4j1mrqvn0ybqjalic92bnhk7c15442-tree-sitter-fennel", - "sha256": "1jm21bmsdrz9x5skqmx433q9b4mfi88gzc4la5hqps4is28inqms", + "rev": "e10b04389094d9b96aa8489121c1f285562d701d", + "date": "2021-08-18T16:21:04-04:00", + "path": "/nix/store/rmlldcr0yq9c87lp96jrajbf5n4xin6r-tree-sitter-fennel", + "sha256": "1bavjjy8wbp1hkj1nps1lsqa9ihwhnj039hfi1fvgxv5j7il74ir", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index 4699358f6452..b32445c2804c 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -4,6 +4,7 @@ "date": "2021-08-02T21:46:56+01:00", "path": "/nix/store/0n3jfh7gk16bmikix34y5m534ac12xgc-tree-sitter-fish", "sha256": "1810z8ah1b09qpxcr4bh63bxsnxx24r6d2h46v2cpqv1lg0g4z14", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json index f40b8465b7db..6eeb5ccfe0a5 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json @@ -4,6 +4,7 @@ "date": "2018-06-18T13:00:38-07:00", "path": "/nix/store/zbj8abdlrqi9swm8qn8rhpqmjwcz145f-tree-sitter-fluent", "sha256": "0528v9w0cs73p9048xrddb1wpdhr92sn1sw8yyqfrq5sq0danr9k", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 69d4869010f4..02fff8098ad6 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "eb306e6e60f393df346cfc8cbfaf52667a37128a", - "date": "2021-05-04T14:03:16-07:00", - "path": "/nix/store/xgi4w5by155m1zqhqf2s7hmngy6sxdq3-tree-sitter-go", - "sha256": "03x3nkjxdfck9a4z2i50wq065vixqqk4v5w6fnd870q63v0zrc7c", + "rev": "42b1e657c3a394c01df51dd3eadc8b214274a73c", + "date": "2021-08-16T18:29:17+02:00", + "path": "/nix/store/a1crqhfrd8v9g9w0565aca7nc9k2x7a0-tree-sitter-go", + "sha256": "1khsl8qz6r4dqw7h43m3jw3iqhh79sgpnsps0jy95f165iy496z3", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 1a0bf43fff47..3f04f23304dc 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "30eea3c1339e573cda5dcffd8f9b06003ec31789", - "date": "2021-08-07T14:37:05+02:00", - "path": "/nix/store/b99w2q2y5gjj5h1bxipncaf40dyx5sd2-tree-sitter-haskell", - "sha256": "0cch7bcr4d9ll92vhcp79bjzs9dw0glvdrdj2q2h2mg5mmkzcya8", + "rev": "acafd11d9e45b1c28b49ff798022022b29d8b450", + "date": "2021-08-27T16:35:25+02:00", + "path": "/nix/store/wmw8ppdkndwg3f8phdhws985ckxs0yvk-tree-sitter-haskell", + "sha256": "1zm8m7lpgmh4gr0iw0792bsqi5jpf3w0kx6l3s91clici69nwkiq", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index b2a0b71f41c2..211e170adced 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "af9339f3deb131ab99acfac906713b81dbcc41c9", - "date": "2021-07-11T11:04:28-07:00", - "path": "/nix/store/jg23pmi6jfy4kykah645gl44a145929c-tree-sitter-html", - "sha256": "1qb4rfbra3nc0fwmla8q1hb4r48k8cv3nl60zc24xhrw3q1d9zh1", + "rev": "161a92474a7bb2e9e830e48e76426f38299d99d1", + "date": "2021-08-17T11:20:56-07:00", + "path": "/nix/store/pv8x73j4sbngsqplwfm73jlpwc31mc17-tree-sitter-html", + "sha256": "1gwvgwk0py09pp65vnga522l5r16dvgwxsc76fg66y07k2i63cfk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 0856320ef59b..62bec402bd76 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -4,6 +4,7 @@ "date": "2021-05-04T14:05:05-07:00", "path": "/nix/store/bzljwaraqj6zqpq85cz9xb0vwh7c10yj-tree-sitter-java", "sha256": "09v3xg1356ghc2n0yi8iqkp80lbkav0jpfgz8iz2j1sl7ihbvkyw", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 08ad936562c4..f5b7e3f1c092 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "bc2eb3994fd7cc605d27a32f9fcbee80bbb57f6d", - "date": "2021-08-13T14:29:43-07:00", - "path": "/nix/store/jkq26hbij9si8ri8k5agkdadr3p1nmbi-tree-sitter-javascript", - "sha256": "0f6bny38za17mmwqw0q0nmdb4f9i0xs7kbzixxgi44yyd43r5pzp", + "rev": "2cc5803225a307308005930b3bedb939b1543722", + "date": "2021-08-29T11:32:53-07:00", + "path": "/nix/store/kjviknhcrayrzv94i762zsy2kvpxpkx6-tree-sitter-javascript", + "sha256": "1xkll7g38j1vajylfaifbn6i5y5f22kmjfy2dxy9bk903assxy05", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index 94920e80442f..3f9b7203f3ff 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -4,6 +4,7 @@ "date": "2021-03-04T14:39:14-08:00", "path": "/nix/store/dpm11vziss6jbgp3dxvmgkb0dgg1ygc8-tree-sitter-jsdoc", "sha256": "0qpsy234p30j6955wpjlaqwbr21bi56p0ln5vhrd84s99ac7s6b6", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index ad00365e71ee..13e67533f401 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "65bceef69c3b0f24c0b19ce67d79f57c96e90fcb", - "date": "2021-03-09T16:25:11-05:00", - "path": "/nix/store/bn5smxwwg4zzdc52wp2qb6s6yjdfi8mg-tree-sitter-json", - "sha256": "13p4ffmajirl9qh64d6qnng1gjnh5f6jkqbra0nlc1260nsf12hp", + "rev": "203e239408d642be83edde8988d6e7b20a19f0e8", + "date": "2021-08-18T10:35:07-07:00", + "path": "/nix/store/yqbmn17vs2lxqg5wa8b269fcsd5wr4bv-tree-sitter-json", + "sha256": "08igb9ylfdsjasyn0p9j4sqpp0i2x1qcdzacbmsag02jmkyi6s7f", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index ef319a1e33d7..9f093a4d4e37 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -4,6 +4,7 @@ "date": "2021-05-03T17:44:45-07:00", "path": "/nix/store/lbz23r698hn7cha09qq0dbfay7dh74gg-tree-sitter-julia", "sha256": "0rmd7k3rv567psxrlqv17gvckijs19xs6mxni045rpayxmk441sk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index b96375e3caf0..c41e4237b767 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -4,6 +4,7 @@ "date": "2021-07-19T17:50:34+02:00", "path": "/nix/store/vrpfbjfps3bd9vrx8760l0vx7m7ijhja-tree-sitter-latex", "sha256": "0dfpdv5sibvajf2grlc0mqhyggjf6ip9j01jikk58n1yc9va88ib", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index be89244fc6e7..988f76792273 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -4,6 +4,7 @@ "date": "2021-08-02T15:13:28+02:00", "path": "/nix/store/h1bhl291jac001w2c8fxi9w7dsqxq5q0-tree-sitter-lua", "sha256": "05ash0l46s66q9yamzzh6ghk8yv0vas13c7dmz0c9xljbjk5ab1d", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index 0079a47810a3..c908bde0dfff 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -4,6 +4,7 @@ "date": "2021-04-18T20:49:21+08:00", "path": "/nix/store/4z2k0q6rwqmb7vbqr4vgc26w28szlan3-tree-sitter-markdown", "sha256": "1a2899x7i6dgbsrf13qzmh133hgfrlvmjsr3bbpffi1ixw1h7azk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index f857c40c4fe1..e04d8f81ff63 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -4,6 +4,7 @@ "date": "2021-07-21T20:36:40-05:00", "path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix", "sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index fe6b149e0409..abf7df917efe 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "0348562f385bc2bd67ecf181425e1afd6d454192", - "date": "2021-05-07T21:05:16+02:00", - "path": "/nix/store/s2499rsi28k0nrwx8wl2idsp86zsx2iz-tree-sitter-ocaml", - "sha256": "0iqmwcz3c2ai4gyx4xli1rhn6hi6a0f60dn20f8jas9ham9dc2df", + "rev": "23d419ba45789c5a47d31448061557716b02750a", + "date": "2021-08-26T21:21:27+02:00", + "path": "/nix/store/942q4rv9vs77wwvvw46yx0jnqja2cbig-tree-sitter-ocaml", + "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 6f62a595ee3d..ac5891e5409d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "63cebc37ebed42887f14cdd0baec961d5a1e16c1", - "date": "2021-08-10T20:56:40+02:00", - "path": "/nix/store/bh4yl563l5fgh7r8f95zzybsavci8hyh-tree-sitter-php", - "sha256": "1psiamww22imw05z0h34yks7vh7y4x4bdn62dwic1gpwfbjdrfmr", + "rev": "77d98f3ce47ea52ff39137be29bc6376951c2286", + "date": "2021-09-03T18:25:31+02:00", + "path": "/nix/store/l143h3fxi89kk7dcp71zjdhdfmfmr68s-tree-sitter-php", + "sha256": "15cl1mdclhjiw72xzkcmw0lxq2hv1bjf2xf2nkgibi7zp8s1qvyw", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 1b6e562f85a6..0ba8de4a09cf 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -4,6 +4,7 @@ "date": "2021-03-27T09:41:53-07:00", "path": "/nix/store/4v24ahydid4hr7kj0xi41mgbpglfnnki-tree-sitter-python", "sha256": "173lpxi4vqa42dcdr9aj5phg5g6ny9ns04djw9n86pasx2w66dhk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 41c63a2ce8c0..d1a73a02c0b4 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -4,6 +4,7 @@ "date": "2021-06-02T18:46:47+02:00", "path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql", "sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json index 6df921757bb8..b07344339855 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-regex", - "rev": "3041aa3472d16fd94c6a9e15b741dbfecd9b714e", - "date": "2021-03-04T14:37:27-08:00", - "path": "/nix/store/7d200fzyx2rkbbgf47g5ismvd4id0fqy-tree-sitter-regex", - "sha256": "0jah3apalvp7966sjzdrka2n7f83h64sd56nbq2lzmrxgv98rxmg", + "rev": "7b97502cfc3ffa7110f6b68bb39fb259c9a0500c", + "date": "2021-08-17T11:21:39-07:00", + "path": "/nix/store/3lpj820c141i26p20kin465xlr5jpyjs-tree-sitter-regex", + "sha256": "0n9lmwwgij00078v3fr19vfn1g3wh3agm8jqp80v1cnrcsmpn97p", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index c8142974fd43..86320373d7ea 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -4,6 +4,7 @@ "date": "2021-03-03T16:54:30-08:00", "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index b83bcb258852..8e8af00423b8 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "a360da0a29a19c281d08295a35ecd0544d2da211", - "date": "2021-03-27T09:50:22-07:00", - "path": "/nix/store/h4snh879ccy159fa390qr8l0nyaf5ndr-tree-sitter-rust", - "sha256": "0knaza3ww5h5w95hzdaalg5yrfpiv0r394q0imadxp5611132hxz", + "rev": "cc7bdd3e6d14677e8aa77da64f6a3f57b6f8b00a", + "date": "2021-08-17T11:21:11-07:00", + "path": "/nix/store/aw8bi91hz7a26swc5qrfqwn2lrdmiymr-tree-sitter-rust", + "sha256": "15qz4rwz1fkpcy78g0aspfgk9pgykvzv5sxmhgm37nfpgyi7vlg1", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index ed48c146fbe2..e721ed08eee0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "ec38674996753f9631615fa558d4f1fa3bf90633", - "date": "2021-08-08T14:43:30-07:00", - "path": "/nix/store/2b0z1j06gvpcn1rvq8hv5vdqlh3qlzmv-tree-sitter-scala", - "sha256": "1xv544wnyd075g5pc8lxi0ix6wrwiv82sdjhzf3wd1np42vxq3d4", + "rev": "449b6baa6b1cd0c2403636459af1571e075dbaa8", + "date": "2021-08-31T13:42:29-07:00", + "path": "/nix/store/8m3s0ndhmns8435g2mlbcz9sdbqgmjz7-tree-sitter-scala", + "sha256": "1lmiljsd5irzc0pabxdcjgfq98xyqm76fracglq68p106mngia07", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 41c4fcfe734d..d3ea25aad8f2 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -4,6 +4,7 @@ "date": "2021-03-20T16:45:11+05:30", "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json index 8f73380e3799..0c7fbb0d1add 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json @@ -4,6 +4,7 @@ "date": "2019-10-24T19:04:02-06:00", "path": "/nix/store/pk5xk8yp6vanbar75bhfrs104w0k1ph0-tree-sitter-swift", "sha256": "14b40lmwrnyvdz2wiv684kfh4fvqfhbj1dgrx81ppmy7hsz7jcq7", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json index a3d9bedd133b..ae182486506a 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json @@ -4,6 +4,7 @@ "date": "2021-05-11T12:47:32+08:00", "path": "/nix/store/isgpadcxmgkb14w9yg67pb8lx7wlfhnn-tree-sitter-toml", "sha256": "0yasw5fp4mq6vzrdwlc3dxlss8a94bsffv4mzrfp0b3iw0s1dlyg", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json index 918e87b38a42..6119c6e1603d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json @@ -4,6 +4,7 @@ "date": "2021-05-18T15:57:40-04:00", "path": "/nix/store/j59y4s3bsv6d5nbmhhdgb043hmk8157k-tree-sitter-tsq", "sha256": "03bch2wp2jwxk69zjplvm0gbyw06qqdy7il9qkiafvhrbh03ayd9", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 1a399772957f..adeb1e182735 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "d598c96714a2dc9e346589c63369aff6719a51e6", - "date": "2021-08-02T14:05:14-07:00", - "path": "/nix/store/hf714sspmakhzra9bqazhbb0iljva1hi-tree-sitter-typescript", - "sha256": "0yra8fhgv7wqkik85icqyckf980v9ch411mqcjcf50n5dc1siaik", + "rev": "83816f563c8d9d2f1b9c921206a7944d0c5904ad", + "date": "2021-08-17T11:21:26-07:00", + "path": "/nix/store/jwxdv5xbs92n43yqvxnwz443jvngxmqp-tree-sitter-typescript", + "sha256": "1w989z36pvfv7m4z9s9qq67l81p8rx37z53kqmsxsyc01wnpb4nr", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json index 5e4e14a95b37..700ec9f22dd0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json @@ -4,6 +4,7 @@ "date": "2021-03-31T21:27:26-07:00", "path": "/nix/store/4j6hrf8bc8zjd7r9xnna9njpw0i4z817-tree-sitter-verilog", "sha256": "0ygm6bdxqzpl3qn5l58mnqyj730db0mbasj373bbsx81qmmzkgzz", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json index 8959c80f9f48..1942b47e081d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json @@ -4,6 +4,7 @@ "date": "2021-05-11T12:47:24+08:00", "path": "/nix/store/7d7m4zs4ydnwbn3xnfm3pvpy7gvkrmg8-tree-sitter-yaml", "sha256": "0wyvjh62zdp5bhd2y8k7k7x4wz952l55i1c8d94rhffsbbf9763f", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 97774bc58f61..538edddce644 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -4,6 +4,7 @@ "date": "2021-03-30T12:55:10-03:00", "path": "/nix/store/av4xgzr3c1rhr7v4fa9mm68krd2qv1lg-tree-sitter-zig", "sha256": "0gjxac43qpqc4332bp3mpdbvh7rqv0q3hvw8834b30ml5q0r0qr0", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/rocminfo/default.nix b/nixpkgs/pkgs/development/tools/rocminfo/default.nix new file mode 100644 index 000000000000..cef5d7e3666f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rocminfo/default.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, writeScript, fetchpatch, cmake, rocm-runtime, python3, rocm-cmake, busybox, gnugrep + # rocminfo requires that the calling user have a password and be in + # the video group. If we let rocm_agent_enumerator rely upon + # rocminfo's output, then it, too, has those requirements. Instead, + # we can specify the GPU targets for this system (e.g. "gfx803" for + # Polaris) such that no system call is needed for downstream + # compilers to determine the desired target. +, defaultTargets ? []}: +stdenv.mkDerivation rec { + version = "4.3.1"; + pname = "rocminfo"; + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "rocminfo"; + rev = "rocm-${version}"; + sha256 = "sha256-n80tiSVaPTFl4imZvoFENM4KhPLxgDKz5VlOvhEYlV0="; + }; + + enableParallelBuilding = true; + buildInputs = [ cmake rocm-cmake rocm-runtime ]; + cmakeFlags = [ + "-DROCM_DIR=${rocm-runtime}" + "-DROCRTST_BLD_TYPE=Release" + ]; + + prePatch = '' + sed 's,#!/usr/bin/env python3,#!${python3}/bin/python,' -i rocm_agent_enumerator + sed 's,lsmod | grep ,${busybox}/bin/lsmod | ${gnugrep}/bin/grep ,' -i rocminfo.cc + ''; + + installPhase = '' + mkdir -p $out/bin + cp rocminfo $out/bin + cp rocm_agent_enumerator $out/bin + '' + lib.optionalString (defaultTargets != []) '' + echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst + ''; + + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + update-source-version rocminfo "$version" + ''; + + meta = with lib; { + description = "ROCm Application for Reporting System Info"; + homepage = "https://github.com/RadeonOpenCompute/rocminfo"; + license = licenses.ncsa; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix index cd657967e9a0..68d5a256bbf4 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "Display the assembly or LLVM-IR generated for Rust source code"; homepage = "https://github.com/gnzlbg/cargo-asm"; license = licenses.mit; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 9e95ee4430cc..9803cd531e7e 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -3,28 +3,38 @@ , rustPlatform , perl , pkg-config +, SystemConfiguration , Security , curl , libiconv , openssl +, git }: rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.19.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; - rev = "v${version}"; - sha256 = "sha256-XwwzMo06TdyOtGE9Z48mkEr6DnB/89wtMrW+UWr0G/Q="; + rev = version; + sha256 = "sha256-j2dafXUI6rDEYboSAciMeNma/YaBYKuQZgMUGVU+oBQ="; }; - cargoSha256 = "sha256-gA2Fg4CCi0W+GqJoNPZWw/OjNYh2U2UsC6eMZ9W1QN8="; + cargoSha256 = "sha256-khrpS6QFpweKbTbR0YhAJTTrgDoZl9fzYPDs+JE1mtA="; + + preCheck = '' + export HOME=$(mktemp -d) + git config --global user.name "Nixpkgs Test" + git config --global user.email "nobody@example.com" + ''; nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security libiconv curl ]; + + checkInputs = [ git ]; meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index 6cc10418fc0c..96720a549a90 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TqrbkTij+XCousADorrzsVVNVYOUEyl5+nhMn4IgaIY="; + sha256 = "sha256-QN9N3o6gnr/pUTvRHxl3Wv42KxFOlRDpIr5pw2vB1x4="; }; - cargoSha256 = "sha256-cA4a7lqzOXkNZ7ehM/gCqtTyAaY2TH+23bITHBId8wQ="; + cargoSha256 = "sha256-rgiOwkbQLnaREvd5yMmipnVnl5Lqb+g+SHeP0V8XVTQ="; passthru = { updateScript = nix-update-script { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix new file mode 100644 index 000000000000..9ab6d7e2b03a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-sort"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "devinr528"; + repo = pname; + rev = "v${version}"; + sha256 = "146aawikyjcxbj0dpnqia31xmplpwkl9w1gv7d9a5jvz8whvxrff"; + }; + + cargoSha256 = "0xm37f285vmd674k5j72pcjg6zpmxlf46d9vppi9s3qaw0hsslpf"; + + meta = with lib; { + description = "A tool to check that your Cargo.toml dependencies are sorted alphabetically"; + homepage = "https://github.com/devinr528/cargo-sort"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 5ab47c8aa8de..deb68d7d00b8 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/PyO3/maturin"; license = licenses.asl20; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix index a5713d944a80..547f11125b70 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix @@ -40,6 +40,6 @@ python.pkgs.buildPythonPackage rec { description = "PyO3 word count example"; homepage = "https://github.com/PyO3/pyo3"; license = licenses.asl20; - maintainers = [ maintainers.danieldk ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index fc70238ada08..7fc5c2b5b527 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-08-30"; - cargoSha256 = "sha256-ba/4mQSBJin3yoIZjzFTiEIRY2eWFQI2pY1dOCZ1ALw="; + version = "2021-09-06"; + cargoSha256 = "sha256-CTCDSoViyVMHxUKQz8fE+r3rkXf7yRgzZ90fZmMtcNM="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-mgwoJfvO3W4MYk6ikgck14e+hMjA2D+4lpnkAEeLEWA="; + sha256 = "sha256-TacpTVvHAIs4kZ5vibj8luy/kryYwxY+OXFNPnqiXP0="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/sslmate/default.nix b/nixpkgs/pkgs/development/tools/sslmate/default.nix index ede6364fa067..2371600a7f4f 100644 --- a/nixpkgs/pkgs/development/tools/sslmate/default.nix +++ b/nixpkgs/pkgs/development/tools/sslmate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sslmate"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz"; - sha256 = "1i56za41cfqlml9g787xqqs0r8jifd3y7ks9nf4k2dhhi4rijkj5"; + sha256 = "sha256-A1TkGi6b1psWflN0ogM1r/pYSVXcOi6aQEb6xtOsAsk="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/development/tools/tracy/default.nix b/nixpkgs/pkgs/development/tools/tracy/default.nix index 5bb056d5b34e..55114c518e57 100644 --- a/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -20,6 +20,9 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; NIX_CFLAGS_COMPILE = [ ] + # Apple's compiler finds a format string security error on + # ../../../server/TracyView.cpp:649:34, preventing building. + ++ lib.optional stdenv.isDarwin "-Wno-format-security" ++ lib.optional stdenv.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation" ++ lib.optional disableLTO "-fno-lto"; diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index c222d5232bac..fb239bccb400 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.232"; + version = "0.0.233"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-VpHHkcN7VTMLBFMOTJcO6b2JIOZVcubJDKN04xXQIzA="; + sha256 = "sha256-qDFO9QV6ItYv/QsnXFCViWo2CQj7hGZftVMD22QL+uQ="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-6t2aLSr78pEhrYI53OMQpfJqa65wQAxlz6+ksUtxzmI="; + vendorSha256 = "sha256-+g0VzgdArxUTT5wDw6ddZn9YDNOXHqysye6cIrCc3Iw="; doCheck = false; diff --git a/nixpkgs/pkgs/development/web/nodejs/v16.nix b/nixpkgs/pkgs/development/web/nodejs/v16.nix index 805e62be8d62..2b2b042ac680 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.8.0"; - sha256 = "14k3njj382im3q4k6dhsxdk07gs81hw2k0nrixfvlw1964k04ydq"; + version = "16.9.1"; + sha256 = "070k8i9a65r03xdchr200qixv053mim5irfvgg4pl3h57k2hxxcp"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/nixpkgs/pkgs/games/airshipper/default.nix b/nixpkgs/pkgs/games/airshipper/default.nix new file mode 100644 index 000000000000..1fe33a86f978 --- /dev/null +++ b/nixpkgs/pkgs/games/airshipper/default.nix @@ -0,0 +1,74 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, openssl +, vulkan-loader +, wayland +, wayland-protocols +, libxkbcommon +, libX11 +, libXrandr +, libXi +, libXcursor +, pkg-config +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "airshipper"; + version = "0.6.0"; + + src = fetchFromGitLab { + owner = "Veloren"; + repo = "airshipper"; + rev = "v${version}"; + sha256 = "sha256-m3H2FE1DoV/uk9PGgf9PCagwmWWSQO/gCi7zpS02/WY="; + }; + + cargoSha256 = "sha256-ddy4TjT/ia+sLBnpwcXBVUzAS07ar+Jjc04KS5/arlU="; + + buildInputs = [ + openssl + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + + postInstall = '' + mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" + cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" + cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + ''; + + postFixup = + let + libPath = lib.makeLibraryPath [ + vulkan-loader + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + in '' + patchelf --set-rpath "${libPath}" "$out/bin/airshipper" + ''; + + doCheck = false; + cargoBuildFlags = [ "--package" "airshipper" ]; + cargoTestFlags = [ "--package" "airshipper" ]; + + meta = with lib; { + description = "Provides automatic updates for the voxel RPG Veloren."; + homepage = "https://www.veloren.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ yusdacra ]; + }; +} diff --git a/nixpkgs/pkgs/games/astromenace/default.nix b/nixpkgs/pkgs/games/astromenace/default.nix index cbe2385ea125..16b087d1e4d0 100644 --- a/nixpkgs/pkgs/games/astromenace/default.nix +++ b/nixpkgs/pkgs/games/astromenace/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://www.viewizard.com/"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; + mainProgram = "AstroMenace"; }; } diff --git a/nixpkgs/pkgs/games/crossfire/crossfire-arch.nix b/nixpkgs/pkgs/games/crossfire/crossfire-arch.nix new file mode 100644 index 000000000000..ff9e0f9dea6d --- /dev/null +++ b/nixpkgs/pkgs/games/crossfire/crossfire-arch.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchsvn, + version, rev, sha256 }: + +stdenv.mkDerivation rec { + pname = "crossfire-arch"; + version = "r${toString rev}"; + + src = fetchsvn { + url = "http://svn.code.sf.net/p/crossfire/code/arch/trunk/"; + sha256 = sha256; + rev = rev; + }; + + installPhase = '' + mkdir -p "$out" + cp -a . "$out/" + ''; + + meta = with lib; { + description = "Archetype data for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/nixpkgs/pkgs/games/crossfire/crossfire-client.nix b/nixpkgs/pkgs/games/crossfire/crossfire-client.nix new file mode 100644 index 000000000000..799ae4ab6ee7 --- /dev/null +++ b/nixpkgs/pkgs/games/crossfire/crossfire-client.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchsvn +, cmake, pkg-config, perl, vala +, gtk2, pcre, zlib, libpng, fribidi, harfbuzzFull, xorg, util-linux, curl +, SDL, SDL_image, SDL_mixer, libselinux, libsepol +, version, rev, sha256 +}: + +stdenv.mkDerivation rec { + pname = "crossfire-client"; + version = "r${toString rev}"; + + src = fetchsvn { + url = "http://svn.code.sf.net/p/crossfire/code/client/trunk/"; + sha256 = sha256; + rev = rev; + }; + + nativeBuildInputs = [ cmake pkg-config perl vala ]; + buildInputs = [ + gtk2 pcre zlib libpng fribidi harfbuzzFull xorg.libpthreadstubs + xorg.libXdmcp curl SDL SDL_image SDL_mixer util-linux libselinux libsepol + ]; + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "GTKv2 client for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/nixpkgs/pkgs/games/crossfire/crossfire-maps.nix b/nixpkgs/pkgs/games/crossfire/crossfire-maps.nix new file mode 100644 index 000000000000..0521b038d361 --- /dev/null +++ b/nixpkgs/pkgs/games/crossfire/crossfire-maps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchsvn, + version, rev, sha256 }: + +stdenv.mkDerivation rec { + pname = "crossfire-maps"; + version = "r${toString rev}"; + + src = fetchsvn { + url = "http://svn.code.sf.net/p/crossfire/code/maps/trunk/"; + sha256 = sha256; + rev = rev; + }; + + installPhase = '' + mkdir -p "$out" + cp -a . "$out/" + ''; + + meta = with lib; { + description = "Map data for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/nixpkgs/pkgs/games/crossfire/crossfire-server.nix b/nixpkgs/pkgs/games/crossfire/crossfire-server.nix new file mode 100644 index 000000000000..9259e8e52faa --- /dev/null +++ b/nixpkgs/pkgs/games/crossfire/crossfire-server.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchsvn, autoreconfHook, + autoconf, automake, libtool, flex, perl, check, pkg-config, python3, + version, rev, sha256, maps, arch }: + +stdenv.mkDerivation rec { + pname = "crossfire-server"; + version = "r${toString rev}"; + + src = fetchsvn { + url = "http://svn.code.sf.net/p/crossfire/code/server/trunk/"; + sha256 = sha256; + rev = rev; + }; + + nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python3 ]; + hardeningDisable = [ "format" ]; + + preConfigure = '' + ln -s ${arch} lib/arch + ln -s ${maps} lib/maps + sh autogen.sh + ''; + + configureFlags = [ "--with-python=${python3}" ]; + + postInstall = '' + ln -s ${maps} "$out/share/crossfire/maps" + ''; + + meta = with lib; { + description = "Server for the Crossfire free MMORPG"; + homepage = "http://crossfire.real-time.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/nixpkgs/pkgs/games/crossfire/default.nix b/nixpkgs/pkgs/games/crossfire/default.nix new file mode 100644 index 000000000000..bc74c00bcce4 --- /dev/null +++ b/nixpkgs/pkgs/games/crossfire/default.nix @@ -0,0 +1,28 @@ +{ callPackage, ... }: + +rec { + crossfire-client = callPackage ./crossfire-client.nix { + version = "1.75.0"; + rev = 21760; + sha256 = "0b42sak8hj60nywfswkps777asy9p8r9wsn7pmj2nqbd29ng1p9d"; + }; + + crossfire-server = callPackage ./crossfire-server.nix { + version = "latest"; + rev = 22111; + sha256 = "04fjif6zv642n2zlw27cgzkak2kknwrxqzg42bvzl7q901bsr9l7"; + maps = crossfire-maps; arch = crossfire-arch; + }; + + crossfire-arch = callPackage ./crossfire-arch.nix { + version = "latest"; + rev = 22111; + sha256 = "0l4rp3idvbhknpxxs0w4i4nqfg01wblzm4v4j375xwxxbf00j0ms"; + }; + + crossfire-maps = callPackage ./crossfire-maps.nix { + version = "latest"; + rev = 22111; + sha256 = "1dwfc84acjvbjgjakkb8z8pdlksbsn90j0z8z8rq37lqx0kx1sap"; + }; +} diff --git a/nixpkgs/pkgs/games/deliantra/0001-abs.patch b/nixpkgs/pkgs/games/deliantra/0001-abs.patch new file mode 100644 index 000000000000..d116317e243a --- /dev/null +++ b/nixpkgs/pkgs/games/deliantra/0001-abs.patch @@ -0,0 +1,17 @@ +--- a/utils/cfhq2xa.C ++++ b/utils/cfhq2xa.C +@@ -182,10 +182,10 @@ static inline bool Diff (pixel w1, pixel w2) + pixel YUV1 = RGBAtoYUVA (w1); + pixel YUV2 = RGBAtoYUVA (w2); + +- return ((abs (((YUV1 >> Rshift) & Cmask) - ((YUV2 >> Rshift) & Cmask)) > trY) || +- (abs (((YUV1 >> Gshift) & Cmask) - ((YUV2 >> Gshift) & Cmask)) > trU) || +- (abs (((YUV1 >> Bshift) & Cmask) - ((YUV2 >> Bshift) & Cmask)) > trV) || +- (abs (((YUV1 >> Ashift) & Cmask) - ((YUV2 >> Ashift) & Cmask)) > trA) ); ++ return ((abs ((signed int)((YUV1 >> Rshift) & Cmask) - (signed int)((YUV2 >> Rshift) & Cmask)) > trY) || ++ (abs ((signed int)((YUV1 >> Gshift) & Cmask) - (signed int)((YUV2 >> Gshift) & Cmask)) > trU) || ++ (abs ((signed int)((YUV1 >> Bshift) & Cmask) - (signed int)((YUV2 >> Bshift) & Cmask)) > trV) || ++ (abs ((signed int)((YUV1 >> Ashift) & Cmask) - (signed int)((YUV2 >> Ashift) & Cmask)) > trA) ); + } + + static void diff --git a/nixpkgs/pkgs/games/deliantra/0002-datadir.patch b/nixpkgs/pkgs/games/deliantra/0002-datadir.patch new file mode 100644 index 000000000000..1c8e847d88c6 --- /dev/null +++ b/nixpkgs/pkgs/games/deliantra/0002-datadir.patch @@ -0,0 +1,11 @@ +--- a/utils/cfutil.in ++++ b/utils/cfutil.in +@@ -27,7 +27,7 @@ use common::sense; + my $prefix = "@prefix@"; + my $exec_prefix = "@exec_prefix@"; + my $datarootdir = "@datarootdir@"; +-my $DATADIR = "@datadir@/@PACKAGE@"; ++my $DATADIR = $ENV{'DELIANTRA_DATADIR'} || "@datadir@/@PACKAGE@"; + + my $CONVERT = "@CONVERT@"; + my $IDENTIFY = "@IDENTIFY@"; diff --git a/nixpkgs/pkgs/games/deliantra/default.nix b/nixpkgs/pkgs/games/deliantra/default.nix new file mode 100644 index 000000000000..76a06c960187 --- /dev/null +++ b/nixpkgs/pkgs/games/deliantra/default.nix @@ -0,0 +1,10 @@ +pkgs: + +let + callPackage = pkgs.callPackage; +in { + deliantra-server = callPackage ./deliantra-server.nix {}; + deliantra-arch = callPackage ./deliantra-arch.nix {}; + deliantra-maps = callPackage ./deliantra-maps.nix {}; + deliantra-data = callPackage ./deliantra-data.nix {}; +} diff --git a/nixpkgs/pkgs/games/deliantra/deliantra-arch.nix b/nixpkgs/pkgs/games/deliantra/deliantra-arch.nix new file mode 100644 index 000000000000..2201ca2d1f5f --- /dev/null +++ b/nixpkgs/pkgs/games/deliantra/deliantra-arch.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchurl, deliantra-server }: + +stdenv.mkDerivation rec { + pname = "deliantra-arch"; + version = "3.1"; + + src = fetchurl { + url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz"; + sha256 = "1xzhv48g90hwkzgx9nfjm81ivg6hchkik9ldimi8ijb4j393kvsz"; + }; + + installPhase = '' + mkdir -p "$out" + export DELIANTRA_DATADIR="$out" + ${deliantra-server}/bin/cfutil --install-arch . + ''; + + meta = with lib; { + description = "Archetype data for the Deliantra free MMORPG"; + homepage = "http://www.deliantra.net/"; + license = with licenses; [ gpl2Plus agpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/nixpkgs/pkgs/games/deliantra/deliantra-data.nix b/nixpkgs/pkgs/games/deliantra/deliantra-data.nix new file mode 100644 index 000000000000..31ed7d0f0118 --- /dev/null +++ b/nixpkgs/pkgs/games/deliantra/deliantra-data.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchurl, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }: + +symlinkJoin rec { + name = "deliantra-data-${version}"; + version = "M${deliantra-maps.version}+A${deliantra-arch.version}"; + + paths = [ + deliantra-maps + deliantra-arch + "${deliantra-server}/share/deliantra-server" + ]; + + meta = with lib; { + description = "Combined game data (maps + archetypes) for the Deliantra free MMORPG"; + homepage = "http://www.deliantra.net/"; + license = with licenses; [ gpl2Plus agpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + hydraPlatforms = []; + }; +} diff --git a/nixpkgs/pkgs/games/deliantra/deliantra-maps.nix b/nixpkgs/pkgs/games/deliantra/deliantra-maps.nix new file mode 100644 index 000000000000..1f87178102a0 --- /dev/null +++ b/nixpkgs/pkgs/games/deliantra/deliantra-maps.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchurl, deliantra-server }: + +stdenv.mkDerivation rec { + pname = "deliantra-maps"; + version = "3.1"; + + src = fetchurl { + url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz"; + sha256 = "0zbwzya28s1xpnbrmqkqvfrzns03zdjd8a9w9nk665aif6rw2zbz"; + }; + + installPhase = '' + mkdir -p "$out/maps" + export DELIANTRA_DATADIR="$out" + ${deliantra-server}/bin/cfutil --install-maps . + ''; + + meta = with lib; { + description = "Map data for the Deliantra free MMORPG"; + homepage = "http://www.deliantra.net/"; + license = with licenses; [ gpl2Plus agpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/nixpkgs/pkgs/games/deliantra/deliantra-server.nix b/nixpkgs/pkgs/games/deliantra/deliantra-server.nix new file mode 100644 index 000000000000..e333b7a472f5 --- /dev/null +++ b/nixpkgs/pkgs/games/deliantra/deliantra-server.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, fetchurl, perlPackages +, autoconf, perl, gperf, optipng, pngnq, rsync, imagemagick, blitz +, pkg-config, glib, boost, makeWrapper +}: + +let + perl-deps = with perlPackages; [ + AnyEvent AnyEventAIO AnyEventBDB AnyEventIRC + CompressLZF commonsense Coro CoroEV + Deliantra DigestSHA1 EV PodPOM SafeHole URI YAMLLibYAML + ]; +in +stdenv.mkDerivation rec { + pname = "deliantra-server"; + version = "3.1"; + + src = fetchurl { + url = "http://dist.schmorp.de/deliantra/${pname}-${version}.tar.xz"; + sha256 = "0v0m2m9fxq143aknh7jb3qj8bnpjrs3bpbbx07c18516y3izr71d"; + }; + + nativeBuildInputs = [ + autoconf perl gperf optipng pngnq rsync imagemagick + pkg-config makeWrapper + ]; + propagatedBuildInputs = perl-deps; + buildInputs = [ + blitz boost glib + ]; + + hardeningDisable = [ "format" ]; + patches = [ + ./0001-abs.patch + ./0002-datadir.patch + ]; + postFixup = '' + wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB + ''; + + meta = with lib; { + description = "Server for the Deliantra free MMORPG"; + homepage = "http://www.deliantra.net/"; + license = with licenses; [ gpl2Plus agpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/nixpkgs/pkgs/games/eduke32/default.nix b/nixpkgs/pkgs/games/eduke32/default.nix index 8c7a79ff9822..c34922349612 100644 --- a/nixpkgs/pkgs/games/eduke32/default.nix +++ b/nixpkgs/pkgs/games/eduke32/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem , alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL -, SDL2, SDL2_mixer }: +, SDL2, SDL2_mixer +, AGL, Cocoa, GLUT, OpenGL +}: let desktopItem = makeDesktopItem { @@ -16,21 +18,37 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20210722"; - rev = "9484"; - revExtra = "f3fea8c15"; + version = "20210910"; + rev = "9603"; + revExtra = "6c289cce4"; src = fetchurl { - url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "0fdl2i465cl5x7129772ksx97lvim98m9009q5cfmf6scagj9pvz"; + url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; + sha256 = "sha256-/NQMsmT9z2N3KWBrP8hlGngQKJUgSP+vrNoFqJscRCk="; }; - buildInputs = [ alsa-lib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; + buildInputs = [ + flac + libvorbis + libvpx + SDL2 + SDL2_mixer + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + gtk2 + libGL + libGLU + ] ++ lib.optionals stdenv.isDarwin [ + AGL + Cocoa + GLUT + OpenGL + ]; nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; - postPatch = '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace source/build/src/glbuild.cpp \ --replace libGLU.so ${libGLU}/lib/libGLU.so @@ -44,6 +62,9 @@ in stdenv.mkDerivation rec { makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" + ] ++ lib.optionals stdenv.isDarwin [ + # broken, see: https://github.com/NixOS/nixpkgs/issues/19098 + "LTO=0" ]; enableParallelBuilding = true; @@ -52,7 +73,7 @@ in stdenv.mkDerivation rec { runHook preInstall install -Dm755 -t $out/bin eduke32 mapster32 - + '' + lib.optionalString stdenv.isLinux '' makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \ --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ --add-flags '-g "$EDUKE32_DATA_DIR/DUKE3D.GRP"' @@ -60,7 +81,16 @@ in stdenv.mkDerivation rec { cp -rv ${desktopItem}/share $out substituteInPlace $out/share/applications/eduke32.desktop \ --subst-var out + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/EDuke32.app/Contents/MacOS + mkdir -p $out/Applications/Mapster32.app/Contents/MacOS + + cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/ + cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/ + ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32 + ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32 + '' + '' runHook postInstall ''; @@ -68,8 +98,7 @@ in stdenv.mkDerivation rec { description = "Enhanched port of Duke Nukem 3D for various platforms"; homepage = "http://eduke32.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ sander ]; - # Darwin is untested (supported by upstream) + maintainers = with maintainers; [ mikroskeem sander ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/games/fheroes2/default.nix b/nixpkgs/pkgs/games/fheroes2/default.nix index fabfdeea8ce6..799557c4c149 100644 --- a/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/nixpkgs/pkgs/games/fheroes2/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-zm7yR87pJY26USHocT7HnPNQK5xYjFPNo4RT2Lr3C/k="; + sha256 = "sha256-1hnkcsz+uGK3knWEryOvltBTmBm+zl0ym9F1jxSCf2w="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/nixpkgs/pkgs/games/freeciv/default.nix b/nixpkgs/pkgs/games/freeciv/default.nix index 051266fa8007..4b022615e6c0 100644 --- a/nixpkgs/pkgs/games/freeciv/default.nix +++ b/nixpkgs/pkgs/games/freeciv/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3 , zlib, bzip2, curl, xz, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth -, gtkClient ? stdenv.isLinux, gtk3 +, gtkClient ? false, gtk3, wrapGAppsHook , qtClient ? false, qt5 , server ? true, readline , enableSqlite ? true, sqlite @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optional qtClient [ qt5.wrapQtAppsHook ]; + ++ lib.optional qtClient [ qt5.wrapQtAppsHook ] + ++ lib.optional gtkClient [ wrapGAppsHook ]; buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv ] ++ lib.optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableSqlite sqlite; dontWrapQtApps = true; + dontWrapGApps = true; configureFlags = [ "--enable-shared" ] ++ lib.optional sdlClient "--enable-client=sdl" @@ -47,6 +49,12 @@ stdenv.mkDerivation rec { ++ lib.optional (!gtkClient) "--enable-fcmp=cli" ++ lib.optional (!server) "--disable-server"; + postFixup = lib.optionalString qtClient '' + wrapQtApp $out/bin/freeciv-qt + '' + lib.optionalString gtkClient '' + wrapGApp $out/bin/freeciv-gtk3.22 + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/games/legendary-gl/default.nix b/nixpkgs/pkgs/games/legendary-gl/default.nix index eb2f3f38cea4..f09503ea8b9d 100644 --- a/nixpkgs/pkgs/games/legendary-gl/default.nix +++ b/nixpkgs/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.6"; + version = "0.20.10"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = version; - sha256 = "1v6jbnasz2ilcafs6qyl6na4a8cxy2lgwr0hqsja6d846rfqa8ad"; + sha256 = "sha256-/OttNHwS08gHx/ZpOuB6yxfK2cX3BbMeQLZC7iXKKrk="; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/games/lgogdownloader/default.nix b/nixpkgs/pkgs/games/lgogdownloader/default.nix index d92484cfef27..93f17dbb8135 100644 --- a/nixpkgs/pkgs/games/lgogdownloader/default.nix +++ b/nixpkgs/pkgs/games/lgogdownloader/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , pkg-config @@ -23,14 +24,37 @@ stdenv.mkDerivation rec { sha256 = "sha256-LywFJCZevlhthOkAZo7JkXcPT9V6Zh28VD/MVQnMQjo="; }; - nativeBuildInputs = [ cmake pkg-config help2man ]; + nativeBuildInputs = [ + cmake + pkg-config + help2man + ]; - buildInputs = [ boost curl htmlcxx jsoncpp liboauth rhash tinyxml-2 ]; + buildInputs = [ + boost + curl + htmlcxx + jsoncpp + liboauth + rhash + tinyxml-2 + ]; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "LGOGDownloader ${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; meta = with lib; { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; homepage = "https://github.com/Sude-/lgogdownloader"; license = licenses.wtfpl; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/games/mudlet/default.nix b/nixpkgs/pkgs/games/mudlet/default.nix index 139baece4a6f..9d8898b119e1 100644 --- a/nixpkgs/pkgs/games/mudlet/default.nix +++ b/nixpkgs/pkgs/games/mudlet/default.nix @@ -2,7 +2,9 @@ , boost, libGLU, lua, cmake, which, pkg-config, }: let - luaEnv = lua.withPackages(ps: with ps; [ luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 ]); + luaEnv = lua.withPackages(ps: with ps; [ + luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 + ]); in stdenv.mkDerivation rec { pname = "mudlet"; @@ -39,8 +41,6 @@ stdenv.mkDerivation rec { cp -r ../mudlet.png $out/share/pixmaps/ makeQtWrapper $out/mudlet $out/bin/mudlet \ - --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH : "$NIX_LUA_PATH" \ --prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \ --run "cd $out"; ''; diff --git a/nixpkgs/pkgs/games/quakespasm/default.nix b/nixpkgs/pkgs/games/quakespasm/default.nix index 87ecd4601339..7dda3b40ae3a 100644 --- a/nixpkgs/pkgs/games/quakespasm/default.nix +++ b/nixpkgs/pkgs/games/quakespasm/default.nix @@ -1,27 +1,72 @@ -{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad, copyDesktopItems, makeDesktopItem }: +{ lib, stdenv, SDL, SDL2, fetchurl, gzip, libvorbis, libmad +, Cocoa, CoreAudio, CoreFoundation, IOKit, OpenGL +, copyDesktopItems, makeDesktopItem +, useSDL2 ? stdenv.isDarwin # TODO: CoreAudio fails to initialize with SDL 1.x for some reason. +}: stdenv.mkDerivation rec { pname = "quakespasm"; - majorVersion = "0.93"; - version = "${majorVersion}.2"; + version = "0.94.1"; src = fetchurl { - url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tgz"; - sha256 = "0qm0j5drybvvq8xadfyppkpk3rxqsxbywzm6iwsjwdf0iia3gss5"; + url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz"; + sha256 = "19grpvsk3ikjypx9j0gpfsx5wanrqxkgf8dwl9h6ab5c8wwmjcjp"; }; sourceRoot = "${pname}-${version}/Quake"; + patches = lib.optionals stdenv.isDarwin [ + # Makes Darwin Makefile use system libraries instead of ones from app bundle + ./quakespasm-darwin-makefile-improvements.patch + ]; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ - gzip SDL libvorbis libmad + gzip libvorbis libmad (if useSDL2 then SDL2 else SDL) + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa CoreAudio IOKit OpenGL + ] ++ lib.optionals (stdenv.isDarwin && useSDL2) [ + CoreFoundation + ]; + + buildFlags = [ + "DO_USERDIRS=1" + # Makefile defaults, set here to enforce consistency on Darwin build + "USE_CODEC_WAVE=1" + "USE_CODEC_MP3=1" + "USE_CODEC_VORBIS=1" + "USE_CODEC_FLAC=0" + "USE_CODEC_OPUS=0" + "USE_CODEC_MIKMOD=0" + "USE_CODEC_UMX=0" + "MP3LIB=mad" + "VORBISLIB=vorbis" + ] ++ lib.optionals useSDL2 [ + "SDL_CONFIG=sdl2-config" + "USE_SDL2=1" ]; - buildFlags = [ "DO_USERDIRS=1" ]; + makefile = if (stdenv.isDarwin) then "Makefile.darwin" else "Makefile"; preInstall = '' mkdir -p "$out/bin" substituteInPlace Makefile --replace "/usr/local/games" "$out/bin" + substituteInPlace Makefile.darwin --replace "/usr/local/games" "$out/bin" + ''; + + postInstall = lib.optionalString stdenv.isDarwin '' + # Let's build app bundle + mkdir -p $out/Applications/Quake.app/Contents/MacOS + mkdir -p $out/Applications/Quake.app/Contents/Resources + cp ../MacOSX/Info.plist $out/Applications/Quake.app/Contents/ + cp ../MacOSX/QuakeSpasm.icns $out/Applications/Quake.app/Contents/Resources/ + cp -r ../MacOSX/English.lproj $out/Applications/Quake.app/Contents/Resources/ + ln -sf $out/bin/quake $out/Applications/Quake.app/Contents/MacOS/quake + + substituteInPlace $out/Applications/Quake.app/Contents/Info.plist \ + --replace '>''${EXECUTABLE_NAME}' '>quake' + substituteInPlace $out/Applications/Quake.app/Contents/Info.plist \ + --replace '>''${PRODUCT_NAME}' '>QuakeSpasm' ''; enableParallelBuilding = true; @@ -47,7 +92,7 @@ stdenv.mkDerivation rec { and smoother mouse input - though no CD support. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ m3tti ]; + platforms = platforms.unix; + maintainers = with maintainers; [ mikroskeem m3tti ]; }; } diff --git a/nixpkgs/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch b/nixpkgs/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch new file mode 100644 index 000000000000..0f8af7550ea4 --- /dev/null +++ b/nixpkgs/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch @@ -0,0 +1,92 @@ +--- a/Makefile.darwin 2021-09-12 14:42:51.000000000 +0300 ++++ b/Makefile.darwin 2021-09-12 15:09:16.000000000 +0300 +@@ -49,6 +49,7 @@ + LIPO ?= lipo + + STRIP ?= strip ++PKG_CONFIG ?= pkg-config + + CPUFLAGS= + LDFLAGS = +@@ -84,9 +85,6 @@ + USE_RPATH=1 + endif + CFLAGS += $(CPUFLAGS) +-ifeq ($(USE_RPATH),1) +-LDFLAGS+=-Wl,-rpath,@executable_path/../Frameworks +-endif + + ifneq ($(DEBUG),0) + DFLAGS += -DDEBUG +@@ -115,19 +113,14 @@ + # not relying on sdl-config command and assuming + # /Library/Frameworks/SDL.framework is available + SDL_CFLAGS =-D_GNU_SOURCE=1 -D_THREAD_SAFE +-SDL_CFLAGS+=-DSDL_FRAMEWORK -DNO_SDL_CONFIG + ifeq ($(USE_SDL2),1) +-SDL_FRAMEWORK_NAME = SDL2 ++SDL_CONFIG ?= sdl2-config + else +-SDL_FRAMEWORK_NAME = SDL +-endif +-# default to our local SDL[2].framework for build +-SDL_FRAMEWORK_PATH ?=../MacOSX +-ifneq ($(SDL_FRAMEWORK_PATH),) +-SDL_LIBS +=-F$(SDL_FRAMEWORK_PATH) +-SDL_CFLAGS+=-F$(SDL_FRAMEWORK_PATH) ++SDL_CONFIG ?= sdl2-config + endif +-SDL_LIBS +=-Wl,-framework,$(SDL_FRAMEWORK_NAME) -Wl,-framework,Cocoa ++SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) ++SDL_LIBS := $(shell $(SDL_CONFIG) --libs) ++SDL_LIBS += -Wl,-framework,Cocoa + + NET_LIBS := + +@@ -164,38 +157,26 @@ + endif + ifeq ($(USE_CODEC_FLAC),1) + CFLAGS+= -DUSE_CODEC_FLAC +-CODEC_INC = -I../MacOSX/codecs/include +-CODEC_LINK= -L../MacOSX/codecs/lib + CODECLIBS+= -lFLAC + endif + ifeq ($(USE_CODEC_OPUS),1) +-CFLAGS+= -DUSE_CODEC_OPUS +-CODEC_INC = -I../MacOSX/codecs/include +-CODEC_LINK= -L../MacOSX/codecs/lib +-CODECLIBS+= -lopusfile -lopus -logg ++CFLAGS+= -DUSE_CODEC_OPUS $(shell $(PKG_CONFIG) --cflags opusfile) ++CODECLIBS+= $(shell $(PKG_CONFIG) --libs opusfile) + endif + ifeq ($(USE_CODEC_VORBIS),1) + CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec) +-CODEC_INC = -I../MacOSX/codecs/include +-CODEC_LINK= -L../MacOSX/codecs/lib + CODECLIBS+= $(lib_vorbisdec) + endif + ifeq ($(USE_CODEC_MP3),1) + CFLAGS+= -DUSE_CODEC_MP3 +-CODEC_INC = -I../MacOSX/codecs/include +-CODEC_LINK= -L../MacOSX/codecs/lib + CODECLIBS+= $(lib_mp3dec) + endif + ifeq ($(USE_CODEC_MIKMOD),1) + CFLAGS+= -DUSE_CODEC_MIKMOD +-CODEC_INC = -I../MacOSX/codecs/include +-CODEC_LINK= -L../MacOSX/codecs/lib + CODECLIBS+= -lmikmod + endif + ifeq ($(USE_CODEC_XMP),1) + CFLAGS+= -DUSE_CODEC_XMP +-CODEC_INC = -I../MacOSX/codecs/include +-CODEC_LINK= -L../MacOSX/codecs/lib + CODECLIBS+= -lxmp + endif + ifeq ($(USE_CODEC_UMX),1) +@@ -332,3 +313,5 @@ + clean: + rm -f $(shell find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name '*.res' -o -name $(DEFAULT_TARGET) \) -print) + ++install: quakespasm ++ install -D -m 755 quakespasm /usr/local/games/quake diff --git a/nixpkgs/pkgs/games/sdlpop/default.nix b/nixpkgs/pkgs/games/sdlpop/default.nix index cef321fdce4e..f9b91e3dc158 100644 --- a/nixpkgs/pkgs/games/sdlpop/default.nix +++ b/nixpkgs/pkgs/games/sdlpop/default.nix @@ -8,22 +8,25 @@ stdenv.mkDerivation rec { pname = "sdlpop"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "NagyD"; repo = "SDLPoP"; rev = "v${version}"; - sha256 = "1q4mnyg8v4420f1bp24v8lgi335vijdv61yi3fan14jgfzl38l7w"; + sha256 = "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"; }; nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; + buildInputs = [ SDL2 SDL2_image ]; makeFlags = [ "-C" "src" ]; preBuild = '' - substituteInPlace src/Makefile --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}gcc" + substituteInPlace src/Makefile \ + --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ + --replace "CFLAGS += -I/opt/local/include" "CFLAGS += -I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2" ''; # The prince binary expects two things of the working directory it is called from: @@ -63,6 +66,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ iblech ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/games/steam/fhsenv.nix b/nixpkgs/pkgs/games/steam/fhsenv.nix index b2c303caa54f..63da5d7a2b78 100644 --- a/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -100,6 +100,11 @@ in buildFHSUserEnv rec { libva pipewire.lib + # steamwebhelper + harfbuzz + libthai + pango + # Not formally in runtime but needed by some games at-spi2-atk at-spi2-core # CrossCode @@ -114,7 +119,7 @@ in buildFHSUserEnv rec { xorg.libpciaccess udev # shadow of the tomb raider - ## screeps dependencies + # screeps dependencies gtk3 dbus zlib @@ -123,7 +128,6 @@ in buildFHSUserEnv rec { cairo freetype gdk-pixbuf - pango fontconfig # friends options won't display "Launch Game" without it @@ -188,7 +192,6 @@ in buildFHSUserEnv rec { nss fontconfig cairo - pango expat dbus cups diff --git a/nixpkgs/pkgs/games/tome4/default.nix b/nixpkgs/pkgs/games/tome4/default.nix index ace9b384663e..581220c339c4 100644 --- a/nixpkgs/pkgs/games/tome4/default.nix +++ b/nixpkgs/pkgs/games/tome4/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "tome4"; - version = "1.6.7"; + version = "1.7.4"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68"; + sha256 = "sha256-w1NPM/SMnPAnAl6z9E6Xsj3mEqZtXzFe1IMPmlKr8qQ="; }; desktop = makeDesktopItem { diff --git a/nixpkgs/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix b/nixpkgs/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix new file mode 100644 index 000000000000..0ecbbd8b55e5 --- /dev/null +++ b/nixpkgs/pkgs/misc/cups/drivers/brother/dcp9020cdw/default.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchurl +, cups +, dpkg +, gnused +, makeWrapper +, ghostscript +, file +, a2ps +, coreutils +, gnugrep +, which +, gawk +}: + +let + version = "1.1.2"; + model = "dcp9020cdw"; +in +rec { + driver = stdenv.mkDerivation { + pname = "${model}-lpr"; + inherit version; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf100441/dcp9020cdwlpr-${version}-1.i386.deb"; + sha256 = "1z6nma489s0a0b0a8wyg38yxanz4k99dg29fyjs4jlprsvmwk56y"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + buildInputs = [ cups ghostscript a2ps gawk ]; + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + substituteInPlace $out/opt/brother/Printers/${model}/lpd/filter${model} \ + --replace /opt "$out/opt" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/${model}/lpd/br${model}filter + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/${model}/lpd/filter${model} $out/lib/cups/filter/brother_lpdwrapper_${model} + + wrapProgram $out/opt/brother/Printers/${model}/lpd/filter${model} \ + --prefix PATH ":" ${lib.makeBinPath [ + gawk + ghostscript + a2ps + file + gnused + gnugrep + coreutils + which + ]} + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother ${model} printer driver"; + license = licenses.unfree; + platforms = platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_eu&os=128"; + maintainers = with maintainers; [ pshirshov ]; + }; + }; + + cupswrapper = stdenv.mkDerivation { + pname = "${model}-cupswrapper"; + inherit version; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf100443/dcp9020cdwcupswrapper-${version}-1.i386.deb"; + sha256 = "04yqm1qv9p4hgp1p6mqq4siygl4056s6flv6kqln8mvmcr8zaq1s"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + buildInputs = [ cups ghostscript a2ps gawk ]; + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + for f in $out/opt/brother/Printers/${model}/cupswrapper/cupswrapper${model}; do + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep gnused ]} + done + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/${model}/cupswrapper/brother_${model}_printer_en.ppd $out/share/cups/model/ + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother ${model} printer CUPS wrapper driver"; + license = licenses.unfree; + platforms = platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_eu&os=128"; + maintainers = with maintainers; [ pshirshov ]; + }; + }; +} diff --git a/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index ff5fb6e5ee76..ab6817a99453 100644 --- a/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -1,19 +1,20 @@ { lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook +, pytestCheckHook , gtk3, gobject-introspection, libappindicator-gtk3, librsvg -, evdev, pygobject3, pylibacl, pytest, bluez +, evdev, pygobject3, pylibacl, bluez, vdf , linuxHeaders , libX11, libXext, libXfixes, libusb1, udev }: buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.7"; + version = "0.4.8.6"; src = fetchFromGitHub { - owner = "kozec"; + owner = "Ryochan7"; repo = pname; rev = "v${version}"; - sha256 = "1dskjh5qcjf4x21n4nk1zvdfivbgimsrc2lq1id85bibzps29499"; + sha256 = "1fgizgzm79zl9r2kkwvh1gf9lnxaix15283xxk6bz843inr8b88k"; }; # see https://github.com/NixOS/nixpkgs/issues/56943 @@ -23,9 +24,9 @@ buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ]; - propagatedBuildInputs = [ evdev pygobject3 pylibacl ]; + propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace scc/paths.py --replace sys.prefix "'$out'" @@ -48,12 +49,8 @@ buildPythonApplication rec { ) ''; - checkPhase = '' - PYTHONPATH=. py.test - ''; - meta = with lib; { - homepage = "https://github.com/kozec/sc-controller"; + homepage = "https://github.com/Ryochan7/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 212a3222b7c6..618fb3beeeb4 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.16"; + version = "6.17"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-aVCSBQ2YoSnE1/MVPLDkkjJIuuXz2SBjn6SrGnP4+ug="; + sha256 = "sha256-nbHyQ12AJiw3dzF98HWFWu6j5qUst3xjDsGysfuUjwg="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-TvTx3vSOyudyC7aravQGcj5KGqI8uHkgHroIJww5buQ="; + sha256 = "sha256-rR5m6D8M3vTXXIHzsF8+o2G5rlRS2HLfCHoatbJwlrQ="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -75,8 +75,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20210206"; - sha256 = "sha256-tnwownY9A05nYlkYaoCQZjeGGHuE+kJYzA7MPE2bXnQ="; + version = "20210825"; + sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/nixpkgs/pkgs/misc/gnuk/generic.nix b/nixpkgs/pkgs/misc/gnuk/generic.nix index b614dd52a378..8d32e9f66d10 100644 --- a/nixpkgs/pkgs/misc/gnuk/generic.nix +++ b/nixpkgs/pkgs/misc/gnuk/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper -, python2Packages +, python3Packages # Extra options , device ? "fsij", vid ? "234b", pid ? "0000" @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit src; nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ]; - buildInputs = with python2Packages; [ python pyusb colorama ]; + buildInputs = with python3Packages; [ python pyusb colorama ]; configurePhase = '' cd src @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://www.fsij.org/pages/gnuk"; + homepage = "https://www.fsij.org/doc-gnuk/"; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix b/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix index 0ab939af0f78..9098ed2ac573 100644 --- a/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { single-node-smoke-test = nixosTests.jitsi-meet; }; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Prosody configuration for Jitsi Meet"; longDescription = '' diff --git a/nixpkgs/pkgs/misc/jitsi-meet-prosody/update.sh b/nixpkgs/pkgs/misc/jitsi-meet-prosody/update.sh new file mode 100755 index 000000000000..bc039d1ba8e8 --- /dev/null +++ b/nixpkgs/pkgs/misc/jitsi-meet-prosody/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl https://download.jitsi.org/stable/ | \ + pup 'a[href] text{}' | \ + awk -F'[_-]' '/jitsi-meet-prosody/ {printf $4"\n"}' | \ + sort -u | \ + tail -n 1)" + +update-source-version jitsi-meet-prosody "$version" diff --git a/nixpkgs/pkgs/misc/scrcpy/default.nix b/nixpkgs/pkgs/misc/scrcpy/default.nix index 00b143b1b585..755d778e545e 100644 --- a/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.18"; + version = "1.19"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "18si7k9hyqa77yy9w747kl2x2pivyigny49dwzx9sfd9xmmmq734"; + sha256 = "sha256-h2+TIhguaqxqWNsTNPQiWFXvOhfq68gKq2YB2dHsuGc="; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "019948v63qhmp742hmar7a98ss673m0wdycpphjhfl1kg4iihiya"; + sha256 = "sha256-IR4FTbVtHp9rRm0U4d1zkl0u+oR5FeElJ91NIspSKWg="; }; # postPatch: @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Genymobile/scrcpy"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ deltaevo lukeadams ]; + maintainers = with maintainers; [ deltaevo lukeadams msfjarvis ]; }; } diff --git a/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix b/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix new file mode 100644 index 000000000000..5e55f13c2b43 --- /dev/null +++ b/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix @@ -0,0 +1,33 @@ +{ rustPlatform, fetchFromGitHub, lib }: + +rustPlatform.buildRustPackage rec { + pname = "pipes-rs"; + version = "1.4.4"; + + src = fetchFromGitHub { + owner = "lhvy"; + repo = pname; + rev = "v${version}"; + sha256 = "drqoKkju1EkcWGNnliEah37wVhtU2ddJSOZ5MnCNbuo="; + }; + + cargoSha256 = "0j6b5697ichw4ly7lsj3nbm0mw6bvjma81nd0fl7v1ra9kbmsysk"; + + doInstallCheck = true; + + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${pname} ${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + + meta = with lib; { + description = "An over-engineered rewrite of pipes.sh in Rust"; + homepage = "https://github.com/lhvy/pipes-rs"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.vanilla ]; + }; +} diff --git a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 680f9c0a5bcb..7a1de8731d03 100644 --- a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.66"; + version = "5.67"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E="; + sha256 = "sha256-qGB+Fw4N9K+PcH07OPfOsNDhKHc9fhdeICCSaV9/I0w="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix index a3a09a93ac9c..b6c75e03654d 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -19,7 +19,7 @@ rec { buildPhase ? "", preInstall ? "", postInstall ? "", - path ? lib.getName name, + path ? ".", addonInfo ? null, ... }: diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 1674087457e0..5c71669fc765 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2021-07-17"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e641878818c5545afd09b093a368f2d03f169273"; - sha256 = "1zykpbd42nwvpkgbq0hh52micyybxyvia6558fp6nlcs56bdmqf4"; + rev = "0fb731c66abbacf5cdf19ccbdf326e50e0111498"; + sha256 = "0m2dwcl9nc9kv2dmyazz9xrv19dzkdwkvkdyh2naycpbr1sj2w0b"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "b9fdb91e9294b091a56a9da0b8ae705490cd95c6"; - sha256 = "1l928wv1rk1hmmna7rnd4xl5vfxxq8f7p5jjz1cph2gbyalsivh0"; + rev = "35d0bd15194b95f0dc8483ee6e727fcf3d4c8b26"; + sha256 = "1ra8ns6n7xfjk032gw9yd8kvmm9ylwp06d04raz19nhalxi7ra9y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-08-31"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "8ffff055e3b68df809fa8a7f9fc9fceed57e7be9"; - sha256 = "1vdhyn39fn6b7a008w5hsv9ygqcxzcmca9mvbvpaga42bnw2hxc4"; + rev = "3909c7805ee3c140c6bbc16ec001046a07eada15"; + sha256 = "03ay788vacs65cylp0ly7clpzhrx8vzc7zn94mk15hr9843s1kkd"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -365,12 +365,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "d8293811dd8f30e3e88f83c0a46573fddcf46cdb"; - sha256 = "181dbbkqnpqyjsc8v7h7sfv5r1qnkc00n5s7qv9321l0zrlhhfgb"; + rev = "6cf11ded5c8e6e3ea997b64a78be241e2d6c0614"; + sha256 = "1ah9snm88970cyy9f23r9pdjlmzy4y39s4wlx7zwxh6wrfdfnzr1"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "6f443966b9b0da18632dd872aeeffaaf4b254da7"; - sha256 = "1nvlxx4264xyggpv7xz2nzd0fpnw7bmax3r2pya2km9vk67lkjmw"; + rev = "d578a9e0e95e67d01cd847bbd4caab62294ed241"; + sha256 = "1gjmind3dfl41mdjpp7z5zx5l41qv55ckq97zid639lhggi19hbv"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -605,12 +605,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-08-25"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "48df45154ee644edf1b955d325be60928dd28d47"; - sha256 = "0c8y3i0p2li0r0jqg4ngw2cfh9jy21832nl9x45yfbwmh6gfw8qd"; + rev = "8450341c7e50cc8ae0faee1fafe60b3f516cea79"; + sha256 = "0f8apk6138d9kzcggmbxhrsckv73ld8kdgmw6hcj0ld80a1s683n"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -713,12 +713,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2021-08-23"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "595e60210f7d0c9e5a21672428bae8c3f518a3b9"; - sha256 = "0mdqb07avwk2f5h5xylq2lkg56jk82dccyrxb17cxfw2dsgbs93m"; + rev = "287c743c9f227fdf0e1db452bbb8ae3c5caffc36"; + sha256 = "18qj2zi9p4zz8252m3kcbi6yx7v27sckr0b1bfymckijws9lrlf5"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -822,12 +822,12 @@ final: prev: compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-08-11"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "4e3dc7b9950e0e5dbfb9451622de670cf62875ac"; - sha256 = "0nb0jsr65q4497mbikc9fm2vkf2dq64ahxf60lv4rzm2irr3azdj"; + rev = "b00e1f9d597673bfcba39b6bfc620cea9e6c815a"; + sha256 = "0ryj8b60vvxb1q58xyv4hgrc1d7rjsbr21wn677xr13836knb5bw"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -1000,6 +1000,18 @@ final: prev: meta.homepage = "https://github.com/nixprime/cpsm/"; }; + crates-nvim = buildVimPluginFrom2Nix { + pname = "crates.nvim"; + version = "2021-09-06"; + src = fetchFromGitHub { + owner = "saecki"; + repo = "crates.nvim"; + rev = "736033d59b2940e35565ae37c3fd5cb024c2a134"; + sha256 = "09v5frr2mlqgvdw1kswv0r683xvg0j3k4wm3h00m0r929prqd6ll"; + }; + meta.homepage = "https://github.com/saecki/crates.nvim/"; + }; + csapprox = buildVimPluginFrom2Nix { pname = "csapprox"; version = "2013-07-27"; @@ -1316,12 +1328,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-06-16"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "1a9476dd83d986c861233c380ac07e1e2f2d10af"; - sha256 = "0xv34cg0lkcjhylsc5qc2pkd4np5mmf5gbx55hvryjnipk1sa06y"; + rev = "a716897b958d1f1c0809d92a70e8d849a3d652e2"; + sha256 = "1zbh595vq0y8liipncpcc3rwh5dpfifbp623z2w5fx3jpic538xw"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1460,12 +1472,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "7c392177dc40b333dcee939fded1c5b2f3466def"; - sha256 = "07zxdwh6c5qkazg9vm9rr7xw1n5c1i3nxsfbifvnl2qgvkb5wyxc"; + rev = "5965e8303be4bc50d26733a02e5c11100f98986c"; + sha256 = "12pxdha0zk8lwvgvqp02fwkvh5yvpzxf75865h5rxz69v1dqgspf"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1484,12 +1496,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2021-08-12"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "78502433a41589ead80c834f9e61d7a17f97b844"; - sha256 = "1gfxq9sfld0vx320q15r8xk6kwxxbl7jla3ykr6wd167bnr1z7q0"; + rev = "a60ba5554efbab56112a06d9a1f09271fe23e96b"; + sha256 = "02idfg57j01y6d8zr2wddj7f79bk8cnqmb88h9s1b25zlf7yazmq"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1508,12 +1520,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-08-22"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d1ff992bf605c098577b7f0e632e3ea887b71520"; - sha256 = "04zmqz270willnpfsf61pa9xx5i5phx1g6r6nw317r9rs0dnk0wj"; + rev = "d1864ac0734ce51150affa96a35a1e01ade08b79"; + sha256 = "1jyhkj22ivav6kp7rh3fkjka8w5phvsa4r82s9b6lv39vr10nj4w"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1690,12 +1702,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "0961775c8dd84fafcd7a9d92e8a95657385ff847"; - sha256 = "0bpyqg344cldx1587bpy5zay2y986b34s1zyjy2nasri95jzkvwp"; + rev = "092442db0c7eb6087f0ae2cbeb776781bcc16176"; + sha256 = "0ac4r3qv5d91srxra71paa03h0wnw6hrfpwr0v9lsk58bv0fxbc2"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1835,12 +1847,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-29"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "53c823f92f159107efa238ad1a5837f63ecb4c2b"; - sha256 = "0sb8l0f7wzbhyr0aq5kjmn4c4llhi49ka9brhwkn24rhkizyyl51"; + rev = "1fc5567b29bc9c2588eb0584a001a2dfb706030b"; + sha256 = "0q8dhnz3ykx3gk7myprkfa6vnvv8xjpj86faadfc6c01l1299f15"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1859,12 +1871,12 @@ final: prev: fugitive-gitlab-vim = buildVimPluginFrom2Nix { pname = "fugitive-gitlab.vim"; - version = "2021-09-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "ad4e00264c25bcb7dc6f400b2a409d2fce194907"; - sha256 = "0vqm6nv7nr8mis1nljxiqx4g5w3wp0g2pcc4ly9x7jidicgm7awi"; + rev = "befd5438ad55a80c6abb415f6c5a9a44275550bc"; + sha256 = "1m57c11b7q1sv6va0xzikha19bck6rgr539sjhnhppdy7nlk55lw"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; @@ -2051,12 +2063,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-08-29"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3"; - sha256 = "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p"; + rev = "f2437cd95a9320c1021edd5fc5ac2e1f9e47fef3"; + sha256 = "1xyxi1cyqd0464q60kb2bpxd5vapkmq5a3g3qzvl4klr6syvrkgd"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2087,12 +2099,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2021-08-30"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "794649fa93a49f39e16364da5421508fe0223e4f"; - sha256 = "06askhkw5g07144a60g59jxrp2xvimpk3yw9qhm69lllhvkgihqz"; + rev = "ae61bac7a4ec720b247d016473d6214d0e8aa0cc"; + sha256 = "0ykydvv4pd6annkm41lv8c22pnwfai5m65v412l8dbgnll43vviz"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2123,12 +2135,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-08-20"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "017efbcb377a6c0e16c4902328cf34d7257cbd1c"; - sha256 = "11n09m7agy9b5zx0cralam7gsr2bfwpf4564z2iwxgia3186bs8g"; + rev = "8093ded366e2e71e87f5e40da29994187c06fce1"; + sha256 = "0mm7vrmibcdsxn9b89q7skc0xcm9z5fi1bv0gg3cc8kb1gislnwf"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2171,12 +2183,12 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat.nvim"; - version = "2021-08-17"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "9f02570bf323e9484b6f04ad96adc3103a075662"; - sha256 = "1dw4mm1ksclhx7ys88z2g0481j9xxd95qi1jlma8l5cyjfzdkrkz"; + rev = "c384a5719b1ef9f5be925a94491d10c35eaf09a5"; + sha256 = "03dlkhc2n2brq1m49ji4y205sha7gywd81x014dsma81w7fhvdvk"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; @@ -2303,12 +2315,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-07-13"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "9c849dac4b8efe6ad30aabec995dabfb5b251046"; - sha256 = "0z0ddrqhpirjdck9j0dmaxx0ra5hlcll0iawqb0078xg181bhnwh"; + rev = "a3f11483e1ffd5946914db505c7b917bb6c95515"; + sha256 = "0asabmaacvfyv48rwzgcy4vy5wrp72rjmgn53ann9asfxw9ipjsh"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2411,12 +2423,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "f26818bbb0a5428b4699f6c49fc3d3fa3e822930"; - sha256 = "1yksfc2sbkn7p7wiai2d7rjnizylckvb1fck5k7kjwbxnwzwsjk5"; + rev = "c4317837801c72686a342a9db4d4f7405857c82d"; + sha256 = "0sb49f6yba94zyvqqggiz7lwm31ch94rwz09p5jh4iys49kb4s4s"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2832,12 +2844,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "c918dd441b2e24ed4f6f805df89efc8e99015103"; - sha256 = "0ppkspsqbi05rnssk19ccjcym4zaqph7a75vw9d38akg2i176rsk"; + rev = "5a856fdaf6298be5124e26bccaba68578b625b90"; + sha256 = "1x4h2dkyf6q434j75xzw0f7xm4633zm8fjm2sgrskvx1r4hbf480"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2904,36 +2916,36 @@ final: prev: lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status.nvim"; - version = "2021-09-01"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "745ba61c353b47c365d4dbfdd3d3334a3177f8cd"; - sha256 = "06cgvrl6l1wj6aj0ndbxi14zfqdfhgdzd7h72dxi1bkx8hrf54i0"; + rev = "a5990bfde2fb67c55575ece39b1c863d107acb60"; + sha256 = "10swm4zwdkgvn8pdqif1ai8kqshzm6bzw9k9jykpb8dxy2anj27y"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions.nvim"; - version = "2021-06-25"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp_extensions.nvim"; - rev = "a1f12b8df1d3d8e46a7010615d2a335cd06814f2"; - sha256 = "11aynapcxxm4xjicixj0g93y7qqlhby8zvmc856gq0b14k5n291q"; + rev = "379a935b797f5f8a386bcbfd3b105da8007a9303"; + sha256 = "05q9i93xvp5p770fpg8wkyngq8ncr6b21fdkh9crcgfi1bp7rhqr"; }; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "ef533cc43fa11f58597364c24f8898b7deac74ef"; - sha256 = "0g6m18w1jggg182dm77n3zvrj87d230c6m7rrg6snialllvbk0sh"; + rev = "d7e5a2f5192dd09b30ccec7ad0de0323c8687e34"; + sha256 = "01v9crqps9d4wngjfnk535vqgyqqfgrfjyg3aydaa46lyj1ilcvr"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2988,24 +3000,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1db821efe7416483a7288ef86dbae6f63ab0221e"; - sha256 = "0gjyhb7yqjgb2ld9g3aahn0hv6vns91c5q3hvjcwaxqvkc77sk2i"; + rev = "9748870f69236db39cc8eeb668d944bbe496634e"; + sha256 = "1fzqfl5isq31iqrl8m52ca8rrpn3rxh6xzwyr4czsx8fggi221dd"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2021-08-30"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "58c203fe01d4c9622a51f57270c0c58b0516adff"; - sha256 = "18qk4yn8fazwxjxdlj50jl159iyh586bbvlgv3944wfnjgij727a"; + rev = "63e11d96191b66a5d7c288bad08187aebbfca97b"; + sha256 = "1g2d0c4asdc8ad0009habivppahy925sfs9zz61l22yfgwp9wvdr"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3060,12 +3072,12 @@ final: prev: mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2021-08-29"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "24394ce720fcee4a672249fcdde4b088d62ed4b1"; - sha256 = "0smmwgdnby0n0hg4511wf63vbm387l4d3dw75sid3m9cm8xlpwgl"; + rev = "4cdf69c43d66500b1c1235f3c1c584f257115cb9"; + sha256 = "06phscsjqb3wnwdmb5w8rirj02fcz9svp5wdnzv9jkvj822ni4pr"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -3094,6 +3106,18 @@ final: prev: meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; + minsnip-nvim = buildVimPluginFrom2Nix { + pname = "minsnip.nvim"; + version = "2021-09-06"; + src = fetchFromGitHub { + owner = "jose-elias-alvarez"; + repo = "minsnip.nvim"; + rev = "0bcc73cb716b07d4286ef714f5a07d94204d484c"; + sha256 = "0k6dmqmw52scvwfr5w8dg7388cy95vdvgfw3f4prwyls60i9x55w"; + }; + meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; + }; + mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; version = "2021-07-05"; @@ -3432,12 +3456,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2021-06-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "3663e065b4f3d0c4a1144b668129ef43e0d8ff10"; - sha256 = "0l87p48lyx78a9ayqygpba76z04ld64w747m0mrdlgci0x8jnqb7"; + rev = "053d6bd3605a64f05de11a179cbab423fe759ebe"; + sha256 = "0qk3bhpjqi06jj1haydalvvsj7f7jbxbb168jc6i949694v406zj"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -3468,14 +3492,14 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-08-26"; + version = "2021-09-05"; src = fetchFromGitHub { - owner = "vhyrro"; + owner = "nvim-neorg"; repo = "neorg"; - rev = "45ded3cbd52da312b71bffd8b8a6b9bed1367500"; - sha256 = "1792j7h2an4kfc9jp6p8fa7mwri7295rb30siar35c0diapzai32"; + rev = "47a0a3d91ddde94488ccd03d38b5beeb296d3148"; + sha256 = "0n8scyjy3wx2l3anl3dyipx7rlayrjb5dlri2r81dr1s77vkch83"; }; - meta.homepage = "https://github.com/vhyrro/neorg/"; + meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { @@ -3600,12 +3624,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-08-12"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "0e71462f90fb4bd09121eeba829512cc24ab5c97"; - sha256 = "0q88xrd0zi0wm7rdpggq9gfrlki56w14qr4bg5x1im3p4y6nj7f3"; + rev = "e5f24e2b8bc09ce6fc3488215d69ddb7cadc5f8d"; + sha256 = "13hbf5c67hi103yixc1jhp8gky02gy2hfq2im4sq7y1wwhgfxn0l"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3732,12 +3756,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "3b298c243eecec533de5869eff44d87cbc41b662"; - sha256 = "1vdzswx6nz1cw7d0328rx7xrlz2i64ynkw8ad5hxrfdmb589rjkd"; + rev = "f9f4c8cd1a2af30bed35296a50eca8957fa99e3b"; + sha256 = "0yi1nhh0xh6fhqd52f6wsysylm3ls9xh7dy03990lmcv64wajx9j"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3768,24 +3792,24 @@ final: prev: nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; - version = "2021-03-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "nathanmsmith"; repo = "nvim-ale-diagnostic"; - rev = "894a6790637fdda0df1a2ee1de3f58cd8c276e10"; - sha256 = "07jfmhac8s27awx9pknxlaqz9x3sbmjx7n90pr4np389b43zgrmp"; + rev = "f475b8909c448bfb64b9506426fdaf98a808ade1"; + sha256 = "1infpcrpy21jmn2aw4ch0b3qck24s1dkr97h3dr1q9lzi6hdzfbn"; }; meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/"; }; nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-09-02"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "8197c69a550f61ed7d7ebab44393a6545092a38a"; - sha256 = "0arfkz8qgj0qp9z9ds9qsykf3f317p2zkayxi4c5spa79d5yzl55"; + rev = "b9bb1713257ae73eec22d68579e3012134a3598c"; + sha256 = "0m71mqcsmi4masabpmidpyqc1r8v48zj2kzicg2fnw1xkmwjbh5n"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3840,12 +3864,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "972ff2732536d4c3c8cc22bcf05c0d59cac19994"; - sha256 = "0vr1f3qcpqm1zdn5ryl7wjk7fv38pxnsxkcrwq4sra181zzp2jhc"; + rev = "c44ae32bf52b95b0b98e08b6430b998bfde02cf8"; + sha256 = "0yhgimz1hqzb7sxhzv4hirzl89r2ri5y0h671rcl7xlhhzmmb7ks"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -3864,12 +3888,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-08-31"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "efd9f425383ec57756a74c60a6e85d190b110ed7"; - sha256 = "0vqmpgrvgn0923dadf9y1clxpaxf56brscsx31l96v2qghwac7m8"; + rev = "980357a9eeabe84f29c96d38421c9bff321a2bc8"; + sha256 = "1qh8axjfwc2dwdfvc9izfmzwy382vzg9jcnfzs8fkl7lqb87i3a0"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3900,12 +3924,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-09-01"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "ef803555f7b399b92b35ff7be1ec5c275d9af6d3"; - sha256 = "09dq62dqx2gnpi3b6mf97ai0d01pvw596gyrz3bfm6p2yq8l8089"; + rev = "8683ebb3a599cccb0ca1d850e9423debe193b468"; + sha256 = "1jd9cbwb4vpyp5mvc2zpz776j5b6313bmw3cij3q5fbg5mqzg23s"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3948,12 +3972,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "56d41c2ce5dfbdf32fc11ef8381a8b523774a208"; - sha256 = "1f1wz18x0y8kbnfx859j4i6dwa8vxwny0l0cj9m5hah71slawglx"; + rev = "4c68a6463599ec432ee67b0eb337235c153c6b64"; + sha256 = "1mfi2si4x2qn5qww3lfp4827sjpa3j7ma4k1ypidpqq53fr2h8c8"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -3996,12 +4020,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-08-31"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "6566daf66fe8c05e963a1a5358ef81eca7a1e135"; - sha256 = "1hqyzm6lgnm5qyibjjqx2h7nahqnb726832b489vabvvca4s0ndj"; + rev = "3792030b5281a2f7bcc186e04440036b44648e90"; + sha256 = "0wq82v8z0vsnbakc5dnn0f00bjm3mirqdaq3zlq0z2gx7jkmldfg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4020,24 +4044,24 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "71c241425fd7a84f0ae33ea1eb7c071f20499bcd"; - sha256 = "15hrqdzz6y07p6d7w8ydqra27pl3hqphzwlh2bqixpdpq9chlhyh"; + rev = "ea72eaae8809c0e475a8248aa665034d7d4520db"; + sha256 = "01mzyf0d5q0wmr9md6dj3yxlxqc3s80mz43ig3lkz7cgywjzn3qz"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-08-09"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "ae2f20d6938bab234815e0bc69dae1a991307b99"; - sha256 = "0ikim2zwrlc19bpshr1vzsk15wi5z7am59f4fi53rbh985jmncqr"; + rev = "0800dfa7307a64a3e195e62b775f20bb14f557af"; + sha256 = "0s9pp4azvvss8h38hx6r0b5a2nvsf72iqckmzhjnqnxs2w14b839"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -4056,12 +4080,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "3c394b379eea00699a2a2515a19ceb3b79068a8f"; - sha256 = "10gw5sfn5kjw87961mcci5zam428zyfnx2c1l1lvgwsxnla7cbqz"; + rev = "6602d0d2bec64994e2f3d5b2038e98cb67101828"; + sha256 = "0njp63lignvm7b6akq3v840wkyqfw2crips36rvxljy00d5q4smz"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4080,16 +4104,40 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-09-03"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "bec1c4b9b4c8f6a3fccb20ecc2469e91ec791614"; - sha256 = "0w2lxr6jd2dw2bvv09qwg11sxav7c8imw65zs7zx6anyznx1p86r"; + rev = "ac9ce2834753eee1a8cdb8851567f968d2770870"; + sha256 = "1j4xdrk8lvjglkkadkvmcwap2ikgcvymsds2xzmix3xjn5kvrjxj"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; + nvim-solarized-lua = buildVimPluginFrom2Nix { + pname = "nvim-solarized-lua"; + version = "2021-07-09"; + src = fetchFromGitHub { + owner = "ishan9299"; + repo = "nvim-solarized-lua"; + rev = "fa437ae65a6c1239525e4ec7f4cbf4671eaa55ba"; + sha256 = "032gs63g3x62mym6nhznvywsqk1cxsgwx0fv2vyh2c929fb27ji7"; + }; + meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; + }; + + nvim-spectre = buildVimPluginFrom2Nix { + pname = "nvim-spectre"; + version = "2021-09-05"; + src = fetchFromGitHub { + owner = "windwp"; + repo = "nvim-spectre"; + rev = "0f10e9fe2553cb8c0a1512924a2639035559e0bd"; + sha256 = "15bahq0gspjl263bjlpd199brf3ns126j2mrlfxsqzlcnc53y7za"; + }; + meta.homepage = "https://github.com/windwp/nvim-spectre/"; + }; + nvim-terminal-lua = buildVimPluginFrom2Nix { pname = "nvim-terminal.lua"; version = "2019-10-17"; @@ -4104,12 +4152,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-09-03"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "425f5eedc7fa2c6152063d59ec1d840136f37d0d"; - sha256 = "0k7a21kc50bgasmd25pk8caxrnjyl3inlxixxnck75b0rdf03bvf"; + rev = "71122d798482e30c599d78aa7ae4a756c6e81a79"; + sha256 = "1gdhq3q0r63z5qy29h833v8g77y1d6939z1n1y1skjay4y9krx2z"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4356,12 +4404,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-09-01"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3f950aeed3bd908e33fd59643e8f3be05b719df6"; - sha256 = "0sa6ygr0sb67p1bfjwhi2fm19yvalgy2zv1j55r66gh8lwmg0xx2"; + rev = "daec6c759f95cd8528e5dd7c214b18b4cec2658c"; + sha256 = "1mavf0rwrlvwd9bmxj1nnyd32jqrzn4wpiman8wpakf5dcn1i8gb"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4741,12 +4789,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2021-08-11"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "fc070007d6c1c87a671db6632425004fa8a0b2e2"; - sha256 = "1bziyijfsm5q1m6bbp5m7nkki48f16nsiyibr178k9rlr2k6yccm"; + rev = "b99098afe11d275297715f06ddea4536e90eac7a"; + sha256 = "0f42zvbgqqv3vs5rplwwyx9pdsysm375nyr3fdb0xdfx2gn9wc38"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4837,24 +4885,24 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-08-29"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "54a7a24cc7afd9cec765a3c30e23859b974e731d"; - sha256 = "16y4mdxmvbdgb5k6lds4kwd1xh005g1v1vlnbykjd1lnkfz4h4kq"; + rev = "cd5105d76fc124634b53039c02ea253cc06bc9b9"; + sha256 = "1bhjzng02yfnlfr3kvh6lkl5vbpcmcd51kpgg7yjxmlzlga5k2k3"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; rust-vim = buildVimPluginFrom2Nix { pname = "rust.vim"; - version = "2021-08-30"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "7505d5b7f66a163209a181dff327b57d592da7c2"; - sha256 = "0n2044mgnzpkvx4wr2ihx16ajw6mczqcvirv31md97qicrzfqy91"; + rev = "c06a17151c69b9d61e60a28274932a28fd37c453"; + sha256 = "11ms2has79w2jazvca2mysdbscs1412xmcql0mxc72wrpnws321h"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -5199,24 +5247,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-09-03"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "f1051e5ee1dbc9a41007f94433ff882e4243fafa"; - sha256 = "0vyb48x65ywsc7hdcp1ggmlah97866dpx4wmidjck15mqzkiwldz"; + rev = "f43b038b4e1c05c457d36b89afe240089089358d"; + sha256 = "1681hzxz4pykb6svk18mhv8w5wr9c2m626sfyvpg9na25w4d7ijd"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-07-26"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "9a34db8c7e1eda84754420eaced9fdf00f43a929"; - sha256 = "1nh6zwx4lcyx8vdvdfr04z5vwvpcbg8ns2pfxmcgjpcajhawg3nx"; + rev = "c4d0ae8e25528cdfaa18144b12ddd95ced21bef8"; + sha256 = "04ma5si8ig169gfq7pqjxx24fg6mmys41z4581dajrsfqbajc727"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -5319,24 +5367,24 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-08-28"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "80490ad0c697d7277cbd4ea24883120f6de32db0"; - sha256 = "16gl8jc7bqszmpw3yj0sxkxdq9zch6lfj8n0cd6jihd6i9ans564"; + rev = "02ce2dab138a12a36c422ac58fabe9f5a35c664c"; + sha256 = "0z5a5q49csfgz0zdad11q75r8ck150ypj866199cl4j1mzb0xdgv"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-07-19"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "7414f30365a342e1d89072d474a35913643b6eec"; - sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; + rev = "97bf9ec720662af51ae403b6dfe720d4a24bfcbc"; + sha256 = "0rcivwwvb6hmd420jkgy8gnzyv78z0bb8gw6232qrwf9m2lskzad"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -5463,12 +5511,12 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2021-04-14"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "a15822ec1b42b7d43f5c8affaa3ad2c553a2831f"; - sha256 = "0bl4shhk5ldqamq2zk8sv2bdswd9a4762fh2smj0h1jgs2ff5pkm"; + rev = "5c5c31121ec607011c1e382163c0bce207ac2966"; + sha256 = "1cbalg696gcw1bbvclacrg081w1ygb7xfpv6y2w969b50m17l2lc"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -5572,12 +5620,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-09-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ac42f0c26cb417b76046a394c1b3163d346e9107"; - sha256 = "1qzc04xlrkssgvrmciddbykcczklqzhh8fnkr0pf6xrll0vvm1fv"; + rev = "12a44ededa1fc2426d40886feb4034230759a19a"; + sha256 = "0h2idrbi8ahldvgrlcl6hi5bjm2gwd4raz3k7mc3k34vmfk3r29z"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5765,12 +5813,12 @@ final: prev: tremor-vim = buildVimPluginFrom2Nix { pname = "tremor-vim"; - version = "2020-11-19"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-vim"; - rev = "17e53c33f3b0e825330580034ca60172b8ddaadc"; - sha256 = "1gy67qjv0iwqza0yx9y8p5yzn5fszrp7szg1527h0ki3q69cfqki"; + rev = "fe94939d107528f905e5751839e1c3df10f0561b"; + sha256 = "1h4plzbdzw7zfl56i7xfk3dp7labzfyw6xzii3cv8fyahihs83sy"; }; meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; @@ -6485,12 +6533,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "60a728c6f29f9c1844e004ffe773b3208d1fd10a"; - sha256 = "1d0iyafbsmpav0zh1wmf50yjcw066592z179vak8pxw03ppy912x"; + rev = "84cbe8dc7bfcc53422971ae89f1eda4d95611d50"; + sha256 = "08scpqjkqmjl3wh58haa9ii9rabilllgb60jrj8sc4hs9zr4n04n"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7001,12 +7049,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-08-25"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c29c1ede8f9f12d9c76b7c8b5b8ead7690c5792c"; - sha256 = "1rz24r97z3dlzxn3b8m3s4m697f9vhs5688jbqgs4fcbki2wrsyj"; + rev = "7e7f42cf10ba05b6d783de411a6ceca50fe0cc69"; + sha256 = "0pfh63qinj1kr612plnixw12rndpv2qz45w1kb9kqddzzp3fjy98"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -7073,12 +7121,12 @@ final: prev: vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2021-01-08"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "47c643f51e4480541fc81e352ec5b2a361544d0b"; - sha256 = "0xlxkdqjq8fp9fpkhqv5nd2ipiq8nw1bdzd7hqibizwcdsisf91s"; + rev = "461717a931a7d985ac0ac8f4d856a7564b4d3f18"; + sha256 = "1axs13d5jz7vsckyl3v44vli096p991rp67gcvpis4isg609ld8f"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -7277,12 +7325,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2a53d7924877b38b3d82fba188fd9053bfbc646e"; - sha256 = "17zafl9bj7szfzadwl245dhv5s4f14bcipksir95kw7h2lcwxxmx"; + rev = "6f07d7e6cd23b7a76dc461fdfb1984717d233806"; + sha256 = "01kb2xhjd57irqzinvsiif60dkds6f80yjw7k2hl480szx62j57q"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7361,12 +7409,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-08-30"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "832f7c62261930517453fec96d78f79d5289b75d"; - sha256 = "1ykw84a2dayix0pm82nl0rcpfahrsyqhg0h5fw67fw6dihrdnh0s"; + rev = "256702dd1432894b3607d3de6cd660863b331818"; + sha256 = "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -7385,12 +7433,12 @@ final: prev: vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2020-04-21"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "36266238d96cd2219769793855a7e915f5e6a32c"; - sha256 = "0vxjbv5qn7lvvpqv1danmkg423cbf7czxzp208zlx9l82vnr24z8"; + rev = "373e4ec58f725910ea242e79ce03fe21f100b6e3"; + sha256 = "0hf583fkrkq0y38ic9m0rl1p2h1s6fq8gx9gxk64hh6ibqxdicgz"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -7710,12 +7758,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-06-12"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "8fe150bd775f659da7e40ea2d3ad7473e6d29494"; - sha256 = "1y8bhfcbk5062nrscihr24p8b955c09hnbii5grb4x16jir06cbg"; + rev = "519203e07c515bbedc3fa03164176a5bd5653900"; + sha256 = "1j8qaami22b7f9fzq0w21vkmh7w6qj1vkh7rv8hg840i4cp6sq5j"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -8083,12 +8131,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2021-02-18"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "0206f5f5a8721cc8c5c84ebb8ab2886e9afcd0ac"; - sha256 = "1zin6pk581cnkivm2kgks0wrvpxjcl1y3x46wpkzdqg1hhif2129"; + rev = "e7acc32cdc1b70db0d42856ecde9ccf362720bd5"; + sha256 = "02giz39c5qdsvsfdfydyz9a6dznh82x84mm2acblyw4hhx5yvpcq"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -8105,6 +8153,18 @@ final: prev: meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; + vim-loves-dafny = buildVimPluginFrom2Nix { + pname = "vim-loves-dafny"; + version = "2018-09-25"; + src = fetchFromGitHub { + owner = "mlr-msft"; + repo = "vim-loves-dafny"; + rev = "d75d3b074a3da2b0fa9fd5bc980f52ec82c2ad7b"; + sha256 = "170dc38mrakfma30r8z9zaxfn8d5ghrvnlglq6l60yn8fg7njxks"; + }; + meta.homepage = "https://github.com/mlr-msft/vim-loves-dafny/"; + }; + vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; version = "2021-04-28"; @@ -8119,12 +8179,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-08-27"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "52ded667a5c8426d6845b53b943d2a5f6cc3fd6a"; - sha256 = "01jynlb339pbg9pqjnfdgq62n4hccg8ay13j9anvkvjmrpbdg7y4"; + rev = "14f9ab319ff96eea16ef6dbf57ed801c8fc8967e"; + sha256 = "04kj6q2kgl1m4l6z2v74c3mjab4rmi43ly2rpyvq4xqf25him10k"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8468,12 +8528,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-03-03"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "400bee047d116d1cbe72a479943ec69d5b5bba01"; - sha256 = "0njprv1h38rsagpmp1z68vq90pf9fll3pa8767nhgv2kyadn29jx"; + rev = "3582a24f46c965cfe5d6b0c50f636f52168df650"; + sha256 = "0wmrc4z4l8rk96kkixb148d53jzdm4w4vxlqidjm8q4d9vxnf6sb"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -8576,12 +8636,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-08-17"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "9c84cb3eeff0a30f5f8f0dccd77b12ac8494dd95"; - sha256 = "17fjjm5mcwvi0mxsfnqasbr96cln2b0125wyzjj36z4y2bx7w1dm"; + rev = "5d152a9e03ca1c975c1f439456376e01561a02b5"; + sha256 = "0zdjj4mhw27jbdw8xrjc2gj3mx65p02c6nnyp7gci78fzxcv7slr"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -9068,12 +9128,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-08-18"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "cb2ed789ebcd836fa699fc4555f924f69d19f199"; - sha256 = "1a4h0cc4w68mfpkw37vxnaqk9ml3ygkgmfqqdcr74ncmnl58cqjq"; + rev = "10dfcbe875b392b6c98585bd0a07794f0cc78906"; + sha256 = "0gfzvxi890bmgp0c4wbfk5ppawm8cq187p73id2spj2zqhfgjhvn"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -9344,12 +9404,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-08-27"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e081212205f767fc5b050977c0a2b0f1536a3bdf"; - sha256 = "1z7dbhjz7y9wl9gvv35pn4v25pksaavibblxakw3pxv6xk5c5kxf"; + rev = "ef4f418e5326b2069ab767e4139b7bd3dfa5e0f0"; + sha256 = "1wxv22d79mv0jns0jcfkww4xyilwpvcmi82jd1b92l8b3xc6awyp"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9524,12 +9584,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2021-05-29"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "35e9fbf64c06fddc41651e65b92200f902d8ae0b"; - sha256 = "16p68x4669y4qpg91hmi4gc3f8qc8bzbr8v6w3nc75vm48s64z6k"; + rev = "02d28b932398bb7774def2edaef6f1c0ad92c3e3"; + sha256 = "1bh93qfvswb66fj7amhfmhyiyg17rnp28cpq07asm5gccr27ssw7"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -9921,12 +9981,12 @@ final: prev: vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2021-08-21"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "8f94cdd9ca6c3e6c328edaf22029f1bf17f3d1c5"; - sha256 = "1wh44m7jn1s7jyk0g9flf2qhkqgcl5amfi5w7dwjqkr8z495r29h"; + rev = "0a917e0a2c057185b71a4d8367aa69366ebe54e5"; + sha256 = "1fx8a798d7z2xl9jgwn9nvs1cskvi36c557v5yr4w8fc1afl6abm"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -10233,12 +10293,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-08-20"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "14f34ea6d12b71a720356ce83c386f8ba393e700"; - sha256 = "1w680m5xwv6imyc4rd5mpj76w2ac6qgvfsaw33xd9wpgl3ld444j"; + rev = "51d78fce5f95fb10ba84b8ab66e97d44d75df010"; + sha256 = "119x44yvva87f02rra9dm6xg8zmisa9ij9f8426vqpx4307p1wfc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10246,12 +10306,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-09-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "1861f3c89d9c4dc776f95639295ebdbe00c12702"; - sha256 = "0wby0dvm6briqb40c2f2kn6vbf546wn8xwzrk9wpi5xpv1z4a29g"; + rev = "5623fb4c44b2975dd89b0925ba3b952ffa33dfc6"; + sha256 = "0xd6ysq8f946wf4680gd12irdl9q3fqjpq6234d53k15b302lf71"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10486,12 +10546,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2021-07-10"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "dfa61676a32d096aa05003ace3ba8b977c136e1f"; - sha256 = "1mj35p5ym92qi4gjfnvfxqv328cgwp8sp2sldw54g6f6yxfzi37a"; + rev = "3188778d38c736f11161cf6fafc33572cb055816"; + sha256 = "04hy09rzn8s56wxacs5x4j74v9xdixkbskm57bsrxys96n2n1kyb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 22adcb743166..d1a2bda12bea 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -51,7 +51,7 @@ , CoreFoundation , CoreServices -# nvim-treesitter dependencies + # nvim-treesitter dependencies , tree-sitter # sved dependencies @@ -66,7 +66,7 @@ , openssl , pkg-config -# vim-go dependencies + # vim-go dependencies , asmfmt , delve , errcheck @@ -86,7 +86,7 @@ , iferr , impl , reftools -# must be lua51Packages + # must be lua51Packages , luaPackages }: @@ -99,10 +99,10 @@ self: super: { # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 preFixup = '' - substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ + substituteInPlace "$out"/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" - substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/libclang.py \ + substituteInPlace "$out"/plugin/libclang.py \ --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" ''; }); @@ -110,7 +110,7 @@ self: super: { clighter8 = super.clighter8.overrideAttrs (old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ - -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim + -i "$out"/plugin/clighter8.vim ''; }); @@ -203,7 +203,7 @@ self: super: { direnv-vim = super.direnv-vim.overrideAttrs (oa: { preFixup = oa.preFixup or "" + '' - substituteInPlace $out/share/vim-plugins/direnv.vim/autoload/direnv.vim \ + substituteInPlace $out/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" ''; @@ -311,13 +311,9 @@ self: super: { pname = "himalaya-vim"; inherit (himalaya) src version; dependencies = with self; [ himalaya ]; - patchPhase = '' - rm -rf !"vim/" - cp -vaR vim/. . - rm -rf vim/ - ''; - preFixup = '' - substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ + configurePhase = '' + cd vim + substituteInPlace plugin/himalaya.vim \ --replace 'if !executable("himalaya")' 'if v:false' ''; postFixup = '' @@ -358,7 +354,7 @@ self: super: { propagatedBuildInputs = [ LanguageClient-neovim-bin ]; preFixup = '' - substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ + substituteInPlace "$out"/autoload/LanguageClient.vim \ --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" ''; }; @@ -391,9 +387,9 @@ self: super: { minimap-vim = super.minimap-vim.overrideAttrs (old: { preFixup = '' - substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \ + substituteInPlace $out/plugin/minimap.vim \ --replace "code-minimap" "${code-minimap}/bin/code-minimap" - substituteInPlace $out/share/vim-plugins/minimap-vim/bin/minimap_generator.sh \ + substituteInPlace $out/bin/minimap_generator.sh \ --replace "code-minimap" "${code-minimap}/bin/code-minimap" ''; }); @@ -428,13 +424,17 @@ self: super: { }); null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { - path = "null-ls.nvim"; + dependencies = with self; [ plenary-nvim nvim-lspconfig ]; }); nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { dependencies = with self; [ popfix ]; }); + nvim-spectre = super.nvim-spectre.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + # Usage: # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) # or for all grammars: @@ -481,8 +481,8 @@ self: super: { sqlite-lua = super.sqlite-lua.overrideAttrs (old: { postPatch = '' - substituteInPlace lua/sql/defs.lua \ - --replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or" + substituteInPlace lua/sqlite/defs.lua \ + --replace "vim.g.sqlite_clib_path" "vim.g.sqlite_clib_path or '${sqlite.out}/lib/libsqlite3.so'" ''; }); @@ -675,7 +675,7 @@ self: super: { libiconv ]; - cargoSha256 = "16lcsi5mxmj79ky5lbpivravn8rjl4z3j3fsxrglb22ab4i7js3n"; + cargoSha256 = "1hmbgqd22fy68n05vdb93wsdvws91m4i6nm1kq6bwwbhzhkvd7js"; }; in '' @@ -691,7 +691,7 @@ self: super: { vim-dasht = super.vim-dasht.overrideAttrs (old: { preFixup = '' - substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \ + substituteInPlace $out/autoload/dasht.vim \ --replace "['dasht']" "['${dasht}/bin/dasht']" ''; }); @@ -795,7 +795,7 @@ self: super: { in super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { preFixup = '' - substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \ + substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" ''; diff --git a/nixpkgs/pkgs/misc/vim-plugins/update-shell.nix b/nixpkgs/pkgs/misc/vim-plugins/update-shell.nix index e95801624b69..b26620677039 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/update-shell.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/update-shell.nix @@ -7,6 +7,7 @@ mkShell { packages = [ bash pyEnv + nix nix-prefetch-scripts ]; } diff --git a/nixpkgs/pkgs/misc/vim-plugins/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py index fa80b58eb386..326e30dd5d72 100755 --- a/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -9,6 +9,11 @@ # linted: # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py +# If you see `HTTP Error 429: too many requests` errors while running this script, +# refer to: +# +# https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs + import inspect import os import sys diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh index 0efc62912013..cbf666f8b74d 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh @@ -7,7 +7,6 @@ vimPluginGenTags() { target="$out/@rtpPath@/$pname" mkdir -p $out/@rtpPath@ - cp -r . $target # build help tags if [ -d "$target/doc" ]; then diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 7fb9afd68d27..009eb90c9e20 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -56,7 +56,7 @@ camspiers/lens.vim camspiers/snap@main carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file -cespare/vim-toml +cespare/vim-toml@main chaoren/vim-wordmotion chikatoike/concealedyank.vim chikatoike/sourcemap.vim @@ -244,6 +244,7 @@ inkarkat/vim-ReplaceWithSameIndentRegister inkarkat/vim-SyntaxRange int3/vim-extradite Iron-E/nvim-highlite +ishan9299/nvim-solarized-lua itchyny/calendar.vim itchyny/lightline.vim itchyny/thumbnail.vim @@ -282,6 +283,7 @@ joonty/vim-xdebug joosepalviste/nvim-ts-context-commentstring@main josa42/coc-lua josa42/vim-lightline-coc +jose-elias-alvarez/minsnip.nvim@main jose-elias-alvarez/null-ls.nvim@main joshdick/onedark.vim@main jpalardy/vim-slime@main @@ -445,6 +447,7 @@ milkypostman/vim-togglelist mindriot101/vim-yapf mk12/vim-lean mkasa/lushtags +mlr-msft/vim-loves-dafny moll/vim-bbye mopp/sky-color-clock.vim morhetz/gruvbox @@ -510,6 +513,7 @@ nvim-lua/lsp-status.nvim nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim +nvim-neorg/neorg@main nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim nvim-telescope/telescope-fzf-native.nvim@main @@ -627,6 +631,7 @@ rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim saadparwaiz1/cmp_luasnip +saecki/crates.nvim sainnhe/edge sainnhe/gruvbox-material sainnhe/sonokai @@ -787,7 +792,6 @@ urbit/hoon.vim Valloric/MatchTagAlways Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim -vhyrro/neorg@main vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes @@ -856,6 +860,7 @@ wincent/command-t wincent/ferret wincent/terminus windwp/nvim-autopairs +windwp/nvim-spectre winston0410/cmd-parser.nvim winston0410/range-highlight.nvim wlangstroth/vim-racket diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index a0293b8f5cf7..0516a84ce953 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -185,7 +185,7 @@ let else (lib.optional (x ? name) x.name) ++ (x.names or []); - rtpPath = "share/vim-plugins"; + rtpPath = "."; nativeImpl = packages: (let @@ -196,13 +196,14 @@ let ln -sf ${plugin}/${plugin.pname}-${plugin.version}-rocks/${plugin.pname}/${plugin.version}/* $out/pack/${packageName}/${dir}/${plugin.pname}/ ''; - linkVimlPlugin = pluginPath: packageName: dir: - "ln -sf ${pluginPath}/${rtpPath}/* $out/pack/${packageName}/${dir}"; + linkVimlPlugin = plugin: packageName: dir: '' + mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname} + ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${plugin.pname} + ''; - # (builtins.trace pluginPath ) - link = pluginPath: if hasLuaModule pluginPath - then linkLuaPlugin pluginPath - else linkVimlPlugin pluginPath; + link = pluginPath: if hasLuaModule pluginPath + then linkLuaPlugin pluginPath + else linkVimlPlugin pluginPath; packageLinks = (packageName: {start ? [], opt ? []}: let diff --git a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 5c68fec3f120..a2216a58bee6 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.2.727", + "version": "0.2.735", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", diff --git a/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix b/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix index c7fecf080720..443b40930279 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix @@ -6,7 +6,7 @@ }: ##User Input { settings ? {} -# if marked as true will create an empty json file if does not exists +# if marked as true will create an empty json file if does not exist , createIfDoesNotExists ? true , vscodeSettingsFile ? ".vscode/settings.json" , userSettingsFolder ? "" diff --git a/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix index 837906fb5549..fbd34afdaf8f 100644 --- a/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation { --replace "/lib/modules" "${kernel.dev}/lib/modules" ''; + makeFlags = kernel.makeFlags; + installPhase = '' mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc @@ -59,5 +61,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "i686-linux" ]; homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/cramfsprogs/default.nix b/nixpkgs/pkgs/os-specific/linux/cramfsprogs/default.nix index 3f3e8a075b19..59fbfed1b728 100644 --- a/nixpkgs/pkgs/os-specific/linux/cramfsprogs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/cramfsprogs/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { # So patch the "missing include" bug ourselves. patches = [ ./include-sysmacros.patch ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' install --target $out/bin -D cramfsck mkcramfs ''; diff --git a/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix b/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix index 92c33077d684..5ee5eafb0207 100644 --- a/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Kernel module driver for DDC/CI monitors"; homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ bricewge ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; broken = kernel.kernelOlder "5.1"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index b060b908284b..b1d9d3dc41ef 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.4"; - sha256Hash = "1ml4bs4wx5dbz5xpnd5g8b9avmn7g7jvf16fbdlk0da8il0qd2rx"; + version = "3.10.5"; + sha256Hash = "1yxh85m8fnn3w21f6g6vza7k2giizmyhcbkms4rmkcd2dd2rzk3y"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index dc379de31612..70a180e737eb 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,38 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.245-hardened1.patch", - "sha256": "035sq0l15afhyfivkavd08pyaywsrcl6f468gykmbq9j3i2swbb6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.245-hardened1/linux-hardened-4.14.245-hardened1.patch" + "name": "linux-hardened-4.14.246-hardened1.patch", + "sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.205-hardened1.patch", - "sha256": "14v3kwkkhyng0wfz4spca6z7wvsxj4kplj144qv1k3fm9yy2cy3h", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.205-hardened1/linux-hardened-4.19.205-hardened1.patch" + "name": "linux-hardened-4.19.206-hardened1.patch", + "sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.61-hardened1.patch", - "sha256": "0hg67w9s6nzfmar8y01cnc46b2m2sa6s1xz85x1z1c46vw9558f0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.61-hardened1/linux-hardened-5.10.61-hardened1.patch" + "name": "linux-hardened-5.10.63-hardened1.patch", + "sha256": "1v1w6ybfkgqisdprny9bb658443hbld86r96cvzqdkmd8wfh4513", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.63-hardened1/linux-hardened-5.10.63-hardened1.patch" }, "5.13": { "extra": "-hardened1", - "name": "linux-hardened-5.13.13-hardened1.patch", - "sha256": "1rb4jpz8zbpijybpm7dwxr05f9nmf6b9av2b651ffxg5vziw17l3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.13-hardened1/linux-hardened-5.13.13-hardened1.patch" + "name": "linux-hardened-5.13.15-hardened1.patch", + "sha256": "1g75jh5j9qbh4wbiy2wnc982i2gld2845ai47rczcj7ciycba8n7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.15-hardened1/linux-hardened-5.13.15-hardened1.patch" + }, + "5.14": { + "extra": "-hardened1", + "name": "linux-hardened-5.14.2-hardened1.patch", + "sha256": "0hcw61bavhyr9v621ajsrl2zgz7kc0z8r7p5kzm37dnlggwl4qh3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.2-hardened1/linux-hardened-5.14.2-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.143-hardened1.patch", - "sha256": "0xv29cclypywq52908zppxpjrxllcdb67chw7lcia60y1aqsg83z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.143-hardened1/linux-hardened-5.4.143-hardened1.patch" + "name": "linux-hardened-5.4.144-hardened1.patch", + "sha256": "1vm19d5cwxw3l2s4h7sbzrhk60m24nhbjdlpqd1bkbm8x8zcp9f3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.144-hardened1/linux-hardened-5.4.144-hardened1.patch" } } diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index b36deaadb4ba..313666a471a0 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.62"; + version = "5.10.64"; # 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 = "1cc6z2xzi1s69805jk4f91iarx19v0yyqvssx1f1mc0l9l1db389"; + sha256 = "02p36mf41nsa4bamw18vhgbca094q2blbqqljdsb9qid9b94pf1y"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix index dbccfd2cae79..888c6a291969 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.14"; + version = "5.13.16"; # 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 = "06lbjsbr86qa8yai5gfclbfxvcqsw33kxj9b4r93hh6z1wajmx82"; + sha256 = "1ljigvcg4q6ckr8kna3q5iyjsy7x5mrf1ycqfy0ibbhn9hbqjna9"; }; } // (args.argsOverride or { })) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix index a16b35f55cbf..2a07ac2a0a95 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.1"; + version = "5.14.3"; # 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 = "1iq8s031fviccc4710biwl7gxqdimm3nhlvxd0m3fykvhhmcanq0"; + sha256 = "1n5808v3vb2c27pv4f8r4avqzqp20dylclbc83cj2872d6z41hy6"; }; } // (args.argsOverride or { })) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index ea8cf7042a24..4d01f1a7e618 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.144"; + version = "5.4.145"; # 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 = "11aqp12xwbg7ysac3f9iaxwkhvasdg9bw4r43jj8af5bf61bjhxw"; + sha256 = "1yb8vk5sbnyswylkpqw5i4n9cmnmlrfmbrnmy3nif579q8p7ixsw"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 3642dfe442d0..d9f8912416a5 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18298"; - sha256 = "027fp6h7295cc9m5g46phqd6hixcnvihpfsyrnzvsxz6pkvjzpw4"; + rev = "18314"; + sha256 = "0fic073zafwdsw7i0j4z57a4aknk8kpgnbrxpbi181n5axdlm99k"; } , ... }: diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index dae6072aa780..118f0e632e65 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.13.9"; + version = "5.13.15"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-aAnwPw1qoGhUdWN/uaQa+5bi0DFZB/wDfNow7FgMMFE="; + sha256 = "sha256-YDdBOB49NkX2V+lA7JeKRXfpo81/MSoLDOsPjphhBJA="; }; extraMeta = { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 7a1f477f8472..7be45dc3e683 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.143-rt63"; # updated by ./update-rt.sh + version = "5.4.143-rt64"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -21,7 +21,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "13d9sx6vw3hlh0cpccfsfqkjj6yfjmbh4wp4x6ry84i39lrfbwg3"; + sha256 = "0prfrvk2ds20sclikizzgg5qf4mfcyaymp9r272d5nj35293622n"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 5034f66e2fce..1f899af55aca 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.13"; + version = "5.14.3"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-qRJuTkTmsKbCCGrzq62o+1RrvTGM74p4mqy9AQ8hvD0="; + sha256 = "sha256-nl8DktW2TsV20ii/f41TsSotE/yBRBH3SYlWKLsfT50="; }; structuredExtraConfig = with lib.kernel; { @@ -53,7 +53,7 @@ buildLinux (args // rec { }; extraMeta = { - branch = "5.13-cacule"; + branch = "5.14-cacule"; maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index 7750b776575c..b19b52132352 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.13.13-zen1"; + modDirVersion = "5.14.1-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-aTTbhXy0wsDDCSbX1k27l9g3FliqwE6TbRq2zkI3mnw="; + sha256 = "sha256-InfDIs+eELLJE5aw7mD8Jo7SlrpeI/ZuD3z4TyFf7/k="; }; structuredExtraConfig = with lib.kernel; { diff --git a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index b58c3b60bf9a..198a6eae6005 100755 --- a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -16,6 +16,7 @@ showSyntax() { # Parse the command line. origArgs=("$@") +copyClosureFlags=() extraBuildFlags=() lockFlags=() flakeFlags=() @@ -60,6 +61,9 @@ while [ "$#" -gt 0 ]; do upgrade=1 upgrade_all=1 ;; + -s|--use-substitutes) + copyClosureFlags+=("$i") + ;; --max-jobs|-j|--cores|-I|--builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") @@ -157,11 +161,11 @@ targetHostCmd() { copyToTarget() { if ! [ "$targetHost" = "$buildHost" ]; then if [ -z "$targetHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure --from "$buildHost" "$1" + NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --from "$buildHost" "$1" elif [ -z "$buildHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$targetHost" "$1" + NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" else - buildHostCmd nix-copy-closure --to "$targetHost" "$1" + buildHostCmd nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" fi fi } @@ -425,7 +429,7 @@ if [[ -n $buildNix && -z $flake ]]; then if [ -a "$nixDrv" ]; then nix-store -r "$nixDrv"'!'"out" --add-root "$tmpDir/nix" --indirect >/dev/null if [ -n "$buildHost" ]; then - nix-copy-closure --to "$buildHost" "$nixDrv" + nix-copy-closure "${copyClosureFlags[@]}" --to "$buildHost" "$nixDrv" # The nix build produces multiple outputs, we add them all to the remote path for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do remoteNix="$remoteNix${remoteNix:+:}$p/bin" diff --git a/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix index 40159cd2acd8..db5763029977 100644 --- a/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.2.8"; + version = "1.3.3"; src = fetchurl { url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-urTIhG4dLMNmnPqSMdIdszWEHX1Y+eGc0Jn+bOYmsVc="; + sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { binary files. ''; homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice joachifm ]; }; diff --git a/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix index 7d5d6d59ea84..113cceb50a45 100644 --- a/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { homepage = "https://github.com/brendangregg/perf-tools"; description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; maintainers = [ maintainers.eelco ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index 23e78dd848ed..564fbca37ba8 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; preConfigure = '' - cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl") + cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' diff --git a/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix b/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix index af180b5e5241..78992a0f870a 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix @@ -14,6 +14,17 @@ stdenv.mkDerivation { installFlags = [ "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "INSTALL=install" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + postPatch = '' + # Disable stripping during installation, stripping will be done anyway. + # Fixes cross-compilation. + substituteInPlace Makefile \ + --replace "-m 500 -s" "-m 500" + ''; + preConfigure = '' sed -e 's@-o \''${MAN_USER} -g \''${MAN_GROUP} -m \''${MAN_PERMS} @@' -i Makefile diff --git a/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/nixpkgs/pkgs/os-specific/linux/upower/default.nix index 08bebefed136..d2f17c6666a8 100644 --- a/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , libxslt @@ -16,13 +17,13 @@ stdenv.mkDerivation { pname = "upower"; - version = "0.99.11"; + version = "0.99.13"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz"; - sha256 = "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4"; + url = "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz"; + sha256 = "sha256-XK1w+RVAzH3BIcsX4K1kXl5mPIaC9gp75C7jjNeyPXo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/bazarr/default.nix b/nixpkgs/pkgs/servers/bazarr/default.nix index 1db21cb13bc2..31c95bdb5f1b 100644 --- a/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.7"; + version = "0.9.8"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-OyH3/KK8d5pWu+Ubzgd4N0IwpumbAe/43Oo+LGg+Erc="; + sha256 = "sha256-ESmSfor28KIaZ68Sy+YRbumefHDxLZgBQ6XeUSYSR1c="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix index 801601487913..2b159cf8c875 100644 --- a/nixpkgs/pkgs/servers/caddy/default.nix +++ b/nixpkgs/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.4.4"; + version = "2.4.5"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "sha256-POdDORICDE49BQ5LLTs4GTb1VoSXZD4K4MpRkVoj+AY="; + sha256 = "sha256-/DZnIXAvhCaXFl4DvYP4LSFQQytzj6HWYsmqx5T8GNM="; }; - vendorSha256 = "sha256-JAQaxEmdX0fpDahe55pEKnUW64k8JjrytkBrXpQJz3I="; + vendorSha256 = "sha256-ZevSZ8zTGtkrrJF0xvAtxCgP0CsxcORqD40LkMQ0aWc="; passthru.tests = { inherit (nixosTests) caddy; }; diff --git a/nixpkgs/pkgs/servers/dict/wiktionary/default.nix b/nixpkgs/pkgs/servers/dict/wiktionary/default.nix index 05df86f3a784..faf87a904831 100644 --- a/nixpkgs/pkgs/servers/dict/wiktionary/default.nix +++ b/nixpkgs/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20210201"; + version = "20210901"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs"; + sha256 = "S87E0aAFITOTugvsXOmbq8+P/LS2J+GmFvJYeYj79PM="; }; # script in nixpkgs does not support python2 diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 4adb649e0868..4363f9665fa4 100644 --- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c"; + sha256 = "580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/dns/ncdns/default.nix b/nixpkgs/pkgs/servers/dns/ncdns/default.nix index b046aff12bd7..7fad548df7a5 100644 --- a/nixpkgs/pkgs/servers/dns/ncdns/default.nix +++ b/nixpkgs/pkgs/servers/dns/ncdns/default.nix @@ -1,27 +1,103 @@ -{ lib, nixosTests, git, buildGoPackage, fetchFromGitHub, libcap }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +, libcap +}: -buildGoPackage rec { - pname = "ncdns"; - version = "2020-11-22"; - - goPackagePath = "github.com/namecoin/ncdns"; - goDeps = ./deps.nix; +let - src = fetchFromGitHub { + # ncdns source + ncdns = fetchFromGitHub { owner = "namecoin"; repo = "ncdns"; - rev = "2fa54cd3b5480dba82170ab8ecb511fbd4977c41"; - sha256 = "0mrxbg5lmy3s281ff6nxpp03z4mqwq7h5hkqm9qy8nb280x1sx7h"; + rev = "2a486311b0fe1a921af34aa3b31e6e4e0569accc"; + sha256 = "01arwlycp1iia4bd3dgyn8dam1av2a7d9hv7f085n14l2i2aza7v"; + }; + + # script to patch the crypto/x509 package + x509 = fetchFromGitHub { + owner = "namecoin"; + repo = "x509-compressed"; + rev = "fb9f2b7bc9fcba954d70f63857cc0c3841b1cf47"; + sha256 = "1arkbpbzvhcmz5fhjqg34x2jbjnwmlisapk22rjki17qpamh7zks"; + # ncdns must be put in a subdirectory for this to work. + extraPostFetch = '' + cp -r --no-preserve=mode "${ncdns}" "$out/ncdns" + ''; }; - patches = [ ./fix-tpl-path.patch ]; +in + +buildGoModule { + pname = "ncdns"; + version = "unstable-2020-07-18"; + + src = x509; + + vendorSha256 = "02bqf6vkj5msk35sr5sklnqqd16n7gns7knzqslw077xrxiz7bsg"; + + # Override the go-modules fetcher derivation to apply + # upstream's patch of the crypto/x509 library. + modBuildPhase = '' + go mod init github.com/namecoin/x509-compressed + go generate ./... + go mod tidy + + cd ncdns + go mod init github.com/namecoin/ncdns + go mod edit \ + -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest \ + -replace github.com/namecoin/x509-compressed=$NIX_BUILD_TOP/source + go mod tidy + ''; + + # Copy over the lockfiles as well, because the source + # doesn't contain it. The fixed-output derivation is + # probably not reproducible anyway. + modInstallPhase = '' + mv -t vendor go.mod go.sum + cp -r --reflink=auto vendor "$out" + ''; buildInputs = [ libcap ]; + # The fetcher derivation must run with a different + # $sourceRoot, but buildGoModule doesn't allow that, + # so we use this ugly hack. + unpackPhase = '' + runHook preUnpack + + unpackFile "$src" + sourceRoot=$PWD/source/ncdns + chmod -R u+w -- "$sourceRoot" + cd $sourceRoot + + runHook postUpack + ''; + + # Same as above: can't use `patches` because that would + # be also applied to the fetcher derivation, thus failing. + patchPhase = '' + runHook prePatch + patch -p1 < ${./fix-tpl-path.patch} + runHook postPatch + ''; + + preBuild = '' + chmod -R u+w vendor + mv -t . vendor/go.{mod,sum} + ''; + + preCheck = '' + # needed to run the ncdns test suite + ln -s $PWD/vendor ../../go/src + ''; + postInstall = '' mkdir -p "$out/share" - cp -r "$src/_doc" "$out/share/doc" - cp -r "$src/_tpl" "$out/share/tpl" + cp -r _doc "$out/share/doc" + cp -r _tpl "$out/share/tpl" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/dns/ncdns/deps.nix b/nixpkgs/pkgs/servers/dns/ncdns/deps.nix deleted file mode 100644 index f48faa9648bd..000000000000 --- a/nixpkgs/pkgs/servers/dns/ncdns/deps.nix +++ /dev/null @@ -1,318 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "ea60c4def909bde529d41a7e0674e31eba751da3"; - sha256 = "08xhd9jlgkql8kqpi98aaq9k8hgb6x7197r6crp84r1ic8k7im4y"; - }; - } - { - 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 = "1786d5ef83d4868925e518b2995c30430aec0f06"; - sha256 = "1grs2y4gnyq8wv9w61c231a01c7qd916b7rxqy798b8sfirr3ci8"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcd"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcd"; - rev = "6bd4c64a54faeb343d5e3c1ee5802450a291787f"; - sha256 = "15plh7rrmx1ydy3ldnylr727s9szrrkqzbf2ma2ka2qag1vy6nvb"; - }; - } - { - goPackagePath = "github.com/btcsuite/btclog"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btclog"; - rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; - sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcutil"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcutil"; - rev = "a53e38424cce1c9de2062b69364efd35fd428d15"; - sha256 = "1izjvgi0d5wnknfwdnqa196hn4vj1n5ga7swbhcfsgghk2zngwr4"; - }; - } - { - goPackagePath = "github.com/btcsuite/go-socks"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/go-socks"; - rev = "4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f"; - sha256 = "18cv2icj059lq4s99p6yh91hlas5f2gi3f1p4c10sjgwrs933d7b"; - }; - } - { - goPackagePath = "github.com/btcsuite/websocket"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/websocket"; - rev = "31079b6807923eb23992c421b114992b95131b55"; - sha256 = "0xpkf257ml6fpfdgv7hxxc41n0d5yxxm3njm50qpzp7j71l9cjwa"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "87511f396ae9991f8589f6e6dcf58e28a91ba52b"; - sha256 = "139ylav4vl4h7ndy1xkj0dn45rbknv2rfjlifrj622n96c4rrazx"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/hlandau/buildinfo"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/buildinfo"; - rev = "337a29b5499734e584d4630ce535af64c5fe7813"; - sha256 = "1kq3r1i4rr9bcvj5yg8w1l95f6sfc3kn6kgcdmlh5i3j9w2sram8"; - }; - } - { - goPackagePath = "github.com/hlandau/degoutils"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/degoutils"; - rev = "8fa2440b63444dad556d76366f1c3ee070c8a577"; - sha256 = "1yj39jbrk3xx3cyl8f4asakc74lsl0brasi25xjf6219pg69q0iy"; - }; - } - { - goPackagePath = "github.com/hlandau/dexlogconfig"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/dexlogconfig"; - rev = "244f29bd260884993b176cd14ef2f7631f6f3c18"; - sha256 = "1d01ghx6xawj3nk3lpk51wbbpxdnc9vzvijvlayvp7cxgsacslbc"; - }; - } - { - goPackagePath = "github.com/hlandau/xlog"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/xlog"; - rev = "197ef798aed28e08ed3e176e678fda81be993a31"; - sha256 = "08rjlqnjbfgpz5rbjq89l7y5vyhk99ivr928sqdi5gnqznbqs4m8"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "a883a8422cd235c67c6c4fdcb7bbb022143e10b1"; - sha256 = "0vp5ijbapw8j52c3l992m1wm8nhl23n68xk3lqxhad3srxmdb9z4"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "cafcf9720371e5625e7300397de921f58e069d17"; - sha256 = "0q164xvv7nwgjq2l2lln4y7yp036jpwx8v7yfsz432czl10d4g0h"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc"; - sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "23c4faca9d32b0abbb6e179aa1aadc45ac53a916"; - sha256 = "1iir2yrx71wg0ab9j4qm70aycym2pxrb043dmbknyzbw9s43cabz"; - }; - } - { - goPackagePath = "github.com/namecoin/btcd"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/btcd"; - rev = "69a10543311fa68737d0a77b4cd045b0b0abfb75"; - sha256 = "1zbfigs3hrjhdwp19877lpgivdcz3k80149nxdmxlmp03xcswcqy"; - }; - } - { - goPackagePath = "github.com/namecoin/ncbtcjson"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/ncbtcjson"; - rev = "fa221af062c70f802db6ed66e1546cc4a41ec277"; - sha256 = "1fmz5aylsji27vj5f3f3gg9xj99735gh5prvcfz0gmk68v1mnr4i"; - }; - } - { - goPackagePath = "github.com/namecoin/ncrpcclient"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/ncrpcclient"; - rev = "858e1a5acd8b2da56462f50323633cdf2fe80977"; - sha256 = "0pj951wm6fdkk2yv4bxaxka52i7rb6w3fs9ah3fy7p8wchr4smjx"; - }; - } - { - goPackagePath = "github.com/namecoin/splicesign"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/splicesign"; - rev = "38bb6fb3ec66c72ecb3a14e1e714768cc6e56ed7"; - sha256 = "0irlbcrarbrvzdnph9kxrf8bkij1lzqpp5mxh8i60n5ii7bj0wsd"; - }; - } - { - goPackagePath = "github.com/namecoin/tlsrestrictnss"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/tlsrestrictnss"; - rev = "945a9f3d995fcb175fd0b19549e21a3e87ba8c13"; - sha256 = "18qphkqnjw3bwflkyyrddyzgwscs37j7y6ynm9g78bqb5skviqqy"; - }; - } - { - goPackagePath = "github.com/ogier/pflag"; - fetch = { - type = "git"; - url = "https://github.com/ogier/pflag"; - rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb"; - sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "eea92b9e2c4424af886c8c620efa50fff5a56387"; - sha256 = "0lf4x32af40ixnysfzfm9r08gpsd3k3x7p3hr2k8q72llsa1zivz"; - }; - } - { - goPackagePath = "github.com/shiena/ansicolor"; - fetch = { - type = "git"; - url = "https://github.com/shiena/ansicolor"; - rev = "c7312218db184c554578219828d6c9498d02dcb1"; - sha256 = "14mhp5ir1vlshja9bam6df5wpbqdwg46qn1ysixjiap535ajhkza"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "eec23a3978adcfd26c29f4153eaa3e3d9b2cc53a"; - sha256 = "18cf6vhmx7v83ahyil7j8hkwhwf1012bgixglz7a6nc35qwwqb3r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6772e930b67bb09bf22262c7378e7d2f67cf59d1"; - sha256 = "0zlr39dxbg0fxfdrc20c4x0pw43n9kz749ssml97cdzqy116p5qa"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "0d417f6369309be088e227ead8736fb722d759d3"; - sha256 = "1cn19s7kg91alianr1c1bp6k6p1wccigg19h6fchd84jb2zakkvs"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/configurable.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/configurable.v1"; - rev = "41496864a1fe3e0fef2973f22372b755d2897402"; - sha256 = "0i9jbdvi8rz12xsrzzbfxg5lwsqakjcmccsa5a32asmv26k5byqa"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/easyconfig.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/easyconfig.v1"; - rev = "c31249162931b4963bbe6e501cccb60d23271a3f"; - sha256 = "1v8j1pyzcfj1l4pmb1c6mszci6xzc4agdam2kq79kyvbsvbbw9dc"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/madns.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/madns.v2"; - rev = "26979b3e4b5aa3e0bd53cf0a014f9eaf43b578e3"; - sha256 = "09r4m4mqdgd7hvxyvss9m64lq0kk8nylnq2bgnkrclgzpi87fmmb"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/service.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/service.v2"; - rev = "b64b3467ebd16f64faec1640c25e318efc0c0d7b"; - sha256 = "0lpx88f46ylx9lf6jgwcjgklll1pc1mlakrywpa0wzhjj7a4jinc"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/svcutils.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/svcutils.v1"; - rev = "c25dac49e50cbbcbef8c81b089f56156f4067729"; - sha256 = "12b6p71mk33r44d71xizjq82fls0ykfwfl5gnmckbgpxms4bj2xf"; - }; - } -] diff --git a/nixpkgs/pkgs/servers/heisenbridge/default.nix b/nixpkgs/pkgs/servers/heisenbridge/default.nix index f4ea4be0060a..ac957f5e38ff 100644 --- a/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; rev = "v${version}"; - sha256 = "sha256-DmYGP50GsthxvhXUMkwV+mvcfCjCMu90VMe5woNvf1w="; + sha256 = "sha256-PaLOFZTeX7HxBiOc94x5sHuJYKRF1fR9ShmQN7IPuuo="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index da88c09c5b61..28285fa2ee37 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -993,7 +993,7 @@ "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; - "youless" = ps: with ps; [ ]; # missing inputs: youless-api + "youless" = ps: with ps; [ youless-api ]; "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 7bf04b65c723..68a80dc41d7e 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -112,6 +112,19 @@ let (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; }) + + # Pinned due to incompability with aioesphomeapi 8.0.0 + (self: super: { + aioesphomeapi = super.aioesphomeapi.overrideAttrs (oldAttrs: rec { + version = "7.0.0"; + src = fetchFromGitHub { + owner = "esphome"; + repo = oldAttrs.pname; + rev = "v${version}"; + hash = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps="; + }; + }); + }) ]; mkOverride = attrname: version: sha256: @@ -722,6 +735,7 @@ in with py.pkgs; buildPythonApplication rec { "yandex_transport" "yandextts" "yeelight" + "youless" # disabled, because it tries to join a multicast group and fails to find a usable network interface # "zeroconf" "zerproc" diff --git a/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/nixpkgs/pkgs/servers/hylafaxplus/default.nix index 04be8c63599d..00dfd7c48176 100644 --- a/nixpkgs/pkgs/servers/hylafaxplus/default.nix +++ b/nixpkgs/pkgs/servers/hylafaxplus/default.nix @@ -30,8 +30,8 @@ let pname = "hylafaxplus"; - version = "7.0.3"; - sha256 = "139iwcwrn9i5lragxi33ilzah72w59wg4midfjjgx5cly3ah0iy4"; + version = "7.0.4"; + sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5"; configSite = substituteAll { name = "${pname}-config.site"; diff --git a/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch b/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch index daf7b4f7d05a..7faa89740338 100644 --- a/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -2,11 +2,11 @@ https://bugs.gentoo.org/706154 --- a/configure +++ b/configure @@ -2583,7 +2583,7 @@ EOF - echo '#define TIFFSTRIPBYTECOUNTS uint32' + echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[01]) tiff_runlen_t="uint32" -+ 4.[0-9]) tiff_runlen_t="uint32" - tiff_offset_t="uint64" - echo '#define TIFFSTRIPBYTECOUNTS uint64' +- 4.[0123]) tiff_runlen_t="uint32_t" ++ 4.[0-9]) tiff_runlen_t="uint32_t" + tiff_offset_t="uint64_t" + echo '#define TIFFSTRIPBYTECOUNTS uint64_t' echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/nixpkgs/pkgs/servers/jellyfin/default.nix b/nixpkgs/pkgs/servers/jellyfin/default.nix index 8164330c5566..c2c9df4b814b 100644 --- a/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.7.6"; # ensure that jellyfin-web has matching version + version = "10.7.7"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "3wXB9HrOaLgHJjWpwPWVtcy8xcYBgZoE29hWqf1On2Q="; + sha256 = "mByGsz9+R8I5/f6hUoM9JK/MDcWIJ/Xt51Z/LRXeQQQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/jellyfin/node-deps.nix b/nixpkgs/pkgs/servers/jellyfin/node-deps.nix index 3a55fcbe88bc..2a1b07a662e2 100644 --- a/nixpkgs/pkgs/servers/jellyfin/node-deps.nix +++ b/nixpkgs/pkgs/servers/jellyfin/node-deps.nix @@ -4,6 +4,15 @@ let sources = { + "@apideck/better-ajv-errors-0.2.5" = { + name = "_at_apideck_slash_better-ajv-errors"; + packageName = "@apideck/better-ajv-errors"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.2.5.tgz"; + sha512 = "Pm1fAqCT8OEfBVLddU3fWZ/URWpGGhkvlsBIgn9Y2jJlcNumo0gNzPsQswDJTiA8HcKpCjOhWQOgkA9kXR4Ghg=="; + }; + }; "@babel/code-frame-7.12.11" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; @@ -13,436 +22,436 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.12.13" = { + "@babel/code-frame-7.14.5" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.14.0" = { + "@babel/compat-data-7.15.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.14.0"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz"; - sha512 = "vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"; + sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="; }; }; - "@babel/core-7.14.0" = { + "@babel/core-7.15.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.0"; + version = "7.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz"; - sha512 = "8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz"; + sha512 = "pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg=="; }; }; - "@babel/eslint-parser-7.13.14" = { + "@babel/eslint-parser-7.15.4" = { name = "_at_babel_slash_eslint-parser"; packageName = "@babel/eslint-parser"; - version = "7.13.14"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.13.14.tgz"; - sha512 = "I0HweR36D73Ibn/FfrRDMKlMqJHFwidIUgYdMpH+aXYuQC+waq59YaJ6t9e9N36axJ82v1jR041wwqDrDXEwRA=="; + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.4.tgz"; + sha512 = "hPMIAmGNbmQzXJIo2P43Zj9UhRmGev5f9nqdBFOWNGDGh6XKmjby79woBvg6y0Jur6yRfQBneDbUQ8ZVc1krFw=="; }; }; - "@babel/eslint-plugin-7.13.16" = { + "@babel/eslint-plugin-7.14.5" = { name = "_at_babel_slash_eslint-plugin"; packageName = "@babel/eslint-plugin"; - version = "7.13.16"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.13.16.tgz"; - sha512 = "RNL0dLHBvjXW857JwzToTHxtbOZfGcvdSegcgXC1c1PqfE+o/QN8MugkgKj2vXFxCcMByfxJrmpCbLzVBVlgIA=="; + url = "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.14.5.tgz"; + sha512 = "nzt/YMnOOIRikvSn2hk9+W2omgJBy6U8TN0R+WTTmqapA+HnZTuviZaketdTE9W7/k/+E/DfZlt1ey1NSE39pg=="; }; }; - "@babel/generator-7.14.1" = { + "@babel/generator-7.15.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.1"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz"; - sha512 = "TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz"; + sha512 = "d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw=="; }; }; - "@babel/helper-annotate-as-pure-7.12.13" = { + "@babel/helper-annotate-as-pure-7.15.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz"; + sha512 = "QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz"; + sha512 = "P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q=="; }; }; - "@babel/helper-compilation-targets-7.13.16" = { + "@babel/helper-compilation-targets-7.15.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.13.16"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; - sha512 = "3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz"; + sha512 = "rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.1" = { + "@babel/helper-create-class-features-plugin-7.15.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.1"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz"; - sha512 = "r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz"; + sha512 = "7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.17" = { + "@babel/helper-create-regexp-features-plugin-7.14.5" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; - sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; + sha512 = "TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="; }; }; - "@babel/helper-define-polyfill-provider-0.2.0" = { + "@babel/helper-define-polyfill-provider-0.2.3" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.2.0"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz"; - sha512 = "JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz"; + sha512 = "RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew=="; }; }; - "@babel/helper-explode-assignable-expression-7.13.0" = { + "@babel/helper-explode-assignable-expression-7.15.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; - sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz"; + sha512 = "J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g=="; }; }; - "@babel/helper-function-name-7.12.13" = { + "@babel/helper-function-name-7.15.4" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz"; + sha512 = "Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw=="; }; }; - "@babel/helper-get-function-arity-7.12.13" = { + "@babel/helper-get-function-arity-7.15.4" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz"; + sha512 = "1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA=="; }; }; - "@babel/helper-hoist-variables-7.13.16" = { + "@babel/helper-hoist-variables-7.15.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.13.16"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; - sha512 = "1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz"; + sha512 = "VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA=="; }; }; - "@babel/helper-member-expression-to-functions-7.13.12" = { + "@babel/helper-member-expression-to-functions-7.15.4" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.13.12"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz"; + sha512 = "cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA=="; }; }; - "@babel/helper-module-imports-7.13.12" = { + "@babel/helper-module-imports-7.15.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.13.12"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; + sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; }; }; - "@babel/helper-module-transforms-7.14.0" = { + "@babel/helper-module-transforms-7.15.4" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz"; - sha512 = "L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz"; + sha512 = "9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw=="; }; }; - "@babel/helper-optimise-call-expression-7.12.13" = { + "@babel/helper-optimise-call-expression-7.15.4" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz"; + sha512 = "E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw=="; }; }; - "@babel/helper-plugin-utils-7.13.0" = { + "@babel/helper-plugin-utils-7.14.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.13.0" = { + "@babel/helper-remap-async-to-generator-7.15.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz"; + sha512 = "v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ=="; }; }; - "@babel/helper-replace-supers-7.13.12" = { + "@babel/helper-replace-supers-7.15.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.13.12"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; - sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz"; + sha512 = "/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw=="; }; }; - "@babel/helper-simple-access-7.13.12" = { + "@babel/helper-simple-access-7.15.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.13.12"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz"; + sha512 = "UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { + "@babel/helper-skip-transparent-expression-wrappers-7.15.4" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.12.1"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz"; + sha512 = "BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A=="; }; }; - "@babel/helper-split-export-declaration-7.12.13" = { + "@babel/helper-split-export-declaration-7.15.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz"; + sha512 = "HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw=="; }; }; - "@babel/helper-validator-identifier-7.14.0" = { + "@babel/helper-validator-identifier-7.14.9" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.0"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha512 = "V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; }; }; - "@babel/helper-validator-option-7.12.17" = { + "@babel/helper-validator-option-7.14.5" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.13.0" = { + "@babel/helper-wrap-function-7.15.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz"; + sha512 = "Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw=="; }; }; - "@babel/helpers-7.14.0" = { + "@babel/helpers-7.15.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz"; - sha512 = "+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz"; + sha512 = "V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ=="; }; }; - "@babel/highlight-7.14.0" = { + "@babel/highlight-7.14.5" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz"; - sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; + sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@babel/parser-7.14.1" = { + "@babel/parser-7.15.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.1"; + version = "7.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz"; - sha512 = "muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz"; + sha512 = "2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.13.12"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; - sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz"; + sha512 = "eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.13.15" = { + "@babel/plugin-proposal-async-generator-functions-7.15.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.13.15"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz"; - sha512 = "VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz"; + sha512 = "2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw=="; }; }; - "@babel/plugin-proposal-class-properties-7.13.0" = { + "@babel/plugin-proposal-class-properties-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; + sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; }; }; - "@babel/plugin-proposal-class-static-block-7.13.11" = { + "@babel/plugin-proposal-class-static-block-7.15.4" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.13.11"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz"; - sha512 = "fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz"; + sha512 = "M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.13.8" = { + "@babel/plugin-proposal-dynamic-import-7.14.5" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; - sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; + sha512 = "ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.13" = { + "@babel/plugin-proposal-export-namespace-from-7.14.5" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; - sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; + sha512 = "g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="; }; }; - "@babel/plugin-proposal-json-strings-7.13.8" = { + "@babel/plugin-proposal-json-strings-7.14.5" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; - sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; + sha512 = "NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = { + "@babel/plugin-proposal-logical-assignment-operators-7.14.5" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; - sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; + sha512 = "YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; - sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; + sha512 = "gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.13" = { + "@babel/plugin-proposal-numeric-separator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; - sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; + sha512 = "yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.13.8" = { + "@babel/plugin-proposal-object-rest-spread-7.14.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.13.8"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; - sha512 = "DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz"; + sha512 = "082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.13.8" = { + "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; - sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; + sha512 = "3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.13.12" = { + "@babel/plugin-proposal-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; - sha512 = "fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; + sha512 = "ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.13.0" = { + "@babel/plugin-proposal-private-methods-7.14.5" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; + sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.14.0" = { + "@babel/plugin-proposal-private-property-in-object-7.15.4" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.14.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; - sha512 = "59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz"; + sha512 = "X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { + "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; + sha512 = "6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -463,13 +472,13 @@ let sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; - "@babel/plugin-syntax-class-static-block-7.12.13" = { + "@babel/plugin-syntax-class-static-block-7.14.5" = { name = "_at_babel_slash_plugin-syntax-class-static-block"; packageName = "@babel/plugin-syntax-class-static-block"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; - sha512 = "ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; + sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -553,319 +562,319 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-private-property-in-object-7.14.0" = { + "@babel/plugin-syntax-private-property-in-object-7.14.5" = { name = "_at_babel_slash_plugin-syntax-private-property-in-object"; packageName = "@babel/plugin-syntax-private-property-in-object"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; - sha512 = "bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; + sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.13" = { + "@babel/plugin-syntax-top-level-await-7.14.5" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.13.0" = { + "@babel/plugin-transform-arrow-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; + sha512 = "KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.13.0" = { + "@babel/plugin-transform-async-to-generator-7.14.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; + sha512 = "szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.13" = { + "@babel/plugin-transform-block-scoped-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; + sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.14.1" = { + "@babel/plugin-transform-block-scoping-7.15.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.14.1"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz"; - sha512 = "2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; + sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; }; }; - "@babel/plugin-transform-classes-7.13.0" = { + "@babel/plugin-transform-classes-7.15.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; - sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz"; + sha512 = "Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg=="; }; }; - "@babel/plugin-transform-computed-properties-7.13.0" = { + "@babel/plugin-transform-computed-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; + sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; }; }; - "@babel/plugin-transform-destructuring-7.13.17" = { + "@babel/plugin-transform-destructuring-7.14.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.13.17"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; - sha512 = "UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"; + sha512 = "0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.13" = { + "@babel/plugin-transform-dotall-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; + sha512 = "loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.13" = { + "@babel/plugin-transform-duplicate-keys-7.14.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; + sha512 = "iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.13" = { + "@babel/plugin-transform-exponentiation-operator-7.14.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; + sha512 = "jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="; }; }; - "@babel/plugin-transform-for-of-7.13.0" = { + "@babel/plugin-transform-for-of-7.15.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz"; + sha512 = "DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA=="; }; }; - "@babel/plugin-transform-function-name-7.12.13" = { + "@babel/plugin-transform-function-name-7.14.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; + sha512 = "vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="; }; }; - "@babel/plugin-transform-literals-7.12.13" = { + "@babel/plugin-transform-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; + sha512 = "ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.13" = { + "@babel/plugin-transform-member-expression-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; + sha512 = "WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="; }; }; - "@babel/plugin-transform-modules-amd-7.14.0" = { + "@babel/plugin-transform-modules-amd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz"; - sha512 = "CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; + sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.14.0" = { + "@babel/plugin-transform-modules-commonjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.14.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; - sha512 = "EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz"; + sha512 = "qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.13.8" = { + "@babel/plugin-transform-modules-systemjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.13.8"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz"; + sha512 = "fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw=="; }; }; - "@babel/plugin-transform-modules-umd-7.14.0" = { + "@babel/plugin-transform-modules-umd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; - sha512 = "nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; + sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.9" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.13"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; + sha512 = "l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="; }; }; - "@babel/plugin-transform-new-target-7.12.13" = { + "@babel/plugin-transform-new-target-7.14.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; + sha512 = "Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="; }; }; - "@babel/plugin-transform-object-super-7.12.13" = { + "@babel/plugin-transform-object-super-7.14.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; + sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; }; }; - "@babel/plugin-transform-parameters-7.13.0" = { + "@babel/plugin-transform-parameters-7.15.4" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; - sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz"; + sha512 = "9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ=="; }; }; - "@babel/plugin-transform-property-literals-7.12.13" = { + "@babel/plugin-transform-property-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; + sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; }; }; - "@babel/plugin-transform-regenerator-7.13.15" = { + "@babel/plugin-transform-regenerator-7.14.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.13.15"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; - sha512 = "Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; + sha512 = "NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.13" = { + "@babel/plugin-transform-reserved-words-7.14.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; + sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.13" = { + "@babel/plugin-transform-shorthand-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; + sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; }; }; - "@babel/plugin-transform-spread-7.13.0" = { + "@babel/plugin-transform-spread-7.14.6" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.13.0"; + version = "7.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz"; + sha512 = "Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.13" = { + "@babel/plugin-transform-sticky-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; + sha512 = "Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="; }; }; - "@babel/plugin-transform-template-literals-7.13.0" = { + "@babel/plugin-transform-template-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; + sha512 = "22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.13" = { + "@babel/plugin-transform-typeof-symbol-7.14.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; + sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.13" = { + "@babel/plugin-transform-unicode-escapes-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; + sha512 = "crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.13" = { + "@babel/plugin-transform-unicode-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; + sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.14.1" = { + "@babel/preset-env-7.15.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.1"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.1.tgz"; - sha512 = "0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz"; + sha512 = "4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -877,40 +886,40 @@ let sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; - "@babel/runtime-7.14.0" = { + "@babel/runtime-7.15.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz"; - sha512 = "JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz"; + sha512 = "99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw=="; }; }; - "@babel/template-7.12.13" = { + "@babel/template-7.15.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; - sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz"; + sha512 = "UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg=="; }; }; - "@babel/traverse-7.14.0" = { + "@babel/traverse-7.15.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz"; - sha512 = "dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz"; + sha512 = "W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA=="; }; }; - "@babel/types-7.14.1" = { + "@babel/types-7.15.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.1"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz"; - sha512 = "S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz"; + sha512 = "0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw=="; }; }; "@csstools/convert-colors-1.4.0" = { @@ -922,76 +931,58 @@ let sha512 = "5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="; }; }; - "@discoveryjs/json-ext-0.5.2" = { + "@discoveryjs/json-ext-0.5.3" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz"; - sha512 = "HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; + sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; }; }; - "@eslint/eslintrc-0.4.0" = { + "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.4.0"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@hapi/address-2.1.4" = { - name = "_at_hapi_slash_address"; - packageName = "@hapi/address"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; - sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; - }; - }; - "@hapi/bourne-1.3.2" = { - name = "_at_hapi_slash_bourne"; - packageName = "@hapi/bourne"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; - sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; - }; - }; - "@hapi/hoek-8.5.1" = { - name = "_at_hapi_slash_hoek"; - packageName = "@hapi/hoek"; - version = "8.5.1"; + "@gar/promisify-1.1.2" = { + name = "_at_gar_slash_promisify"; + packageName = "@gar/promisify"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; - sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz"; + sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; }; }; - "@hapi/joi-15.1.1" = { - name = "_at_hapi_slash_joi"; - packageName = "@hapi/joi"; - version = "15.1.1"; + "@humanwhocodes/config-array-0.5.0" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; - sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; }; - "@hapi/topo-3.1.6" = { - name = "_at_hapi_slash_topo"; - packageName = "@hapi/topo"; - version = "3.1.6"; + "@humanwhocodes/object-schema-1.2.0" = { + name = "_at_humanwhocodes_slash_object-schema"; + packageName = "@humanwhocodes/object-schema"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; - sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; + url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; + sha512 = "wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="; }; }; - "@mdn/browser-compat-data-2.0.7" = { + "@mdn/browser-compat-data-3.3.14" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "2.0.7"; + version = "3.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz"; - sha512 = "GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz"; + sha512 = "n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -1003,13 +994,13 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -1021,22 +1012,31 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; + }; + }; + "@npmcli/fs-1.0.0" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz"; + sha512 = "8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ=="; }; }; "@npmcli/move-file-1.1.2" = { @@ -1048,13 +1048,22 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@rollup/plugin-node-resolve-7.1.3" = { + "@rollup/plugin-babel-5.3.0" = { + name = "_at_rollup_slash_plugin-babel"; + packageName = "@rollup/plugin-babel"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz"; + sha512 = "9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw=="; + }; + }; + "@rollup/plugin-node-resolve-11.2.1" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; - version = "7.1.3"; + version = "11.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz"; - sha512 = "RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q=="; + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz"; + sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; }; }; "@rollup/plugin-replace-2.4.2" = { @@ -1102,31 +1111,22 @@ let sha512 = "yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A=="; }; }; - "@types/anymatch-1.3.1" = { - name = "_at_types_slash_anymatch"; - packageName = "@types/anymatch"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; - sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; - }; - }; - "@types/eslint-7.2.10" = { + "@types/eslint-7.28.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.10"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz"; - sha512 = "kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz"; + sha512 = "07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A=="; }; }; - "@types/eslint-scope-3.7.0" = { + "@types/eslint-scope-3.7.1" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz"; - sha512 = "O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha512 = "SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g=="; }; }; "@types/estree-0.0.39" = { @@ -1138,40 +1138,40 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.47" = { + "@types/estree-0.0.50" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.47"; + version = "0.0.50"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz"; - sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"; + sha512 = "C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="; }; }; - "@types/glob-7.1.3" = { + "@types/glob-7.1.4" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; - sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz"; + sha512 = "w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA=="; }; }; - "@types/html-minifier-terser-5.1.1" = { + "@types/html-minifier-terser-5.1.2" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha512 = "giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="; + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz"; + sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@types/json-schema-7.0.7" = { + "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.7"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; "@types/json5-0.0.29" = { @@ -1192,49 +1192,49 @@ let sha1 = "5e31c32dd8791ec4b9ff3ef47c9cb55b2d0d9438"; }; }; - "@types/mdast-3.0.3" = { + "@types/mdast-3.0.10" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.3"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz"; - sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz"; + sha512 = "W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA=="; }; }; - "@types/minimatch-3.0.4" = { + "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/minimist-1.2.1" = { + "@types/minimist-1.2.2" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz"; - sha512 = "fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg=="; + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; + sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/node-15.0.2" = { + "@types/node-16.7.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.0.2"; + version = "16.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz"; - sha512 = "p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz"; + sha512 = "S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA=="; }; }; - "@types/normalize-package-data-2.4.0" = { + "@types/normalize-package-data-2.4.1" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; + sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; }; }; "@types/parse-json-4.0.0" = { @@ -1246,22 +1246,22 @@ let sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; - "@types/q-1.5.4" = { + "@types/q-1.5.5" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"; - sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz"; + sha512 = "L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="; }; }; - "@types/resolve-0.0.8" = { + "@types/resolve-1.17.1" = { name = "_at_types_slash_resolve"; packageName = "@types/resolve"; - version = "0.0.8"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz"; - sha512 = "auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ=="; + url = "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"; + sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; }; }; "@types/source-list-map-0.1.2" = { @@ -1273,31 +1273,40 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/tapable-1.0.7" = { + "@types/tapable-1.0.8" = { name = "_at_types_slash_tapable"; packageName = "@types/tapable"; - version = "1.0.7"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz"; + sha512 = "ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="; + }; + }; + "@types/trusted-types-2.0.2" = { + name = "_at_types_slash_trusted-types"; + packageName = "@types/trusted-types"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.7.tgz"; - sha512 = "0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ=="; + url = "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz"; + sha512 = "F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="; }; }; - "@types/uglify-js-3.13.0" = { + "@types/uglify-js-3.13.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz"; - sha512 = "EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz"; + sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; }; }; - "@types/unist-2.0.3" = { + "@types/unist-2.0.6" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz"; - sha512 = "FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz"; + sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; }; "@types/vfile-3.0.2" = { @@ -1318,22 +1327,22 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/webpack-4.41.28" = { + "@types/webpack-4.41.30" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.28"; + version = "4.41.30"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.28.tgz"; - sha512 = "Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.30.tgz"; + sha512 = "GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA=="; }; }; - "@types/webpack-sources-2.1.0" = { + "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "2.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz"; - sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha512 = "Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="; }; }; "@uupaa/dynamic-import-polyfill-1.0.2" = { @@ -1345,166 +1354,166 @@ let sha512 = "V3vzdXunOKKob1F+2ldv/4iGQoQA/iyqtW8PVlr1v16xCCKL831pGUubT+vs5/9wxTE/zBKEhjIjmmpK6nqw2A=="; }; }; - "@webassemblyjs/ast-1.11.0" = { + "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz"; - sha512 = "kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg=="; + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"; + sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.11.0" = { + "@webassemblyjs/floating-point-hex-parser-1.11.1" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz"; - sha512 = "Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA=="; + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; + sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; }; }; - "@webassemblyjs/helper-api-error-1.11.0" = { + "@webassemblyjs/helper-api-error-1.11.1" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz"; - sha512 = "baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; + sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; }; }; - "@webassemblyjs/helper-buffer-1.11.0" = { + "@webassemblyjs/helper-buffer-1.11.1" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz"; - sha512 = "u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; + sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; }; }; - "@webassemblyjs/helper-numbers-1.11.0" = { + "@webassemblyjs/helper-numbers-1.11.1" = { name = "_at_webassemblyjs_slash_helper-numbers"; packageName = "@webassemblyjs/helper-numbers"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz"; - sha512 = "DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; + sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.11.0" = { + "@webassemblyjs/helper-wasm-bytecode-1.11.1" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz"; - sha512 = "MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; + sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; }; }; - "@webassemblyjs/helper-wasm-section-1.11.0" = { + "@webassemblyjs/helper-wasm-section-1.11.1" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz"; - sha512 = "3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; + sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; }; }; - "@webassemblyjs/ieee754-1.11.0" = { + "@webassemblyjs/ieee754-1.11.1" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz"; - sha512 = "KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA=="; + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; + sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; }; }; - "@webassemblyjs/leb128-1.11.0" = { + "@webassemblyjs/leb128-1.11.1" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz"; - sha512 = "aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g=="; + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; + sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; }; }; - "@webassemblyjs/utf8-1.11.0" = { + "@webassemblyjs/utf8-1.11.1" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz"; - sha512 = "A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw=="; + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; + sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; }; }; - "@webassemblyjs/wasm-edit-1.11.0" = { + "@webassemblyjs/wasm-edit-1.11.1" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz"; - sha512 = "JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; + sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; }; }; - "@webassemblyjs/wasm-gen-1.11.0" = { + "@webassemblyjs/wasm-gen-1.11.1" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz"; - sha512 = "BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; + sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; }; }; - "@webassemblyjs/wasm-opt-1.11.0" = { + "@webassemblyjs/wasm-opt-1.11.1" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz"; - sha512 = "tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; + sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; }; }; - "@webassemblyjs/wasm-parser-1.11.0" = { + "@webassemblyjs/wasm-parser-1.11.1" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz"; - sha512 = "6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; + sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; }; }; - "@webassemblyjs/wast-printer-1.11.0" = { + "@webassemblyjs/wast-printer-1.11.1" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz"; - sha512 = "Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; + sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; }; }; - "@webpack-cli/configtest-1.0.2" = { + "@webpack-cli/configtest-1.0.4" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz"; - sha512 = "3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; + sha512 = "cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ=="; }; }; - "@webpack-cli/info-1.2.3" = { + "@webpack-cli/info-1.3.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.2.3"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.3.tgz"; - sha512 = "lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz"; + sha512 = "ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w=="; }; }; - "@webpack-cli/serve-1.3.1" = { + "@webpack-cli/serve-1.5.2" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.3.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz"; - sha512 = "0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz"; + sha512 = "vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -1552,22 +1561,31 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.2.4" = { + "acorn-8.4.1" = { name = "acorn"; packageName = "acorn"; - version = "8.2.4"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz"; - sha512 = "Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz"; + sha512 = "asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="; }; }; - "acorn-jsx-5.3.1" = { + "acorn-import-assertions-1.7.6" = { + name = "acorn-import-assertions"; + packageName = "acorn-import-assertions"; + version = "1.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz"; + sha512 = "FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA=="; + }; + }; + "acorn-jsx-5.3.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; "aggregate-error-3.1.0" = { @@ -1588,13 +1606,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.2.0" = { + "ajv-8.6.2" = { name = "ajv"; packageName = "ajv"; - version = "8.2.0"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz"; - sha512 = "WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz"; + sha512 = "9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w=="; }; }; "ajv-errors-1.0.1" = { @@ -1858,13 +1876,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-metadata-inferer-0.4.0" = { + "ast-metadata-inferer-0.7.0" = { name = "ast-metadata-inferer"; packageName = "ast-metadata-inferer"; - version = "0.4.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz"; - sha512 = "tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg=="; + url = "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.7.0.tgz"; + sha512 = "OkMLzd8xelb3gmnp6ToFvvsHLtS6CbagTkFQvQ+ZYFe3/AIl9iKikNR9G7pY3GfOR/2Xc222hwBjzI7HLkE76Q=="; }; }; "astral-regex-1.0.0" = { @@ -1912,6 +1930,15 @@ let sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; + "at-least-node-1.0.0" = { + name = "at-least-node"; + packageName = "at-least-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; + }; + }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -1930,15 +1957,6 @@ let sha512 = "XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg=="; }; }; - "babel-extract-comments-1.0.0" = { - name = "babel-extract-comments"; - packageName = "babel-extract-comments"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz"; - sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; - }; - }; "babel-loader-8.2.2" = { name = "babel-loader"; packageName = "babel-loader"; @@ -1966,67 +1984,31 @@ let sha512 = "fqdut9hGeaAgdX3sbAY25TkqA7LPmZB+Hf1XI67AppvhUw1cBST58BPwl5kPwDZYIvmqRwnsVKM0lppsQAsxhg=="; }; }; - "babel-plugin-polyfill-corejs2-0.2.0" = { + "babel-plugin-polyfill-corejs2-0.2.2" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz"; - sha512 = "9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz"; + sha512 = "kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ=="; }; }; - "babel-plugin-polyfill-corejs3-0.2.0" = { + "babel-plugin-polyfill-corejs3-0.2.4" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.2.0"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz"; - sha512 = "zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz"; + sha512 = "z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ=="; }; }; - "babel-plugin-polyfill-regenerator-0.2.0" = { + "babel-plugin-polyfill-regenerator-0.2.2" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz"; - sha512 = "J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg=="; - }; - }; - "babel-plugin-syntax-object-rest-spread-6.13.0" = { - name = "babel-plugin-syntax-object-rest-spread"; - packageName = "babel-plugin-syntax-object-rest-spread"; - version = "6.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; - sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; - }; - }; - "babel-plugin-transform-object-rest-spread-6.26.0" = { - name = "babel-plugin-transform-object-rest-spread"; - packageName = "babel-plugin-transform-object-rest-spread"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; - sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; - }; - }; - "babel-runtime-6.26.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; - }; - }; - "babylon-6.18.0" = { - name = "babylon"; - packageName = "babylon"; - version = "6.18.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz"; + sha512 = "Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="; }; }; "bail-1.0.5" = { @@ -2110,13 +2092,13 @@ let sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; - "blurhash-1.1.3" = { + "blurhash-1.1.4" = { name = "blurhash"; packageName = "blurhash"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/blurhash/-/blurhash-1.1.3.tgz"; - sha512 = "yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw=="; + url = "https://registry.npmjs.org/blurhash/-/blurhash-1.1.4.tgz"; + sha512 = "MXIPz6zwYUKayju+Uidf83KhH0vodZfeRl6Ich8Gu+KGl0JgKiFq9LsfqV7cVU5fKD/AotmduZqvOfrGKOfTaA=="; }; }; "body-parser-1.19.0" = { @@ -2182,22 +2164,22 @@ let sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9"; }; }; - "browserslist-4.16.6" = { + "browserslist-4.17.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.6"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz"; - sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz"; + sha512 = "g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g=="; }; }; - "buffer-from-1.1.1" = { + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "buffer-indexof-1.1.1" = { @@ -2236,13 +2218,13 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; - "cacache-15.0.6" = { + "cacache-15.3.0" = { name = "cacache"; packageName = "cacache"; - version = "15.0.6"; + version = "15.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz"; - sha512 = "g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w=="; + url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"; + sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; "cache-base-1.0.1" = { @@ -2335,15 +2317,6 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.2.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; - sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; - }; - }; "camelcase-keys-4.2.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -2371,22 +2344,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-db-1.0.30001222" = { + "caniuse-db-1.0.30001255" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30001222"; + version = "1.0.30001255"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001222.tgz"; - sha512 = "ZLsTZ9Rqz407NLdjwqDnTq9SahH+eCu+qCXh91M+fK+7CgbNrz510I7RYCiG11SIklDxvvmD9BqvdPOA//y9Rg=="; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001255.tgz"; + sha512 = "+FV7TQX0PoThDIwNvRpoUbhmKJzAB8ZGc8xDNTRltvpbL7d7Si+HTOn1NDdZh4yw2JUqnV6LOYsAcG20lH7gGg=="; }; }; - "caniuse-lite-1.0.30001222" = { + "caniuse-lite-1.0.30001255" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001222"; + version = "1.0.30001255"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001222.tgz"; - sha512 = "rPmwUK0YMjfMlZVmH6nVB5U3YJ5Wnx3vmT5lnRO3nIKO8bJ+TRWMbGuuiSugDJqESy/lz+1hSrlQEagCtoOAWQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"; + sha512 = "F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ=="; }; }; "ccount-1.1.0" = { @@ -2416,13 +2389,13 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-4.1.1" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; - sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; "character-entities-1.2.4" = { @@ -2470,13 +2443,13 @@ let sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; - "chokidar-3.5.1" = { + "chokidar-3.5.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; - sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; + sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; }; }; "chownr-2.0.0" = { @@ -2606,13 +2579,13 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "color-3.1.3" = { + "color-3.2.1" = { name = "color"; packageName = "color"; - version = "3.1.3"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.3.tgz"; - sha512 = "xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ=="; + url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; }; "color-convert-1.9.3" = { @@ -2651,22 +2624,22 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.5" = { + "color-string-1.6.0" = { name = "color-string"; packageName = "color-string"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz"; - sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz"; + sha512 = "c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA=="; }; }; - "colorette-1.2.2" = { + "colorette-1.3.0" = { name = "colorette"; packageName = "colorette"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; - sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; + url = "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz"; + sha512 = "ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="; }; }; "commander-2.20.3" = { @@ -2768,15 +2741,6 @@ let sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; }; }; - "contains-path-0.1.0" = { - name = "contains-path"; - packageName = "contains-path"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - }; "content-disposition-0.5.3" = { name = "content-disposition"; packageName = "content-disposition"; @@ -2795,13 +2759,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convert-source-map-1.7.0" = { + "convert-source-map-1.8.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; "cookie-0.4.0" = { @@ -2840,40 +2804,31 @@ let sha512 = "MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA=="; }; }; - "core-js-2.6.12" = { - name = "core-js"; - packageName = "core-js"; - version = "2.6.12"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; - sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; - }; - }; - "core-js-3.11.2" = { + "core-js-3.17.2" = { name = "core-js"; packageName = "core-js"; - version = "3.11.2"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.11.2.tgz"; - sha512 = "3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.17.2.tgz"; + sha512 = "XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA=="; }; }; - "core-js-compat-3.11.2" = { + "core-js-compat-3.17.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.11.2"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.11.2.tgz"; - sha512 = "gYhNwu7AJjecNtRrIfyoBabQ3ZG+llfPmg9BifIX8yxIpDyfNLRM73zIjINSm6z3dMdI1nwNC9C7uiy4pIC6cw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.2.tgz"; + sha512 = "lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg=="; }; }; - "core-util-is-1.0.2" = { + "core-util-is-1.0.3" = { name = "core-util-is"; packageName = "core-util-is"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; }; "cosmiconfig-5.2.1" = { @@ -2885,13 +2840,13 @@ let sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; }; - "cosmiconfig-7.0.0" = { + "cosmiconfig-7.0.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; - sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; }; }; "cross-spawn-6.0.5" = { @@ -2912,13 +2867,13 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "crypto-random-string-1.0.0" = { + "crypto-random-string-2.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; - sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; }; }; "css-blank-pseudo-0.1.4" = { @@ -2957,13 +2912,13 @@ let sha512 = "Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ=="; }; }; - "css-loader-5.2.4" = { + "css-loader-5.2.7" = { name = "css-loader"; packageName = "css-loader"; - version = "5.2.4"; + version = "5.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-5.2.4.tgz"; - sha512 = "OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw=="; + url = "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz"; + sha512 = "Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg=="; }; }; "css-prefers-color-scheme-3.1.1" = { @@ -2984,6 +2939,15 @@ let sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; + "css-select-4.1.3" = { + name = "css-select"; + packageName = "css-select"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz"; + sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; + }; + }; "css-select-base-adapter-0.1.1" = { name = "css-select-base-adapter"; packageName = "css-select-base-adapter"; @@ -3020,6 +2984,15 @@ let sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; + "css-what-5.0.1" = { + name = "css-what"; + packageName = "css-what"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz"; + sha512 = "FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="; + }; + }; "cssdb-4.4.0" = { name = "cssdb"; packageName = "cssdb"; @@ -3128,13 +3101,13 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; - "date-fns-2.21.1" = { + "date-fns-2.23.0" = { name = "date-fns"; packageName = "date-fns"; - version = "2.21.1"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.21.1.tgz"; - sha512 = "m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA=="; + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz"; + sha512 = "5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA=="; }; }; "debug-2.6.9" = { @@ -3200,13 +3173,22 @@ let sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; - "deep-is-0.1.3" = { + "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; + }; + }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; }; "default-gateway-4.2.0" = { @@ -3281,13 +3263,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "detect-node-2.0.5" = { + "detect-node-2.1.0" = { name = "detect-node"; packageName = "detect-node"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz"; - sha512 = "qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw=="; + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; }; "dir-glob-2.2.2" = { @@ -3317,13 +3299,13 @@ let sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; }; }; - "dns-packet-1.3.1" = { + "dns-packet-1.3.4" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.3.1"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz"; + sha512 = "BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA=="; }; }; "dns-txt-2.0.2" = { @@ -3335,13 +3317,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "doctrine-1.5.0" = { + "doctrine-2.1.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.5.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; + sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; }; }; "doctrine-3.0.0" = { @@ -3371,13 +3353,13 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-serializer-1.3.1" = { + "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.1.tgz"; - sha512 = "Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; }; "dom7-3.0.0" = { @@ -3425,13 +3407,13 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.2.0" = { + "domhandler-4.2.2" = { name = "domhandler"; packageName = "domhandler"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz"; - sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; + sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; }; }; "domutils-1.7.0" = { @@ -3443,13 +3425,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.6.0" = { + "domutils-2.8.0" = { name = "domutils"; packageName = "domutils"; - version = "2.6.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz"; - sha512 = "y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; }; "dot-case-3.0.4" = { @@ -3488,13 +3470,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.726" = { + "electron-to-chromium-1.3.830" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.726"; + version = "1.3.830"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.726.tgz"; - sha512 = "dw7WmrSu/JwtACiBzth8cuKf62NKL1xVJuNvyOg0jvruN/n4NLtGYoTzciQquCPNaS2eR+BT5GrxHbslfc/w1w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz"; + sha512 = "gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ=="; }; }; "emoji-regex-7.0.3" = { @@ -3542,13 +3524,13 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "enhanced-resolve-5.8.0" = { + "enhanced-resolve-5.8.2" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.8.0"; + version = "5.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz"; - sha512 = "Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz"; + sha512 = "F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA=="; }; }; "enquirer-2.3.6" = { @@ -3614,22 +3596,22 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.18.0" = { + "es-abstract-1.18.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.0"; + version = "1.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz"; - sha512 = "LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz"; + sha512 = "DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA=="; }; }; - "es-module-lexer-0.4.1" = { + "es-module-lexer-0.7.1" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "0.4.1"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz"; - sha512 = "ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz"; + sha512 = "MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw=="; }; }; "es-to-primitive-1.2.1" = { @@ -3704,40 +3686,49 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "eslint-7.25.0" = { + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + }; + "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; - version = "7.25.0"; + version = "7.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz"; - sha512 = "TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-import-resolver-node-0.3.4" = { + "eslint-import-resolver-node-0.3.6" = { name = "eslint-import-resolver-node"; packageName = "eslint-import-resolver-node"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha512 = "ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="; + url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; + sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; }; }; - "eslint-module-utils-2.6.0" = { + "eslint-module-utils-2.6.2" = { name = "eslint-module-utils"; packageName = "eslint-module-utils"; - version = "2.6.0"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="; + url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz"; + sha512 = "QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q=="; }; }; - "eslint-plugin-compat-3.9.0" = { + "eslint-plugin-compat-3.13.0" = { name = "eslint-plugin-compat"; packageName = "eslint-plugin-compat"; - version = "3.9.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz"; - sha512 = "lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg=="; + url = "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.13.0.tgz"; + sha512 = "cv8IYMuTXm7PIjMVDN2y4k/KVnKZmoNGHNq27/9dLstOLydKblieIv+oe2BN2WthuXnFNhaNvv3N1Bvl4dbIGA=="; }; }; "eslint-plugin-eslint-comments-3.2.0" = { @@ -3749,13 +3740,13 @@ let sha512 = "0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ=="; }; }; - "eslint-plugin-import-2.22.1" = { + "eslint-plugin-import-2.24.2" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; - version = "2.22.1"; + version = "2.24.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; - sha512 = "8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="; + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz"; + sha512 = "hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q=="; }; }; "eslint-plugin-promise-4.3.1" = { @@ -3866,15 +3857,6 @@ let sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; }; - "estree-walker-0.6.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"; - sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; - }; - }; "estree-walker-1.0.1" = { name = "estree-walker"; packageName = "estree-walker"; @@ -3947,13 +3929,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-5.0.0" = { + "execa-5.1.1" = { name = "execa"; packageName = "execa"; - version = "5.0.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; - sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; "execall-1.0.0" = { @@ -4001,13 +3983,13 @@ let sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; }; - "ext-1.4.0" = { + "ext-1.5.0" = { name = "ext"; packageName = "ext"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; + sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; }; }; "extend-3.0.2" = { @@ -4064,13 +4046,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -4109,22 +4091,22 @@ let sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; }; }; - "fastq-1.11.0" = { + "fastq-1.12.0" = { name = "fastq"; packageName = "fastq"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; - sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz"; + sha512 = "VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg=="; }; }; - "faye-websocket-0.11.3" = { + "faye-websocket-0.11.4" = { name = "faye-websocket"; packageName = "faye-websocket"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"; + sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; }; }; "file-entry-cache-4.0.0" = { @@ -4190,13 +4172,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "find-cache-dir-3.3.1" = { + "find-cache-dir-3.3.2" = { name = "find-cache-dir"; packageName = "find-cache-dir"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; + sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; "find-up-2.1.0" = { @@ -4226,6 +4208,15 @@ let sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; + "find-up-5.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; + }; + }; "flat-cache-2.0.1" = { name = "flat-cache"; packageName = "flat-cache"; @@ -4253,13 +4244,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.1.1" = { + "flatted-3.2.2" = { name = "flatted"; packageName = "flatted"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; - sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz"; + sha512 = "JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="; }; }; "flatten-1.0.3" = { @@ -4271,22 +4262,22 @@ let sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; }; }; - "flv.js-1.5.0" = { + "flv.js-1.6.1" = { name = "flv.js"; packageName = "flv.js"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/flv.js/-/flv.js-1.5.0.tgz"; - sha512 = "7tFwccqkFXpA7RIED0KvuNny2qVnpuGc5nTGsRpzrCT+qtwIaZyciK5UgyvgtlAMYaPFzYS0wdI92JiSBKOyXw=="; + url = "https://registry.npmjs.org/flv.js/-/flv.js-1.6.1.tgz"; + sha512 = "6/ffUPbFaYf7QsdcZC43PQmEsi9Fwlp89Oq0bz8gNlj0eSMUhyHFxESxuLNSFgIEle+ChxqoF7kL2pL7xdam2A=="; }; }; - "follow-redirects-1.14.0" = { + "follow-redirects-1.14.3" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.0"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.0.tgz"; - sha512 = "0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz"; + sha512 = "3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="; }; }; "fontsource-noto-sans-3.1.5" = { @@ -4343,13 +4334,13 @@ let sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; "fragment-cache-0.2.1" = { @@ -4370,13 +4361,13 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; - "fs-extra-8.1.0" = { + "fs-extra-9.1.0" = { name = "fs-extra"; packageName = "fs-extra"; - version = "8.1.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; }; "fs-minipass-2.1.0" = { @@ -4523,13 +4514,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "glob-7.1.6" = { + "glob-7.1.7" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; "glob-parent-3.1.0" = { @@ -4595,31 +4586,22 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-12.4.0" = { - name = "globals"; - packageName = "globals"; - version = "12.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; - }; - }; - "globals-13.8.0" = { + "globals-13.11.0" = { name = "globals"; packageName = "globals"; - version = "13.8.0"; + version = "13.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; - sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + url = "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz"; + sha512 = "08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g=="; }; }; - "globby-11.0.3" = { + "globby-11.0.4" = { name = "globby"; packageName = "globby"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; - sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; + sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; "globby-6.1.0" = { @@ -4658,13 +4640,13 @@ let sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; }; }; - "graceful-fs-4.2.6" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "handle-thing-2.0.1" = { @@ -4748,6 +4730,15 @@ let sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + }; + }; "has-value-0.3.1" = { name = "has-value"; packageName = "has-value"; @@ -4937,6 +4928,15 @@ let sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; }; }; + "htmlparser2-6.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; + }; + }; "http-deceiver-1.2.7" = { name = "http-deceiver"; packageName = "http-deceiver"; @@ -5009,13 +5009,13 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "iconv-lite-0.6.2" = { + "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; "icss-utils-5.1.0" = { @@ -5027,6 +5027,15 @@ let sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; }; }; + "idb-6.1.3" = { + name = "idb"; + packageName = "idb"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/idb/-/idb-6.1.3.tgz"; + sha512 = "oIRDpVcs5KXpI1hRnTJUwkY63RB/7iqu9nSNuzXN8TLHjs7oO20IoPFbBTsqxIL5IjzIUDi+FXlVcK4zm26J8A=="; + }; + }; "ignore-4.0.6" = { name = "ignore"; packageName = "ignore"; @@ -5216,6 +5225,15 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; + "internal-slot-1.0.3" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; "interpret-2.2.0" = { name = "interpret"; packageName = "interpret"; @@ -5333,13 +5351,13 @@ let sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A=="; }; }; - "is-arguments-1.1.0" = { + "is-arguments-1.1.1" = { name = "is-arguments"; packageName = "is-arguments"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; - sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; + sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; "is-arrayish-0.2.1" = { @@ -5360,13 +5378,13 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; - "is-bigint-1.0.2" = { + "is-bigint-1.0.4" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz"; - sha512 = "0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; }; }; "is-binary-path-1.0.1" = { @@ -5387,13 +5405,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-boolean-object-1.1.0" = { + "is-boolean-object-1.1.2" = { name = "is-boolean-object"; packageName = "is-boolean-object"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; - sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; }; "is-buffer-1.1.6" = { @@ -5414,13 +5432,13 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; - "is-callable-1.2.3" = { + "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; - sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; "is-color-stop-1.1.0" = { @@ -5432,13 +5450,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.3.0" = { + "is-core-module-2.6.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.3.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz"; - sha512 = "xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; + sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -5459,13 +5477,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.2" = { + "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; "is-decimal-1.0.4" = { @@ -5612,13 +5630,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.4" = { + "is-number-object-1.0.6" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; - sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; }; }; "is-obj-1.0.1" = { @@ -5693,13 +5711,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-regex-1.1.2" = { + "is-regex-1.1.4" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; - sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; }; "is-regexp-1.0.0" = { @@ -5738,22 +5756,22 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-stream-2.0.0" = { + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; - "is-string-1.0.5" = { + "is-string-1.0.7" = { name = "is-string"; packageName = "is-string"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; - sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; }; "is-supported-regexp-flag-1.0.1" = { @@ -5765,13 +5783,13 @@ let sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ=="; }; }; - "is-symbol-1.0.3" = { + "is-symbol-1.0.4" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; "is-typedarray-1.0.0" = { @@ -5882,22 +5900,22 @@ let sha512 = "fwAF1G89amm3uO2Yw0E26fW5X6JoyRUnOdBEeuSN04/NpdKKVHD4u53dgqF0jHzXNuKdn5eh0AuV37cMKzBanA=="; }; }; - "jest-worker-24.9.0" = { + "jest-worker-26.6.2" = { name = "jest-worker"; packageName = "jest-worker"; - version = "24.9.0"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz"; - sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; + sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-26.6.2" = { + "jest-worker-27.1.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.6.2"; + version = "27.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.0.tgz"; + sha512 = "mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg=="; }; }; "jquery-3.6.0" = { @@ -5972,6 +5990,15 @@ let sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; + "json-schema-0.3.0" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.3.0.tgz"; + sha512 = "TYfxx36xfl52Rf1LU9HyWSLGPdYLL+SQ8/E/0yVyKG8wCCDaSrhPap0vEdlsZWRaS6tnKKLPGiEJGiREVC8kxQ=="; + }; + }; "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -6026,31 +6053,40 @@ let sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; }; - "jsonfile-4.0.0" = { + "jsonfile-6.1.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "4.0.0"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + }; + "jsonpointer-4.1.0" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz"; + sha512 = "CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="; }; }; - "jstree-3.3.11" = { + "jstree-3.3.12" = { name = "jstree"; packageName = "jstree"; - version = "3.3.11"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/jstree/-/jstree-3.3.11.tgz"; - sha512 = "9ZJKroPjCyjb6JLPuAbBrLJKT6pS1f4m5gkwoEagG5oQWtvzm0IiDsntXTxeFtz7AmqrKfij+gLfF9MgWriNxg=="; + url = "https://registry.npmjs.org/jstree/-/jstree-3.3.12.tgz"; + sha512 = "vHNLWkUr02ZYH7RcIckvhtLUtneWCVEtIKpIp2G9WtRh01ITv18EoNtNQcFG3ozM+oK6wp1Z300gSLXNQWCqGA=="; }; }; - "jszip-3.6.0" = { + "jszip-3.7.1" = { name = "jszip"; packageName = "jszip"; - version = "3.6.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz"; - sha512 = "jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz"; + sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg=="; }; }; "killable-1.0.1" = { @@ -6134,6 +6170,15 @@ let sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; + "leven-3.1.0" = { + name = "leven"; + packageName = "leven"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; + }; + }; "levn-0.4.1" = { name = "levn"; packageName = "levn"; @@ -6189,15 +6234,6 @@ let sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; }; }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; "load-json-file-4.0.0" = { name = "load-json-file"; packageName = "load-json-file"; @@ -6234,13 +6270,13 @@ let sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; }; - "localforage-1.9.0" = { + "localforage-1.10.0" = { name = "localforage"; packageName = "localforage"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz"; - sha512 = "rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g=="; + url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz"; + sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; }; }; "locate-path-2.0.0" = { @@ -6270,6 +6306,15 @@ let sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; + "locate-path-6.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -6279,15 +6324,6 @@ let sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; - "lodash._reinterpolate-3.0.0" = { - name = "lodash._reinterpolate"; - packageName = "lodash._reinterpolate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; - }; - }; "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; @@ -6306,15 +6342,6 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; - "lodash.flatten-4.4.0" = { - name = "lodash.flatten"; - packageName = "lodash.flatten"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; - }; - }; "lodash.memoize-4.1.2" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -6324,22 +6351,22 @@ let sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; }; }; - "lodash.template-4.5.0" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "4.5.0"; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; - sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; - "lodash.templatesettings-4.2.0" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "4.2.0"; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; - sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; }; "lodash.truncate-4.4.2" = { @@ -6711,22 +6738,22 @@ let sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; }; }; - "mime-db-1.47.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.47.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz"; - sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; - "mime-types-2.1.30" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.30"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz"; - sha512 = "crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "mimic-fn-2.1.0" = { @@ -6909,22 +6936,22 @@ let sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; }; }; - "nan-2.14.2" = { + "nan-2.15.0" = { name = "nan"; packageName = "nan"; - version = "2.14.2"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; - sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; + url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; }; }; - "nanoid-3.1.22" = { + "nanoid-3.1.25" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.22"; + version = "3.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz"; - sha512 = "/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; + sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; }; }; "nanomatch-1.2.13" = { @@ -7008,13 +7035,13 @@ let sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; }; - "node-releases-1.1.71" = { + "node-releases-1.1.75" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.71"; + version = "1.1.75"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz"; - sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz"; + sha512 = "Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="; }; }; "normalize-package-data-2.5.0" = { @@ -7026,13 +7053,13 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; - "normalize-package-data-3.0.2" = { + "normalize-package-data-3.0.3" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; - sha512 = "6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; }; }; "normalize-path-2.1.1" = { @@ -7107,6 +7134,15 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; + "nth-check-2.0.0" = { + name = "nth-check"; + packageName = "nth-check"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz"; + sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q=="; + }; + }; "num2fraction-1.2.2" = { name = "num2fraction"; packageName = "num2fraction"; @@ -7134,13 +7170,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.10.2" = { + "object-inspect-1.11.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz"; - sha512 = "gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; + sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; }; }; "object-is-1.1.5" = { @@ -7197,13 +7233,13 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; - "object.values-1.1.3" = { + "object.values-1.1.4" = { name = "object.values"; packageName = "object.values"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz"; - sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz"; + sha512 = "TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg=="; }; }; "obuf-1.1.2" = { @@ -7341,6 +7377,15 @@ let sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; + "p-locate-5.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; + }; + }; "p-map-2.1.0" = { name = "p-map"; packageName = "p-map"; @@ -7440,15 +7485,6 @@ let sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ=="; }; }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; "parse-json-4.0.0" = { name = "parse-json"; packageName = "parse-json"; @@ -7557,13 +7593,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-0.1.7" = { @@ -7584,15 +7620,6 @@ let sha1 = "b33705c140234d873c8721c7b9fd8b541ed3aff9"; }; }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; "path-type-3.0.0" = { name = "path-type"; packageName = "path-type"; @@ -7629,13 +7656,13 @@ let sha512 = "xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw=="; }; }; - "picomatch-2.2.3" = { + "picomatch-2.3.0" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz"; - sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; }; }; "pify-2.3.0" = { @@ -7710,6 +7737,15 @@ let sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; }; + "pkg-up-2.0.0" = { + name = "pkg-up"; + packageName = "pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + }; "plur-2.1.2" = { name = "plur"; packageName = "plur"; @@ -7746,22 +7782,22 @@ let sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="; }; }; - "postcss-7.0.35" = { + "postcss-7.0.36" = { name = "postcss"; packageName = "postcss"; - version = "7.0.35"; + version = "7.0.36"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz"; + sha512 = "BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw=="; }; }; - "postcss-8.2.13" = { + "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; - version = "8.2.13"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz"; - sha512 = "FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; "postcss-attribute-case-insensitive-4.0.2" = { @@ -8448,13 +8484,13 @@ let sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ=="; }; }; - "postcss-selector-parser-6.0.5" = { + "postcss-selector-parser-6.0.6" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; - sha512 = "aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; }; }; "postcss-sorting-4.1.0" = { @@ -8583,13 +8619,13 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; "prr-1.0.1" = { @@ -8727,15 +8763,6 @@ let sha1 = "25eccff3a153b6809afacb23ee15387db9e0ee61"; }; }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; "read-pkg-3.0.0" = { name = "read-pkg"; packageName = "read-pkg"; @@ -8754,15 +8781,6 @@ let sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; }; }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; "read-pkg-up-3.0.0" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -8808,22 +8826,22 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.5.0" = { + "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; - sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; - "rechoir-0.7.0" = { + "rechoir-0.7.1" = { name = "rechoir"; packageName = "rechoir"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; - sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"; + sha512 = "/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg=="; }; }; "redent-2.0.0" = { @@ -8862,22 +8880,13 @@ let sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; - "regenerator-runtime-0.11.1" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; - }; - }; - "regenerator-runtime-0.13.8" = { + "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.8"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz"; - sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "regenerator-transform-0.14.5" = { @@ -8907,13 +8916,13 @@ let sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; }; }; - "regexpp-3.1.0" = { + "regexpp-3.2.0" = { name = "regexpp"; packageName = "regexpp"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; - sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; "regexpu-core-4.7.1" = { @@ -9015,13 +9024,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "renderkid-2.0.5" = { + "renderkid-2.0.7" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz"; - sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz"; + sha512 = "oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ=="; }; }; "repeat-element-1.1.4" = { @@ -9231,40 +9240,22 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; - "rollup-1.32.1" = { + "rollup-2.56.3" = { name = "rollup"; packageName = "rollup"; - version = "1.32.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz"; - sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; - }; - }; - "rollup-plugin-babel-4.4.0" = { - name = "rollup-plugin-babel"; - packageName = "rollup-plugin-babel"; - version = "4.4.0"; + version = "2.56.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz"; - sha512 = "Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"; + sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg=="; }; }; - "rollup-plugin-terser-5.3.1" = { + "rollup-plugin-terser-7.0.2" = { name = "rollup-plugin-terser"; packageName = "rollup-plugin-terser"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz"; - sha512 = "1pkwkervMJQGFYvM9nscrUoncPwiKR/K+bHdjv6PFgRo3cgPHoRT83y2Aa3GvINj4539S15t/tpFPb775TDs6w=="; - }; - }; - "rollup-pluginutils-2.8.2" = { - name = "rollup-pluginutils"; - packageName = "rollup-pluginutils"; - version = "2.8.2"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"; - sha512 = "EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ=="; + url = "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"; + sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; }; }; "run-parallel-1.2.0" = { @@ -9303,22 +9294,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.32.12" = { + "sass-1.39.0" = { name = "sass"; packageName = "sass"; - version = "1.32.12"; + version = "1.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz"; - sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz"; + sha512 = "F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg=="; }; }; - "sass-loader-10.1.1" = { + "sass-loader-10.2.0" = { name = "sass-loader"; packageName = "sass-loader"; - version = "10.1.1"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz"; - sha512 = "W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz"; + sha512 = "kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="; }; }; "sax-1.2.4" = { @@ -9348,13 +9339,13 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; - "schema-utils-3.0.0" = { + "schema-utils-3.1.1" = { name = "schema-utils"; packageName = "schema-utils"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz"; - sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"; + sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; }; }; "screenfull-5.1.0" = { @@ -9411,15 +9402,6 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.2" = { - name = "semver"; - packageName = "semver"; - version = "7.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; - sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; - }; - }; "semver-7.3.5" = { name = "semver"; packageName = "semver"; @@ -9456,6 +9438,15 @@ let sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; }; + "serialize-javascript-6.0.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; + }; + }; "serve-index-1.9.1" = { name = "serve-index"; packageName = "serve-index"; @@ -9564,6 +9555,15 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; "signal-exit-3.0.3" = { name = "signal-exit"; packageName = "signal-exit"; @@ -9654,22 +9654,22 @@ let sha512 = "DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw=="; }; }; - "sockjs-client-1.5.1" = { + "sockjs-client-1.5.2" = { name = "sockjs-client"; packageName = "sockjs-client"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.1.tgz"; - sha512 = "VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ=="; + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.2.tgz"; + sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; }; }; - "sortablejs-1.13.0" = { + "sortablejs-1.14.0" = { name = "sortablejs"; packageName = "sortablejs"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz"; - sha512 = "RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg=="; + url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz"; + sha512 = "pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="; }; }; "source-list-map-2.0.1" = { @@ -9708,6 +9708,24 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; + "source-map-0.8.0-beta.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.8.0-beta.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz"; + sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; + }; + }; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + }; + }; "source-map-loader-1.1.3" = { name = "source-map-loader"; packageName = "source-map-loader"; @@ -9780,13 +9798,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.7" = { + "spdx-license-ids-3.0.10" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.7"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; - sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; }; }; "spdy-4.0.2" = { @@ -9987,13 +10005,13 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; - "strip-comments-1.0.2" = { + "strip-comments-2.0.1" = { name = "strip-comments"; packageName = "strip-comments"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz"; - sha512 = "kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw=="; + url = "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz"; + sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; }; }; "strip-eof-1.0.0" = { @@ -10131,13 +10149,13 @@ let sha512 = "sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw=="; }; }; - "stylelint-scss-3.19.0" = { + "stylelint-scss-3.20.1" = { name = "stylelint-scss"; packageName = "stylelint-scss"; - version = "3.19.0"; + version = "3.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz"; - sha512 = "Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw=="; + url = "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.20.1.tgz"; + sha512 = "OTd55O1TTAC5nGKkVmUDLpz53LlK39R3MImv1CfuvsK7/qugktqiZAeQLuuC4UBhzxCnsc7fp9u/gfRZwFAIkA=="; }; }; "sugarss-2.0.0" = { @@ -10194,6 +10212,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; "svg-tags-1.0.0" = { name = "svg-tags"; packageName = "svg-tags"; @@ -10212,13 +10239,13 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; - "swiper-6.5.9" = { + "swiper-6.8.4" = { name = "swiper"; packageName = "swiper"; - version = "6.5.9"; + version = "6.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/swiper/-/swiper-6.5.9.tgz"; - sha512 = "zO3UCLVEiOXZontAQWBNpWFZGV3WaXwHSgvng0qIGLVMyxYGD6w78S7YkGAu/XBam1SBQNZzxqfFc/LDjNdq/A=="; + url = "https://registry.npmjs.org/swiper/-/swiper-6.8.4.tgz"; + sha512 = "O+buF9Q+sMA0H7luMS8R59hCaJKlpo8PXhQ6ZYu6Rn2v9OsFd4d1jmrv14QvxtQpKAvL/ZiovEeANI/uDGet7g=="; }; }; "table-5.4.6" = { @@ -10230,13 +10257,13 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.6.0" = { + "table-6.7.1" = { name = "table"; packageName = "table"; - version = "6.6.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.6.0.tgz"; - sha512 = "iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg=="; + url = "https://registry.npmjs.org/table/-/table-6.7.1.tgz"; + sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; }; }; "tapable-1.1.3" = { @@ -10257,31 +10284,31 @@ let sha512 = "FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="; }; }; - "tar-6.1.0" = { + "tar-6.1.11" = { name = "tar"; packageName = "tar"; - version = "6.1.0"; + version = "6.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; - sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; - "temp-dir-1.0.0" = { + "temp-dir-2.0.0" = { name = "temp-dir"; packageName = "temp-dir"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; - sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz"; + sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; }; }; - "tempy-0.3.0" = { + "tempy-0.6.0" = { name = "tempy"; packageName = "tempy"; - version = "0.3.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz"; - sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; + url = "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz"; + sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; }; }; "terser-4.8.0" = { @@ -10293,22 +10320,22 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.7.0" = { + "terser-5.7.2" = { name = "terser"; packageName = "terser"; - version = "5.7.0"; + version = "5.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz"; - sha512 = "HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g=="; + url = "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz"; + sha512 = "0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw=="; }; }; - "terser-webpack-plugin-5.1.1" = { + "terser-webpack-plugin-5.2.3" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.1.1"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz"; - sha512 = "5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.3.tgz"; + sha512 = "eDbuaDlXhVaaoKuLD3DTNTozKqln6xOG6Us0SzlKG5tNlazG+/cdl8pm9qiF1Di89iWScTI0HcO+CDcf2dkXiw=="; }; }; "text-table-0.2.0" = { @@ -10392,6 +10419,15 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; + "tr46-1.0.1" = { + name = "tr46"; + packageName = "tr46"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -10410,13 +10446,13 @@ let sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; }; }; - "trim-newlines-3.0.0" = { + "trim-newlines-3.0.1" = { name = "trim-newlines"; packageName = "trim-newlines"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz"; - sha512 = "C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA=="; + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; }; }; "trim-trailing-lines-1.1.4" = { @@ -10437,22 +10473,22 @@ let sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; }; }; - "tsconfig-paths-3.9.0" = { + "tsconfig-paths-3.11.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.9.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; + sha512 = "7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA=="; }; }; - "tslib-2.2.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz"; - sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "type-1.2.0" = { @@ -10482,6 +10518,15 @@ let sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; }; }; + "type-fest-0.16.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz"; + sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="; + }; + }; "type-fest-0.18.1" = { name = "type-fest"; packageName = "type-fest"; @@ -10500,15 +10545,6 @@ let sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; }; - "type-fest-0.3.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz"; - sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; - }; - }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -10608,13 +10644,13 @@ let sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw=="; }; }; - "unified-9.2.1" = { + "unified-9.2.2" = { name = "unified"; packageName = "unified"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz"; - sha512 = "juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA=="; + url = "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz"; + sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; }; }; "union-value-1.0.1" = { @@ -10662,13 +10698,13 @@ let sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; - "unique-string-1.0.0" = { + "unique-string-2.0.0" = { name = "unique-string"; packageName = "unique-string"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + url = "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; }; "unist-util-find-all-after-1.0.5" = { @@ -10752,13 +10788,13 @@ let sha512 = "DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g=="; }; }; - "universalify-0.1.2" = { + "universalify-2.0.0" = { name = "universalify"; packageName = "universalify"; - version = "0.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; }; "unpipe-1.0.0" = { @@ -10824,22 +10860,22 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; - "url-parse-1.5.1" = { + "url-parse-1.5.3" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz"; - sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz"; + sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ=="; }; }; - "url-toolkit-2.2.2" = { + "url-toolkit-2.2.3" = { name = "url-toolkit"; packageName = "url-toolkit"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.2.tgz"; - sha512 = "l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug=="; + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz"; + sha512 = "Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="; }; }; "use-3.1.1" = { @@ -10986,13 +11022,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "watchpack-2.1.1" = { + "watchpack-2.2.0" = { name = "watchpack"; packageName = "watchpack"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz"; - sha512 = "Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz"; + sha512 = "up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA=="; }; }; "wbuf-1.7.3" = { @@ -11013,22 +11049,31 @@ let sha1 = "2116fbfa1468ec416a7befdaa333e1d118f69c04"; }; }; - "webpack-5.36.2" = { + "webidl-conversions-4.0.2" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; + }; + }; + "webpack-5.52.0" = { name = "webpack"; packageName = "webpack"; - version = "5.36.2"; + version = "5.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.36.2.tgz"; - sha512 = "XJumVnnGoH2dV+Pk1VwgY4YT6AiMKpVoudUFCNOXMIVrEKPUgEwdIfWPjIuGLESAiS8EdIHX5+TiJz/5JccmRg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.52.0.tgz"; + sha512 = "yRZOat8jWGwBwHpco3uKQhVU7HYaNunZiJ4AkAVQkPCUGoZk/tiIXiwG+8HIy/F+qsiZvSOa+GLQOj3q5RKRYg=="; }; }; - "webpack-cli-4.6.0" = { + "webpack-cli-4.8.0" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.6.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.6.0.tgz"; - sha512 = "9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; }; }; "webpack-dev-middleware-3.7.3" = { @@ -11067,13 +11112,13 @@ let sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; }; }; - "webpack-merge-5.7.3" = { + "webpack-merge-5.8.0" = { name = "webpack-merge"; packageName = "webpack-merge"; - version = "5.7.3"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz"; - sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; }; }; "webpack-sources-1.4.3" = { @@ -11085,13 +11130,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "webpack-sources-2.2.0" = { + "webpack-sources-3.2.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "2.2.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz"; - sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha512 = "fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw=="; }; }; "websocket-driver-0.7.4" = { @@ -11112,13 +11157,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webworkify-1.5.0" = { - name = "webworkify"; - packageName = "webworkify"; - version = "1.5.0"; + "webworkify-webpack-2.1.5" = { + name = "webworkify-webpack"; + packageName = "webworkify-webpack"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz"; - sha512 = "AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g=="; + url = "https://registry.npmjs.org/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz"; + sha512 = "2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="; }; }; "whatwg-fetch-3.6.2" = { @@ -11139,6 +11184,15 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; + "whatwg-url-7.1.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz"; + sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -11193,40 +11247,40 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "workbox-background-sync-5.1.4" = { + "workbox-background-sync-6.2.4" = { name = "workbox-background-sync"; packageName = "workbox-background-sync"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-5.1.4.tgz"; - sha512 = "AH6x5pYq4vwQvfRDWH+vfOePfPIYQ00nCEB7dJRU1e0n9+9HMRyvI63FlDvtFT2AvXVRsXvUt7DNMEToyJLpSA=="; + url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.2.4.tgz"; + sha512 = "uoGgm1PZU6THRzXKlMEntrdA4Xkp6SCfxI7re4heN+yGrtAZq6zMKYhZmsdeW+YGnXS3y5xj7WV03b5TDgLh6A=="; }; }; - "workbox-broadcast-update-5.1.4" = { + "workbox-broadcast-update-6.2.4" = { name = "workbox-broadcast-update"; packageName = "workbox-broadcast-update"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-5.1.4.tgz"; - sha512 = "HTyTWkqXvHRuqY73XrwvXPud/FN6x3ROzkfFPsRjtw/kGZuZkPzfeH531qdUGfhtwjmtO/ZzXcWErqVzJNdXaA=="; + url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.2.4.tgz"; + sha512 = "0EpML2lbxNkiZUoap4BJDA0Hfz36MhtUd/rRhFvF6YWoRbTQ8tc6tMaRgM1EBIUmIN2OX9qQlkqe5SGGt4lfXQ=="; }; }; - "workbox-build-5.1.4" = { + "workbox-build-6.2.4" = { name = "workbox-build"; packageName = "workbox-build"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-build/-/workbox-build-5.1.4.tgz"; - sha512 = "xUcZn6SYU8usjOlfLb9Y2/f86Gdo+fy1fXgH8tJHjxgpo53VVsqRX0lUDw8/JuyzNmXuo8vXX14pXX2oIm9Bow=="; + url = "https://registry.npmjs.org/workbox-build/-/workbox-build-6.2.4.tgz"; + sha512 = "01ZbY1BHi+yYvu4yDGZBw9xm1bWyZW0QGWPxiksvSPAsNH/z/NwgtWW14YEroFyG98mmXb7pufWlwl40zE1KTw=="; }; }; - "workbox-cacheable-response-5.1.4" = { + "workbox-cacheable-response-6.2.4" = { name = "workbox-cacheable-response"; packageName = "workbox-cacheable-response"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-5.1.4.tgz"; - sha512 = "0bfvMZs0Of1S5cdswfQK0BXt6ulU5kVD4lwer2CeI+03czHprXR3V4Y8lPTooamn7eHP8Iywi5QjyAMjw0qauA=="; + url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.2.4.tgz"; + sha512 = "KZSzAOmgWsrk15Wu+geCUSGLIyyzHaORKjH5JnR6qcVZAsm0JXUu2m2OZGqjQ+/eyQwrGdXXqAMW+4wQvTXccg=="; }; }; "workbox-core-5.1.4" = { @@ -11238,31 +11292,40 @@ let sha512 = "+4iRQan/1D8I81nR2L5vcbaaFskZC2CL17TLbvWVzQ4qiF/ytOGF6XeV54pVxAvKUtkLANhk8TyIUMtiMw2oDg=="; }; }; - "workbox-expiration-5.1.4" = { + "workbox-core-6.2.4" = { + name = "workbox-core"; + packageName = "workbox-core"; + version = "6.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-core/-/workbox-core-6.2.4.tgz"; + sha512 = "Nu8X4R4Is3g8uzEJ6qwbW2CGVpzntW/cSf8OfsQGIKQR0nt84FAKzP2cLDaNLp3L/iV9TuhZgCTZzkMiap5/OQ=="; + }; + }; + "workbox-expiration-6.2.4" = { name = "workbox-expiration"; packageName = "workbox-expiration"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-5.1.4.tgz"; - sha512 = "oDO/5iC65h2Eq7jctAv858W2+CeRW5e0jZBMNRXpzp0ZPvuT6GblUiHnAsC5W5lANs1QS9atVOm4ifrBiYY7AQ=="; + url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.2.4.tgz"; + sha512 = "EdOBLunrE3+Ff50y7AYDbiwtiLDvB+oEIkL1Wd9G5d176YVqFfgPfMRzJQ7fN+Yy2NfmsFME0Bw+dQruYekWsQ=="; }; }; - "workbox-google-analytics-5.1.4" = { + "workbox-google-analytics-6.2.4" = { name = "workbox-google-analytics"; packageName = "workbox-google-analytics"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-5.1.4.tgz"; - sha512 = "0IFhKoEVrreHpKgcOoddV+oIaVXBFKXUzJVBI+nb0bxmcwYuZMdteBTp8AEDJacENtc9xbR0wa9RDCnYsCDLjA=="; + url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.2.4.tgz"; + sha512 = "+PWmTouoGGcDupaxM193F2NmgrF597Pyt9eHIDxfed+x+JSSeUkETlbAKwB8rnBHkAjs8JQcvStEP/IpueNKpQ=="; }; }; - "workbox-navigation-preload-5.1.4" = { + "workbox-navigation-preload-6.2.4" = { name = "workbox-navigation-preload"; packageName = "workbox-navigation-preload"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-5.1.4.tgz"; - sha512 = "Wf03osvK0wTflAfKXba//QmWC5BIaIZARU03JIhAEO2wSB2BDROWI8Q/zmianf54kdV7e1eLaIEZhth4K4MyfQ=="; + url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.2.4.tgz"; + sha512 = "y2dOSsaSdEimqhCmBIFR6kBp+GZbtNtWCBaMFwfKxTAul2uyllKcTKBHnZ9IzxULue6o6voV+I2U8Y8tO8n+eA=="; }; }; "workbox-precaching-5.1.4" = { @@ -11274,76 +11337,94 @@ let sha512 = "gCIFrBXmVQLFwvAzuGLCmkUYGVhBb7D1k/IL7pUJUO5xacjLcFUaLnnsoVepBGAiKw34HU1y/YuqvTKim9qAZA=="; }; }; - "workbox-range-requests-5.1.4" = { + "workbox-precaching-6.2.4" = { + name = "workbox-precaching"; + packageName = "workbox-precaching"; + version = "6.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.2.4.tgz"; + sha512 = "7POznbVc8EG/mkbXzeb94x3B1VJruPgXvXFgS0NJ3GRugkO4ULs/DpIIb+ycs7uJIKY9EzLS7VXvElr3rMSozQ=="; + }; + }; + "workbox-range-requests-6.2.4" = { name = "workbox-range-requests"; packageName = "workbox-range-requests"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-5.1.4.tgz"; - sha512 = "1HSujLjgTeoxHrMR2muDW2dKdxqCGMc1KbeyGcmjZZAizJTFwu7CWLDmLv6O1ceWYrhfuLFJO+umYMddk2XMhw=="; + url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.2.4.tgz"; + sha512 = "q4jjTXD1QOKbrHnzV3nxdZtIpOiVoIP5QyVmjuJrybVnAZurtyKcqirTQcAcT/zlTvgwm07zcTTk9o/zIB6DmA=="; }; }; - "workbox-routing-5.1.4" = { + "workbox-recipes-6.2.4" = { + name = "workbox-recipes"; + packageName = "workbox-recipes"; + version = "6.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.2.4.tgz"; + sha512 = "z7oECGrt940dw1Bv0xIDJEXY1xARiaxsIedeJOutZFkbgaC/yWG61VTr/hmkeJ8Nx6jnY6W7Rc0iOUvg4sePag=="; + }; + }; + "workbox-routing-6.2.4" = { name = "workbox-routing"; packageName = "workbox-routing"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-5.1.4.tgz"; - sha512 = "8ljknRfqE1vEQtnMtzfksL+UXO822jJlHTIR7+BtJuxQ17+WPZfsHqvk1ynR/v0EHik4x2+826Hkwpgh4GKDCw=="; + url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.2.4.tgz"; + sha512 = "jHnOmpeH4MOWR4eXv6l608npD2y6IFv7yFJ1bT9/RbB8wq2vXHXJQ0ExTZRTWGbVltSG22wEU+MQ8VebDDwDeg=="; }; }; - "workbox-strategies-5.1.4" = { + "workbox-strategies-6.2.4" = { name = "workbox-strategies"; packageName = "workbox-strategies"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-5.1.4.tgz"; - sha512 = "VVS57LpaJTdjW3RgZvPwX0NlhNmscR7OQ9bP+N/34cYMDzXLyA6kqWffP6QKXSkca1OFo/v6v7hW7zrrguo6EA=="; + url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.2.4.tgz"; + sha512 = "DKgGC3ruceDuu2o+Ae5qmJy0p0q21mFP+RrkdqKrjyf2u8cJvvtvt1eIt4nevKc5BESiKxmhC2h+TZpOSzUDvA=="; }; }; - "workbox-streams-5.1.4" = { + "workbox-streams-6.2.4" = { name = "workbox-streams"; packageName = "workbox-streams"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-5.1.4.tgz"; - sha512 = "xU8yuF1hI/XcVhJUAfbQLa1guQUhdLMPQJkdT0kn6HP5CwiPOGiXnSFq80rAG4b1kJUChQQIGPrq439FQUNVrw=="; + url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.2.4.tgz"; + sha512 = "yG6zV7S2NmYT6koyb7/DoPsyUAat9kD+rOmjP2SbBCtJdLu6ZIi1lgN4/rOkxEby/+Xb4OE4RmCSIZdMyjEmhQ=="; }; }; - "workbox-sw-5.1.4" = { + "workbox-sw-6.2.4" = { name = "workbox-sw"; packageName = "workbox-sw"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-5.1.4.tgz"; - sha512 = "9xKnKw95aXwSNc8kk8gki4HU0g0W6KXu+xks7wFuC7h0sembFnTrKtckqZxbSod41TDaGh+gWUA5IRXrL0ECRA=="; + url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.2.4.tgz"; + sha512 = "OlWLHNNM+j44sN2OaVXnVcf2wwhJUzcHlXrTrbWDu1JWnrQJ/rLicdc/sbxkZoyE0EbQm7Xr1BXcOjsB7PNlXQ=="; }; }; - "workbox-webpack-plugin-5.1.4" = { + "workbox-webpack-plugin-6.2.4" = { name = "workbox-webpack-plugin"; packageName = "workbox-webpack-plugin"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.4.tgz"; - sha512 = "PZafF4HpugZndqISi3rZ4ZK4A4DxO8rAqt2FwRptgsDx7NF8TVKP86/huHquUsRjMGQllsNdn4FNl8CD/UvKmQ=="; + url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.2.4.tgz"; + sha512 = "G6yeOZDYEbtqgNasqwxHFnma0Vp237kMxpsf8JV/YIhvhUuMwnh1WKv4VnFeqmYaWW/ITx0qj92IEMWB/O1mAA=="; }; }; - "workbox-window-5.1.4" = { + "workbox-window-6.2.4" = { name = "workbox-window"; packageName = "workbox-window"; - version = "5.1.4"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-window/-/workbox-window-5.1.4.tgz"; - sha512 = "vXQtgTeMCUq/4pBWMfQX8Ee7N2wVC4Q7XYFqLnfbXJ2hqew/cU1uMTD2KqGEgEpE4/30luxIxgE+LkIa8glBYw=="; + url = "https://registry.npmjs.org/workbox-window/-/workbox-window-6.2.4.tgz"; + sha512 = "9jD6THkwGEASj1YP56ZBHYJ147733FoGpJlMamYk38k/EBFE75oc6K3Vs2tGOBx5ZGq54+mHSStnlrtFG3IiOg=="; }; }; - "worker-plugin-5.0.0" = { + "worker-plugin-5.0.1" = { name = "worker-plugin"; packageName = "worker-plugin"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz"; - sha512 = "AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ=="; + url = "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.1.tgz"; + sha512 = "Pn7+19jIiANcGuTSGdy+vrzyF+SGH03A5wV8iu4jRTMAOfAC9bNeiHo4+l5tPS7F0uvICMBv+h8UCvL7lunxcA=="; }; }; "wrap-ansi-5.1.0" = { @@ -11391,13 +11472,13 @@ let sha1 = "c252d7c7c5b1b402897630e3453c7bfe690d9ca1"; }; }; - "ws-6.2.1" = { + "ws-6.2.2" = { name = "ws"; packageName = "ws"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"; + sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; }; }; "x-is-string-0.1.0" = { @@ -11481,13 +11562,13 @@ let sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; - "yargs-parser-20.2.7" = { + "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.2.7"; + version = "20.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz"; - sha512 = "FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; "yocto-queue-0.1.0" = { @@ -11513,59 +11594,64 @@ let name = "jellyfin-web"; packageName = "jellyfin-web"; version = "0.0.0"; - src = ../../../../../../../nix/store/ply469lh4lhgpa5j6ak4yss0sgprqzqy-source; + src = ../../../../../../../nix/store/4n28kmji75gd671zm8v6xg8ywghv3s2s-source; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.0" - sources."@babel/core-7.14.0" - sources."@babel/eslint-parser-7.13.14" - sources."@babel/eslint-plugin-7.13.16" - sources."@babel/generator-7.14.1" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.13.16" - sources."@babel/helper-create-class-features-plugin-7.14.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.17" - sources."@babel/helper-define-polyfill-provider-0.2.0" - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.12.13" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.0" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.12" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.1" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.13.15" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.13.11" - sources."@babel/plugin-proposal-dynamic-import-7.13.8" - sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.13.8" - sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" - sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.13.8" - sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + (sources."@apideck/better-ajv-errors-0.2.5" // { + dependencies = [ + sources."leven-3.1.0" + ]; + }) + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.15.0" + sources."@babel/core-7.15.5" + sources."@babel/eslint-parser-7.15.4" + sources."@babel/eslint-plugin-7.14.5" + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + sources."@babel/helper-compilation-targets-7.15.4" + sources."@babel/helper-create-class-features-plugin-7.15.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" + sources."@babel/helper-define-polyfill-provider-0.2.3" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" + sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.15.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.15.4" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.15.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -11575,72 +11661,76 @@ let sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.1" - sources."@babel/plugin-transform-classes-7.13.0" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.17" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.0" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.13.0" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.14.1" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.15.4" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + sources."@babel/preset-env-7.15.4" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.0" - sources."@babel/types-7.14.1" + sources."@babel/runtime-7.15.4" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.4" sources."@csstools/convert-colors-1.4.0" - sources."@discoveryjs/json-ext-0.5.2" - (sources."@eslint/eslintrc-0.4.0" // { + sources."@discoveryjs/json-ext-0.5.3" + (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ - sources."globals-12.4.0" + sources."globals-13.11.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."resolve-from-4.0.0" ]; }) - sources."@hapi/address-2.1.4" - sources."@hapi/bourne-1.3.2" - sources."@hapi/hoek-8.5.1" - sources."@hapi/joi-15.1.1" - sources."@hapi/topo-3.1.6" - sources."@mdn/browser-compat-data-2.0.7" + sources."@gar/promisify-1.1.2" + sources."@humanwhocodes/config-array-0.5.0" + sources."@humanwhocodes/object-schema-1.2.0" + sources."@mdn/browser-compat-data-3.3.14" sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + (sources."@npmcli/fs-1.0.0" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."@rollup/plugin-node-resolve-7.1.3" + sources."@rollup/plugin-babel-5.3.0" + sources."@rollup/plugin-node-resolve-11.2.1" sources."@rollup/plugin-replace-2.4.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -11650,68 +11740,69 @@ let sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@surma/rollup-plugin-off-main-thread-1.4.2" - sources."@types/anymatch-1.3.1" - sources."@types/eslint-7.2.10" - sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.47" - sources."@types/glob-7.1.3" - sources."@types/html-minifier-terser-5.1.1" - sources."@types/json-schema-7.0.7" + sources."@types/eslint-7.28.0" + sources."@types/eslint-scope-3.7.1" + sources."@types/estree-0.0.50" + sources."@types/glob-7.1.4" + sources."@types/html-minifier-terser-5.1.2" + sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" sources."@types/localforage-0.0.34" - sources."@types/mdast-3.0.3" - sources."@types/minimatch-3.0.4" - sources."@types/minimist-1.2.1" - sources."@types/node-15.0.2" - sources."@types/normalize-package-data-2.4.0" + sources."@types/mdast-3.0.10" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-16.7.10" + sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/q-1.5.4" - sources."@types/resolve-0.0.8" + sources."@types/q-1.5.5" + sources."@types/resolve-1.17.1" sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.7" - (sources."@types/uglify-js-3.13.0" // { + sources."@types/tapable-1.0.8" + sources."@types/trusted-types-2.0.2" + (sources."@types/uglify-js-3.13.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@types/unist-2.0.3" + sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - (sources."@types/webpack-4.41.28" // { + (sources."@types/webpack-4.41.30" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-2.1.0" // { + (sources."@types/webpack-sources-3.2.0" // { dependencies = [ sources."source-map-0.7.3" ]; }) sources."@uupaa/dynamic-import-polyfill-1.0.2" - sources."@webassemblyjs/ast-1.11.0" - sources."@webassemblyjs/floating-point-hex-parser-1.11.0" - sources."@webassemblyjs/helper-api-error-1.11.0" - sources."@webassemblyjs/helper-buffer-1.11.0" - sources."@webassemblyjs/helper-numbers-1.11.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" - sources."@webassemblyjs/helper-wasm-section-1.11.0" - sources."@webassemblyjs/ieee754-1.11.0" - sources."@webassemblyjs/leb128-1.11.0" - sources."@webassemblyjs/utf8-1.11.0" - sources."@webassemblyjs/wasm-edit-1.11.0" - sources."@webassemblyjs/wasm-gen-1.11.0" - sources."@webassemblyjs/wasm-opt-1.11.0" - sources."@webassemblyjs/wasm-parser-1.11.0" - sources."@webassemblyjs/wast-printer-1.11.0" - sources."@webpack-cli/configtest-1.0.2" - sources."@webpack-cli/info-1.2.3" - sources."@webpack-cli/serve-1.3.1" + sources."@webassemblyjs/ast-1.11.1" + sources."@webassemblyjs/floating-point-hex-parser-1.11.1" + sources."@webassemblyjs/helper-api-error-1.11.1" + sources."@webassemblyjs/helper-buffer-1.11.1" + sources."@webassemblyjs/helper-numbers-1.11.1" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" + sources."@webassemblyjs/helper-wasm-section-1.11.1" + sources."@webassemblyjs/ieee754-1.11.1" + sources."@webassemblyjs/leb128-1.11.1" + sources."@webassemblyjs/utf8-1.11.1" + sources."@webassemblyjs/wasm-edit-1.11.1" + sources."@webassemblyjs/wasm-gen-1.11.1" + sources."@webassemblyjs/wasm-opt-1.11.1" + sources."@webassemblyjs/wasm-parser-1.11.1" + sources."@webassemblyjs/wast-printer-1.11.1" + sources."@webpack-cli/configtest-1.0.4" + sources."@webpack-cli/info-1.3.0" + sources."@webpack-cli/serve-1.5.2" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."abab-2.0.5" sources."accepts-1.3.7" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-import-assertions-1.7.6" + sources."acorn-jsx-5.3.2" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -11735,29 +11826,20 @@ let sources."array.prototype.flat-1.2.4" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - sources."ast-metadata-inferer-0.4.0" + sources."ast-metadata-inferer-0.7.0" sources."astral-regex-2.0.0" sources."async-2.6.3" sources."async-each-1.0.3" sources."async-limiter-1.0.1" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."autoprefixer-9.8.6" - sources."babel-extract-comments-1.0.0" sources."babel-loader-8.2.2" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-dynamic-import-polyfill-1.0.0" - sources."babel-plugin-polyfill-corejs2-0.2.0" - sources."babel-plugin-polyfill-corejs3-0.2.0" - sources."babel-plugin-polyfill-regenerator-0.2.0" - sources."babel-plugin-syntax-object-rest-spread-6.13.0" - sources."babel-plugin-transform-object-rest-spread-6.26.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."core-js-2.6.12" - sources."regenerator-runtime-0.11.1" - ]; - }) - sources."babylon-6.18.0" + sources."babel-plugin-polyfill-corejs2-0.2.2" + sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-regenerator-0.2.2" sources."bail-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -11769,7 +11851,7 @@ let sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - sources."blurhash-1.1.3" + sources."blurhash-1.1.4" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" @@ -11782,12 +11864,12 @@ let sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.6" - sources."buffer-from-1.1.1" + sources."browserslist-4.17.0" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."builtin-modules-3.2.0" sources."bytes-3.0.0" - (sources."cacache-15.0.6" // { + (sources."cacache-15.3.0" // { dependencies = [ sources."p-map-4.0.0" sources."rimraf-3.0.2" @@ -11800,22 +11882,18 @@ let sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camel-case-4.1.2" - sources."camelcase-6.2.0" - (sources."camelcase-keys-6.2.2" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-db-1.0.30001222" - sources."caniuse-lite-1.0.30001222" + sources."caniuse-db-1.0.30001255" + sources."caniuse-lite-1.0.30001255" sources."ccount-1.1.0" sources."chalk-2.4.2" sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" - sources."chokidar-3.5.1" + sources."chokidar-3.5.2" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" (sources."class-utils-0.3.6" // { @@ -11858,11 +11936,11 @@ let sources."coa-2.0.2" sources."collapse-white-space-1.0.6" sources."collection-visit-1.0.0" - sources."color-3.1.3" + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" - sources."colorette-1.2.2" + sources."color-string-1.6.0" + sources."colorette-1.3.0" sources."commander-4.1.1" sources."common-tags-1.8.0" sources."commondir-1.0.1" @@ -11877,32 +11955,31 @@ let sources."concat-map-0.0.1" sources."confusing-browser-globals-1.0.10" sources."connect-history-api-fallback-1.6.0" - sources."contains-path-0.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."convert-source-map-1.7.0" + sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-6.4.1" // { dependencies = [ sources."array-union-2.1.0" - sources."globby-11.0.3" + sources."globby-11.0.4" sources."loader-utils-2.0.0" sources."p-limit-3.1.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" ]; }) - sources."core-js-3.11.2" - (sources."core-js-compat-3.11.2" // { + sources."core-js-3.17.2" + (sources."core-js-compat-3.17.2" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" sources."cross-spawn-7.0.3" - sources."crypto-random-string-1.0.0" + sources."crypto-random-string-2.0.0" sources."css-blank-pseudo-0.1.4" sources."css-color-names-0.0.4" sources."css-declaration-sorter-4.0.1" @@ -11912,13 +11989,12 @@ let sources."postcss-selector-parser-5.0.0" ]; }) - (sources."css-loader-5.2.4" // { + (sources."css-loader-5.2.7" // { dependencies = [ sources."loader-utils-2.0.0" - sources."postcss-8.2.13" - sources."schema-utils-3.0.0" + sources."postcss-8.3.6" + sources."schema-utils-3.1.1" sources."semver-7.3.5" - sources."source-map-0.6.1" ]; }) sources."css-prefers-color-scheme-3.1.1" @@ -11951,7 +12027,7 @@ let sources."type-1.2.0" ]; }) - sources."date-fns-2.21.1" + sources."date-fns-2.23.0" sources."debug-4.3.2" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -11961,7 +12037,8 @@ let }) sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" + sources."deepmerge-4.2.2" (sources."default-gateway-4.2.0" // { dependencies = [ sources."cross-spawn-6.0.5" @@ -11981,10 +12058,10 @@ let sources."del-4.1.1" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-node-2.0.5" + sources."detect-node-2.1.0" sources."dir-glob-3.0.1" sources."dns-equal-1.0.0" - sources."dns-packet-1.3.1" + sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."doctrine-3.0.0" sources."dom-converter-0.2.0" @@ -12005,12 +12082,12 @@ let sources."dot-prop-5.3.0" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.726" + sources."electron-to-chromium-1.3.830" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.8.0" // { + (sources."enhanced-resolve-5.8.2" // { dependencies = [ sources."tapable-2.2.0" ]; @@ -12021,8 +12098,8 @@ let sources."epubjs-0.3.88" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0" - sources."es-module-lexer-0.4.1" + sources."es-abstract-1.18.5" + sources."es-module-lexer-0.7.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" @@ -12031,36 +12108,33 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.25.0" // { + (sources."eslint-7.32.0" // { dependencies = [ sources."@babel/code-frame-7.12.11" sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."eslint-visitor-keys-2.1.0" - sources."globals-13.8.0" + sources."escape-string-regexp-4.0.0" + sources."globals-13.11.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."resolve-from-4.0.0" sources."semver-7.3.5" sources."supports-color-7.2.0" - sources."type-fest-0.20.2" ]; }) - (sources."eslint-import-resolver-node-0.3.4" // { + (sources."eslint-import-resolver-node-0.3.6" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."debug-3.2.7" ]; }) - (sources."eslint-module-utils-2.6.0" // { + (sources."eslint-module-utils-2.6.2" // { dependencies = [ - sources."debug-2.6.9" + sources."debug-3.2.7" sources."find-up-2.1.0" sources."locate-path-2.0.0" - sources."ms-2.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -12068,25 +12142,43 @@ let sources."pkg-dir-2.0.0" ]; }) - (sources."eslint-plugin-compat-3.9.0" // { + (sources."eslint-plugin-compat-3.13.0" // { dependencies = [ - sources."semver-7.3.2" + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."semver-7.3.5" ]; }) sources."eslint-plugin-eslint-comments-3.2.0" - (sources."eslint-plugin-import-2.22.1" // { + (sources."eslint-plugin-import-2.24.2" // { dependencies = [ sources."debug-2.6.9" - sources."doctrine-1.5.0" + sources."doctrine-2.1.0" + sources."find-up-2.1.0" + sources."locate-path-2.0.0" sources."ms-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."path-exists-3.0.0" ]; }) sources."eslint-plugin-promise-4.3.1" sources."eslint-rule-composer-0.3.0" sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -12106,7 +12198,7 @@ let sources."eventemitter3-4.0.7" sources."events-3.3.0" sources."eventsource-1.1.0" - sources."execa-5.0.0" + sources."execa-5.1.1" sources."execall-2.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -12132,7 +12224,7 @@ let (sources."expose-loader-1.0.3" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" ]; }) (sources."express-4.17.1" // { @@ -12143,7 +12235,7 @@ let sources."path-to-regexp-0.1.7" ]; }) - sources."ext-1.4.0" + sources."ext-1.5.0" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ @@ -12157,18 +12249,18 @@ let ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-text-encoding-1.0.3" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.11.0" - sources."faye-websocket-0.11.3" + sources."fastq-1.12.0" + sources."faye-websocket-0.11.4" sources."file-entry-cache-6.0.1" (sources."file-loader-6.2.0" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" ]; }) sources."file-uri-to-path-1.0.0" @@ -12179,27 +12271,27 @@ let sources."ms-2.0.0" ]; }) - sources."find-cache-dir-3.3.1" + sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" (sources."flat-cache-3.0.4" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."flatted-3.1.1" + sources."flatted-3.2.2" sources."flatten-1.0.3" - sources."flv.js-1.5.0" - sources."follow-redirects-1.14.0" + sources."flv.js-1.6.1" + sources."follow-redirects-1.14.3" sources."fontsource-noto-sans-3.1.5" sources."fontsource-noto-sans-hk-3.1.5" sources."fontsource-noto-sans-jp-3.1.5" sources."fontsource-noto-sans-kr-3.1.5" sources."fontsource-noto-sans-sc-3.1.5" sources."for-in-1.0.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fs-extra-8.1.0" + sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -12213,7 +12305,7 @@ let sources."get-stdin-8.0.0" sources."get-stream-6.0.1" sources."get-value-2.0.6" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-modules-2.0.0" @@ -12230,7 +12322,7 @@ let }) sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handle-thing-2.0.1" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -12242,6 +12334,7 @@ let sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -12266,7 +12359,7 @@ let (sources."html-loader-1.3.2" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" ]; }) sources."html-minifier-terser-5.1.1" @@ -12278,15 +12371,15 @@ let }) (sources."htmlparser2-4.1.0" // { dependencies = [ - (sources."dom-serializer-1.3.1" // { + (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."domelementtype-2.2.0" - (sources."domutils-2.6.0" // { + (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) ]; @@ -12312,8 +12405,9 @@ let ]; }) sources."human-signals-2.1.0" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."icss-utils-5.1.0" + sources."idb-6.1.3" sources."ignore-5.1.8" sources."immediate-3.0.6" sources."import-cwd-2.1.0" @@ -12329,6 +12423,7 @@ let sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-ip-4.3.0" + sources."internal-slot-1.0.3" sources."interpret-2.2.0" sources."intersection-observer-0.12.0" sources."ip-1.1.5" @@ -12340,17 +12435,17 @@ let sources."is-alphabetical-1.0.4" sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.0" + sources."is-boolean-object-1.1.2" sources."is-buffer-2.0.5" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.3.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" @@ -12362,20 +12457,20 @@ let sources."is-module-1.0.0" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" + sources."is-regex-1.1.4" sources."is-regexp-2.1.0" sources."is-resolvable-1.1.0" - sources."is-stream-2.0.0" - sources."is-string-1.0.5" + sources."is-stream-2.0.1" + sources."is-string-1.0.7" sources."is-supported-regexp-flag-1.0.1" - sources."is-symbol-1.0.3" + sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-whitespace-character-1.0.4" @@ -12386,10 +12481,10 @@ let sources."isexe-2.0.0" sources."isobject-3.0.1" sources."jellyfin-apiclient-1.8.0" - (sources."jest-worker-26.6.2" // { + (sources."jest-worker-27.1.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" ]; }) sources."jquery-3.6.0" @@ -12399,13 +12494,15 @@ let sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.3.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json3-3.3.3" sources."json5-2.2.0" - sources."jsonfile-4.0.0" - sources."jstree-3.3.11" - sources."jszip-3.6.0" + sources."jsonfile-6.1.0" + sources."jsonpointer-4.1.0" + sources."jstree-3.3.12" + sources."jszip-3.7.1" sources."killable-1.0.1" sources."kind-of-6.0.3" sources."klona-2.0.4" @@ -12416,10 +12513,9 @@ let sources."libass-wasm-https://github.com/jellyfin/JavascriptSubtitlesOctopus/archive/refs/tags/4.0.0-jf-smarttv.tar.gz" sources."lie-3.3.0" sources."lines-and-columns-1.1.6" - (sources."load-json-file-2.0.0" // { + (sources."load-json-file-4.0.0" // { dependencies = [ - sources."parse-json-2.2.0" - sources."pify-2.3.0" + sources."pify-3.0.0" ]; }) sources."loader-runner-4.2.0" @@ -12428,26 +12524,24 @@ let sources."json5-1.0.1" ]; }) - (sources."localforage-1.9.0" // { + (sources."localforage-1.10.0" // { dependencies = [ sources."lie-3.1.1" ]; }) sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" - sources."lodash.flatten-4.4.0" sources."lodash.memoize-4.1.2" - sources."lodash.template-4.5.0" - sources."lodash.templatesettings-4.2.0" + sources."lodash.merge-4.6.2" + sources."lodash.sortby-4.7.0" sources."lodash.truncate-4.4.2" sources."lodash.uniq-4.5.0" (sources."log-symbols-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -12479,7 +12573,7 @@ let (sources."meow-9.0.0" // { dependencies = [ sources."hosted-git-info-4.0.2" - sources."normalize-package-data-3.0.2" + sources."normalize-package-data-3.0.3" sources."parse-json-5.2.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -12505,8 +12599,8 @@ let sources."micromark-2.11.4" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" @@ -12531,8 +12625,8 @@ let sources."ms-2.1.2" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.14.2" - sources."nanoid-3.1.22" + sources."nan-2.15.0" + sources."nanoid-3.1.25" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."natural-compare-1.4.0" @@ -12542,7 +12636,7 @@ let sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-forge-0.10.0" - sources."node-releases-1.1.71" + sources."node-releases-1.1.75" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -12570,14 +12664,14 @@ let sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.2" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" - sources."object.values-1.1.3" + sources."object.values-1.1.4" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -12610,7 +12704,7 @@ let sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" (sources."path-to-regexp-1.2.1" // { dependencies = [ sources."isarray-0.0.1" @@ -12619,11 +12713,21 @@ let sources."path-type-4.0.0" sources."path-webpack-0.0.3" sources."pdfjs-dist-2.5.207" - sources."picomatch-2.2.3" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-4.2.0" + (sources."pkg-up-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."path-exists-3.0.0" + ]; + }) sources."plur-2.1.2" (sources."portfinder-1.0.28" // { dependencies = [ @@ -12632,7 +12736,7 @@ let ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -12825,7 +12929,7 @@ let sources."postcss-scss-2.1.1" sources."postcss-selector-matches-4.0.0" sources."postcss-selector-not-4.0.1" - sources."postcss-selector-parser-6.0.5" + sources."postcss-selector-parser-6.0.6" sources."postcss-sorting-4.1.0" (sources."postcss-svgo-4.0.3" // { dependencies = [ @@ -12842,7 +12946,7 @@ let sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -12861,13 +12965,13 @@ let ]; }) sources."read-file-stdin-0.2.1" - (sources."read-pkg-2.0.0" // { + (sources."read-pkg-3.0.0" // { dependencies = [ - sources."path-type-2.0.0" - sources."pify-2.3.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" ]; }) - (sources."read-pkg-up-2.0.0" // { + (sources."read-pkg-up-3.0.0" // { dependencies = [ sources."find-up-2.1.0" sources."locate-path-2.0.0" @@ -12878,16 +12982,16 @@ let ]; }) sources."readable-stream-2.3.7" - sources."readdirp-3.5.0" - sources."rechoir-0.7.0" + sources."readdirp-3.6.0" + sources."rechoir-0.7.1" sources."redent-3.0.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.8" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" - sources."regexpp-3.1.0" + sources."regexpp-3.2.0" sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.9" // { @@ -12900,13 +13004,17 @@ let sources."remark-parse-9.0.0" sources."remark-stringify-9.0.1" sources."remove-trailing-separator-1.1.0" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" - sources."domhandler-2.4.2" - sources."entities-1.1.2" - sources."htmlparser2-3.10.1" - sources."readable-stream-3.6.0" + sources."css-select-4.1.3" + sources."css-what-5.0.1" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" + sources."htmlparser2-6.1.0" + sources."nth-check-2.0.0" sources."strip-ansi-3.0.1" ]; }) @@ -12932,29 +13040,27 @@ let sources."rgb-regex-1.0.1" sources."rgba-regex-1.0.0" sources."rimraf-2.7.1" - sources."rollup-1.32.1" - sources."rollup-plugin-babel-4.4.0" - (sources."rollup-plugin-terser-5.3.1" // { + sources."rollup-2.56.3" + (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ - sources."jest-worker-24.9.0" + sources."commander-2.20.3" + sources."has-flag-4.0.0" + sources."jest-worker-26.6.2" sources."serialize-javascript-4.0.0" - sources."supports-color-6.1.0" - ]; - }) - (sources."rollup-pluginutils-2.8.2" // { - dependencies = [ - sources."estree-walker-0.6.1" + sources."source-map-0.7.3" + sources."supports-color-7.2.0" + sources."terser-5.7.2" ]; }) sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.32.12" - (sources."sass-loader-10.1.1" // { + sources."sass-1.39.0" + (sources."sass-loader-10.2.0" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" sources."semver-7.3.5" ]; }) @@ -12996,6 +13102,7 @@ let sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -13043,18 +13150,19 @@ let ]; }) sources."sockjs-0.3.21" - (sources."sockjs-client-1.5.1" // { + (sources."sockjs-client-1.5.2" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."sortablejs-1.13.0" + sources."sortablejs-1.14.0" sources."source-list-map-2.0.1" sources."source-map-0.5.7" + sources."source-map-js-0.6.2" (sources."source-map-loader-1.1.3" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" sources."source-map-0.6.1" ]; }) @@ -13069,7 +13177,7 @@ let sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.7" + sources."spdx-license-ids-3.0.10" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -13115,7 +13223,7 @@ let }) sources."strip-ansi-6.0.0" sources."strip-bom-3.0.0" - sources."strip-comments-1.0.2" + sources."strip-comments-2.0.1" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" @@ -13123,7 +13231,7 @@ let (sources."style-loader-2.0.0" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" ]; }) sources."style-search-0.1.0" @@ -13137,11 +13245,11 @@ let sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."balanced-match-2.0.0" - sources."chalk-4.1.1" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."cosmiconfig-7.0.0" - sources."globby-11.0.3" + sources."cosmiconfig-7.0.1" + sources."globby-11.0.4" sources."has-flag-4.0.0" (sources."import-fresh-3.3.0" // { dependencies = [ @@ -13176,7 +13284,6 @@ let sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."get-stdin-6.0.0" @@ -13194,25 +13301,17 @@ let sources."is-regexp-1.0.0" sources."kind-of-3.2.2" sources."known-css-properties-0.11.0" - sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" sources."log-symbols-2.2.0" sources."map-obj-2.0.0" sources."meow-5.0.0" sources."micromatch-3.1.10" sources."minimist-options-3.0.2" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."path-exists-3.0.0" sources."path-type-3.0.0" sources."pify-3.0.0" sources."postcss-sass-0.3.5" sources."postcss-selector-parser-3.1.2" sources."postcss-value-parser-3.3.1" sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" sources."redent-2.0.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" @@ -13248,7 +13347,6 @@ let sources."fast-glob-2.2.7" sources."file-entry-cache-4.0.0" sources."fill-range-4.0.0" - sources."find-up-2.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."get-stdin-6.0.0" @@ -13267,17 +13365,11 @@ let sources."is-regexp-1.0.0" sources."kind-of-3.2.2" sources."known-css-properties-0.11.0" - sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" sources."log-symbols-1.0.2" sources."map-obj-2.0.0" sources."meow-5.0.0" sources."micromatch-3.1.10" sources."minimist-options-3.0.2" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."path-exists-3.0.0" sources."path-type-3.0.0" sources."pify-3.0.0" (sources."postcss-5.2.18" // { @@ -13295,15 +13387,13 @@ let ]; }) sources."has-flag-3.0.0" - sources."postcss-7.0.35" + sources."postcss-7.0.36" sources."supports-color-6.1.0" ]; }) sources."postcss-selector-parser-2.2.3" sources."postcss-value-parser-3.3.1" sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" sources."redent-2.0.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" @@ -13329,7 +13419,7 @@ let sources."chalk-2.4.2" sources."has-flag-3.0.0" sources."log-symbols-2.2.0" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -13351,7 +13441,7 @@ let sources."postcss-sorting-5.0.1" ]; }) - sources."stylelint-scss-3.19.0" + sources."stylelint-scss-3.20.1" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" @@ -13360,19 +13450,19 @@ let sources."mkdirp-0.5.5" ]; }) - sources."swiper-6.5.9" - (sources."table-6.6.0" // { + sources."swiper-6.8.4" + (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.2.0" + sources."ajv-8.6.2" sources."json-schema-traverse-1.0.0" ]; }) sources."tapable-1.1.3" - sources."tar-6.1.0" - sources."temp-dir-1.0.0" - (sources."tempy-0.3.0" // { + sources."tar-6.1.11" + sources."temp-dir-2.0.0" + (sources."tempy-0.6.0" // { dependencies = [ - sources."type-fest-0.3.1" + sources."type-fest-0.16.0" ]; }) (sources."terser-4.8.0" // { @@ -13381,13 +13471,14 @@ let sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-5.1.1" // { + (sources."terser-webpack-plugin-5.2.3" // { dependencies = [ sources."commander-2.20.3" sources."p-limit-3.1.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" + sources."serialize-javascript-6.0.0" sources."source-map-0.6.1" - (sources."terser-5.7.0" // { + (sources."terser-5.7.2" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -13407,19 +13498,20 @@ let sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" + sources."tr46-1.0.1" sources."trim-0.0.1" - sources."trim-newlines-3.0.0" + sources."trim-newlines-3.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" - (sources."tsconfig-paths-3.9.0" // { + (sources."tsconfig-paths-3.11.0" // { dependencies = [ sources."json5-1.0.1" ]; }) - sources."tslib-2.2.0" + sources."tslib-2.3.1" sources."type-2.5.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."unbox-primitive-1.0.1" @@ -13428,13 +13520,13 @@ let sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."unique-string-1.0.0" + sources."unique-string-2.0.0" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-remove-position-1.1.4" @@ -13445,7 +13537,7 @@ let sources."unist-util-is-3.0.0" ]; }) - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."unpipe-1.0.0" sources."unquote-1.1.1" (sources."unset-value-1.0.0" // { @@ -13466,8 +13558,8 @@ let sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.1" - sources."url-toolkit-2.2.2" + sources."url-parse-1.5.3" + sources."url-toolkit-2.2.3" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."util.promisify-1.0.1" @@ -13481,27 +13573,27 @@ let sources."vfile-4.2.1" sources."vfile-location-2.0.6" sources."vfile-message-2.0.4" - (sources."watchpack-2.1.1" // { + (sources."watchpack-2.2.0" // { dependencies = [ sources."glob-to-regexp-0.4.1" ]; }) sources."wbuf-1.7.3" sources."webcomponents.js-0.7.24" - (sources."webpack-5.36.2" // { + sources."webidl-conversions-4.0.2" + (sources."webpack-5.52.0" // { dependencies = [ - sources."acorn-8.2.4" + sources."acorn-8.4.1" sources."glob-to-regexp-0.4.1" - sources."schema-utils-3.0.0" - sources."source-map-0.6.1" + sources."schema-utils-3.1.1" sources."tapable-2.2.0" - sources."webpack-sources-2.2.0" + sources."webpack-sources-3.2.0" ]; }) - (sources."webpack-cli-4.6.0" // { + (sources."webpack-cli-4.8.0" // { dependencies = [ sources."commander-7.2.0" - sources."webpack-merge-5.7.3" + sources."webpack-merge-5.8.0" ]; }) (sources."webpack-dev-middleware-3.7.3" // { @@ -13556,35 +13648,90 @@ let }) sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" - sources."webworkify-1.5.0" + sources."webworkify-webpack-2.1.5" sources."whatwg-fetch-3.6.2" sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-7.1.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" sources."wildcard-2.0.0" sources."word-wrap-1.2.3" - sources."workbox-background-sync-5.1.4" - sources."workbox-broadcast-update-5.1.4" - (sources."workbox-build-5.1.4" // { + (sources."workbox-background-sync-6.2.4" // { dependencies = [ - sources."source-map-0.7.3" + sources."workbox-core-6.2.4" + ]; + }) + (sources."workbox-broadcast-update-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + (sources."workbox-build-6.2.4" // { + dependencies = [ + sources."ajv-8.6.2" + sources."json-schema-traverse-1.0.0" + sources."source-map-0.8.0-beta.0" + sources."workbox-core-6.2.4" + sources."workbox-precaching-6.2.4" + ]; + }) + (sources."workbox-cacheable-response-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" ]; }) - sources."workbox-cacheable-response-5.1.4" sources."workbox-core-5.1.4" - sources."workbox-expiration-5.1.4" - sources."workbox-google-analytics-5.1.4" - sources."workbox-navigation-preload-5.1.4" + (sources."workbox-expiration-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + (sources."workbox-google-analytics-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + (sources."workbox-navigation-preload-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) sources."workbox-precaching-5.1.4" - sources."workbox-range-requests-5.1.4" - sources."workbox-routing-5.1.4" - sources."workbox-strategies-5.1.4" - sources."workbox-streams-5.1.4" - sources."workbox-sw-5.1.4" - sources."workbox-webpack-plugin-5.1.4" - sources."workbox-window-5.1.4" - sources."worker-plugin-5.0.0" + (sources."workbox-range-requests-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + (sources."workbox-recipes-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + sources."workbox-precaching-6.2.4" + ]; + }) + (sources."workbox-routing-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + (sources."workbox-strategies-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + (sources."workbox-streams-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + sources."workbox-sw-6.2.4" + sources."workbox-webpack-plugin-6.2.4" + (sources."workbox-window-6.2.4" // { + dependencies = [ + sources."workbox-core-6.2.4" + ]; + }) + sources."worker-plugin-5.0.1" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -13602,7 +13749,7 @@ let }) sources."write-file-atomic-3.0.3" sources."write-file-stdout-0.0.2" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."x-is-string-0.1.0" sources."xmldom-0.3.0" sources."xtend-4.0.2" @@ -13612,7 +13759,6 @@ let (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."camelcase-5.3.1" sources."emoji-regex-7.0.3" sources."find-up-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -13624,7 +13770,7 @@ let sources."yargs-parser-13.1.2" ]; }) - sources."yargs-parser-20.2.7" + sources."yargs-parser-20.2.9" sources."yocto-queue-0.1.0" sources."zwitch-1.0.5" ]; diff --git a/nixpkgs/pkgs/servers/jellyfin/web.nix b/nixpkgs/pkgs/servers/jellyfin/web.nix index fe7f577bf47c..2b3ce5a1f3df 100644 --- a/nixpkgs/pkgs/servers/jellyfin/web.nix +++ b/nixpkgs/pkgs/servers/jellyfin/web.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "jellyfin-web"; - version = "10.7.6"; + version = "10.7.7"; # TODO: on the next major release remove src.postFetch # and use the lock file in web-update.sh: # https://github.com/jellyfin/jellyfin-web/commit/6efef9680d55a93f4333ef8bfb65a8a650c99a49 @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - sha256 = "T5a17mAvx7fLla2jQp1dNswijeUbBQB1RA1ZkVpLWqM="; + sha256 = "RDp51IWQ0Woz26cVgWsiLc8DyZztI2ysPbhmOR3jguE="; postFetch = '' mkdir -p $out cd $out diff --git a/nixpkgs/pkgs/servers/jibri/default.nix b/nixpkgs/pkgs/servers/jibri/default.nix new file mode 100644 index 000000000000..91d6a7ddf040 --- /dev/null +++ b/nixpkgs/pkgs/servers/jibri/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl, dpkg, jre_headless, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "jibri"; + version = "8.0-93-g51fe7a2"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + sha256 = "1w78aa3rfdc4frb68ymykrbazxqrcv8mcdayqmcb72q1aa854c7j"; + }; + + dontBuild = true; + nativeBuildInputs = [ dpkg makeWrapper ]; + unpackCmd = "dpkg-deb -x $src debcontents"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,opt/jitsi/jibri,etc/jitsi/jibri} + mv etc/jitsi/jibri/* $out/etc/jitsi/jibri/ + mv opt/jitsi/jibri/* $out/opt/jitsi/jibri/ + + makeWrapper ${jre_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "JItsi BRoadcasting Infrastructure"; + longDescription = '' + Jibri provides services for recording or streaming a Jitsi Meet conference. + It works by launching a Chrome instance rendered in a virtual framebuffer and capturing and + encoding the output with ffmpeg. It is intended to be run on a separate machine (or a VM), with + no other applications using the display or audio devices. Only one recording at a time is + supported on a single jibri. + ''; + homepage = "https://github.com/jitsi/jibri"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/servers/jibri/update.sh b/nixpkgs/pkgs/servers/jibri/update.sh new file mode 100755 index 000000000000..9606a5170c1a --- /dev/null +++ b/nixpkgs/pkgs/servers/jibri/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl https://download.jitsi.org/stable/ | \ + pup 'a[href] text{}' | \ + awk -F'[_-]' '/jibri/ {printf $2"-"$3"-"$4"\n"}' | \ + sort -u | \ + tail -n 1)" + +update-source-version jibri "$version" diff --git a/nixpkgs/pkgs/servers/jicofo/default.nix b/nixpkgs/pkgs/servers/jicofo/default.nix index 37b5a1bfaa38..be774e6e5b1e 100644 --- a/nixpkgs/pkgs/servers/jicofo/default.nix +++ b/nixpkgs/pkgs/servers/jicofo/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { single-node-smoke-test = nixosTests.jitsi-meet; }; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A server side focus component used in Jitsi Meet conferences"; longDescription = '' diff --git a/nixpkgs/pkgs/servers/jicofo/update.sh b/nixpkgs/pkgs/servers/jicofo/update.sh new file mode 100755 index 000000000000..538e17d93da7 --- /dev/null +++ b/nixpkgs/pkgs/servers/jicofo/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl https://download.jitsi.org/stable/ | \ + pup 'a[href] text{}' | \ + awk -F'[_-]' '/jicofo/ {printf $2"-"$3"\n"}' | \ + sort -u | \ + tail -n 1)" + +update-source-version jicofo "$version" diff --git a/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix b/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix index 283164380b48..79659b96c57a 100644 --- a/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix +++ b/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation { single-host-smoke-test = nixosTests.jitsi-meet; }; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A WebRTC compatible video router"; longDescription = '' diff --git a/nixpkgs/pkgs/servers/jitsi-videobridge/update.sh b/nixpkgs/pkgs/servers/jitsi-videobridge/update.sh new file mode 100755 index 000000000000..bee9c4aa6de2 --- /dev/null +++ b/nixpkgs/pkgs/servers/jitsi-videobridge/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl https://download.jitsi.org/stable/ | \ + pup 'a[href] text{}' | \ + awk -F'[_-]' '/jitsi-videobridge2/ {printf $3"-"$4"-"$5"\n"}' | \ + sort -u | \ + tail -n 1)" + +update-source-version jitsi-videobridge "$version" diff --git a/nixpkgs/pkgs/servers/klipper/default.nix b/nixpkgs/pkgs/servers/klipper/default.nix index aa933b0fb660..f8d49770370f 100644 --- a/nixpkgs/pkgs/servers/klipper/default.nix +++ b/nixpkgs/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-07-15"; + version = "unstable-2021-09-03"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "dafb74e3aba707db364ed773bb2135084ac0fffa"; - sha256 = "sha256-wF5I8Mo89ohhysBRDMtkCDbCW9SKWrdYdbifmxCPJBc="; + rev = "c84956befe88daeeb9512acaa9fa82395665df16"; + sha256 = "sha256-dHFIeA2RCoqC0ROYUUbSoLZ4frRWBJaNJWohpK8xN7I="; }; # We have no LTO on i686 since commit 22284b0 diff --git a/nixpkgs/pkgs/servers/maddy/default.nix b/nixpkgs/pkgs/servers/maddy/default.nix index c5fa1b5e670a..88631112fa1c 100644 --- a/nixpkgs/pkgs/servers/maddy/default.nix +++ b/nixpkgs/pkgs/servers/maddy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, coreutils }: buildGoModule rec { pname = "maddy"; @@ -17,6 +17,18 @@ buildGoModule rec { subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; + postInstall = '' + mkdir -p $out/lib/systemd/system + + substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ + --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/bin/kill" "${coreutils}/bin/kill" + + substitute dist/systemd/maddy@.service $out/lib/systemd/system/maddy@.service \ + --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/bin/kill" "${coreutils}/bin/kill" + ''; + meta = with lib; { description = "Composable all-in-one mail server"; homepage = "https://foxcpp.dev/maddy"; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index e94b05edf9d3..9b7cd567a77c 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.41.1"; + version = "1.42.0"; src = fetchPypi { inherit pname version; - sha256 = "1vaym6mxnwg2xdqjcigi2sb0kkdi0ly5d5ghakfsysxcfn08d1z8"; + sha256 = "sha256-wJFjjm9apRqjk5eN/kIEgecHgm/XLbtwXHEpM2pmvO8="; }; patches = [ diff --git a/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix index 9f1aec20033b..394c0f5e58bb 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "matrix-synapse-ldap3"; - version = "0.1.4"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx"; + sha256 = "9fdf8df7c8ec756642aa0fea53b31c0b2f1924f70d7f049a2090b523125456fe"; }; propagatedBuildInputs = [ service-identity ldap3 twisted ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index fbd5c68baa16..b4247561da59 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "0.1.17"; + version = "0.1.19"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "sha256-uBI5AllXWgl3eL60WZ/j11Tt7QpY7CKcmFQOU74/Qjs="; + sha256 = "09g2h5qj725745ljxff4vh05zy7lzcmvdz0bkxxhpjhs48jdlq3k"; }; sourceRoot = "./source/synapse_antispam"; diff --git a/nixpkgs/pkgs/servers/mautrix-facebook/default.nix b/nixpkgs/pkgs/servers/mautrix-facebook/default.nix new file mode 100644 index 000000000000..b9e86f01fbdb --- /dev/null +++ b/nixpkgs/pkgs/servers/mautrix-facebook/default.nix @@ -0,0 +1,58 @@ +{ enableSystemd ? stdenv.isLinux +, fetchFromGitHub +, lib +, python3 +, stdenv +}: + +python3.pkgs.buildPythonPackage rec { + pname = "mautrix-facebook"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "mautrix"; + repo = "facebook"; + rev = "v${version}"; + sha256 = "0m7nznx3z6cg4wgvjybdivx22ifxcdri4i8501yibsri0jnpf0y2"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + CommonMark + aiohttp + asyncpg + mautrix + paho-mqtt + pillow + prometheus-client + pycryptodome + python-olm + python_magic + ruamel_yaml + unpaddedbase64 + yarl + ] ++ lib.optional enableSystemd systemd; + + doCheck = false; + + postPatch = '' + sed -ie 's/^asyncpg.*/asyncpg>=0.20/' requirements.txt + ''; + + postInstall = '' + mkdir -p $out/bin + + cat <<-END >$out/bin/mautrix-facebook + #!/bin/sh + PYTHONPATH="$PYTHONPATH" exec ${python3}/bin/python -m mautrix_facebook "\$@" + END + chmod +x $out/bin/mautrix-facebook + ''; + + meta = with lib; { + homepage = "https://github.com/mautrix/facebook"; + description = "A Matrix-Facebook Messenger puppeting bridge"; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ kevincox ]; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 996637f51b9e..a297dd0eea95 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata }: buildGoModule rec { pname = "grafana"; - version = "8.1.2"; + version = "8.1.3"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-xlERuPkhPEHbfX7bVoc9CjqYe/P0Miiyu5c067LLS1M="; + sha256 = "sha256-gJO21qTTiP6/8Oln0w89UYEYWb6pIlXvKfiALAUAjnM="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-0fzCwkVHrBFiSKxvyTK0Xu8wHpyo58u+a9c7daaUCc0="; + sha256 = "sha256-1ZZMZEErt/OD55mEu/mF2XrsZcDVk700jRkTcYK14rE="; }; vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I="; @@ -47,6 +47,16 @@ buildGoModule rec { "-s" "-w" "-X main.version=${version}" ]; + # Tests start http servers which need to bind to local addresses: + # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted + __darwinAllowLocalNetworking = true; + + # On Darwin, files under /usr/share/zoneinfo exist, but fail to open in sandbox: + # TestValueAsTimezone: date_formats_test.go:33: Invalid has err for input "Europe/Amsterdam": operation not permitted + preCheck = '' + export ZONEINFO=${tzdata}/share/zoneinfo + ''; + postInstall = '' tar -xvf $srcStatic mkdir -p $out/share/grafana @@ -60,6 +70,7 @@ buildGoModule rec { license = licenses.agpl3; homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; + mainProgram = "grafana-server"; }; } diff --git a/nixpkgs/pkgs/servers/moonraker/default.nix b/nixpkgs/pkgs/servers/moonraker/default.nix index 2ca35beeff11..06a68557d75e 100644 --- a/nixpkgs/pkgs/servers/moonraker/default.nix +++ b/nixpkgs/pkgs/servers/moonraker/default.nix @@ -14,13 +14,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-07-18"; + version = "unstable-2021-09-04"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "42f61ceafa90fcfea8bffbe968e26a6fd8b61af6"; - sha256 = "1w6l9pgs4n4nnk3h40y346bf6j3v4j4h1qnhj5dwlbwdxiqpd9gs"; + rev = "db3f69e0dddcc8ac07e895a9a65906a8e08707e7"; + sha256 = "uam3Vp/NA8HWxqqy6l8UkeaR5OSqHMwb5uXUL4E0jBQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/nextcloud/news-updater.nix b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix index 88a30e358ab9..bb66a9463a05 100644 --- a/nixpkgs/pkgs/servers/nextcloud/news-updater.nix +++ b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "nextcloud-news-updater"; - version = "10.0.1"; + version = "11.0.0"; src = fetchurl { url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz"; - sha256 = "14jj3w417wfsm1ki34d980b0s6vfn8i29g4c66qb2fizdq1d0z6q"; + sha256 = "bc2055c16f0dbf610b7e17650508a18fa5a1de652ecdf69c5d4073c97376e9cf"; }; doCheck = false; diff --git a/nixpkgs/pkgs/servers/pounce/default.nix b/nixpkgs/pkgs/servers/pounce/default.nix index 8e1b0864c9bc..68b2779c7fa4 100644 --- a/nixpkgs/pkgs/servers/pounce/default.nix +++ b/nixpkgs/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "2.4"; + version = "2.5"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "sha256-bEObiqgkSarYILwZE70OjRyEUy3QZg+FLocWljFRGNc="; + sha256 = "0swbncsm888r95dwk13v1vii5sr3gah817dfah5v7zs8lsv1kgv5"; }; buildInputs = [ libressl ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix index 1017611aeaa9..38d23e51682d 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "A graph database extension for PostgreSQL"; homepage = "https://github.com/bitnine-oss/AgensGraph-Extension"; changelog = "https://github.com/bitnine-oss/AgensGraph-Extension/releases/tag/v${version}"; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = postgresql.meta.platforms; license = licenses.asl20; broken = versionOlder postgresql.version "11.0"; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index c51cd9117a46..cb0aac6147fe 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "0bg1qxjszqnv0c5k5vf60sh8lcfagp9d66sprkf0d83yjh5qpwlm"; + sha256 = "158rr0q2y34mjikripz7n61gc3ivj29brxxz4yq72qbz5bd859yj"; }; buildInputs = [ postgresql openssl zlib readline libkrb5 ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 4689f176188c..b3fe24bfb953 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_hll"; - version = "2.15.1"; + version = "2.16"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-hll"; rev = "refs/tags/v${version}"; - sha256 = "17lg05rw7299fvfhdzvznr692c21s5qar1wzzvgwfv7afv6xzr3y"; + sha256 = "0icns4m3dkm20fs6gznciwsb8ba8gcc316igz6j7qwjdnyg2ppbf"; }; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; - changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/citusdata/postgresql-hll/raw/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix index eb0965a33781..3a0c1ea1f26e 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_topn"; - version = "2.3.1"; + version = "2.4.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "0ai07an90ywhk10q52hajgb33va5q76j7h8vj1r0rvq6dyii0wal"; + sha256 = "1appxriw7h29kyhv3h6b338g5m2nz70q3mxasy4mjimqhbz1zyqs"; }; installPhase = '' @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; - changelog = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/citusdata/postgresql-topn/raw/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index 53dfee7d0326..2c67b65d7609 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "07m1nn640by5q22q2s1nlmjp14q5ffbyib28kjzlss0mq8acb439"; + sha256 = "0kq28k96y5r0k6nhz78c3frqzhf8d1af54dqbpayn7fgvdl0vlm2"; }; buildInputs = [ postgresql ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index 4b69aca710ad..245ff62f7c03 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.3"; + version = "3.1.4"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "1jwz6hdrym837b7dvn00qmwnbb40a7gr43va409h8fmp7dajksbi"; + sha256 = "15ip38p7df9d9l6l3xhn2x8marbz8dy5lk3jblpl4bjkpkl3z3nw"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/nixpkgs/pkgs/servers/tracing/tempo/default.nix index b22e8c29b9ab..3380a0e99d12 100644 --- a/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "1.0.1"; + version = "1.1.0"; pname = "tempo"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "sha256-4QrCoz4taNXV13g+Pi0j7pTWy0hLY/qAdTOIMMuDWIA="; + sha256 = "sha256-qKsgcc62HTwl7Usmp8zk4vKDo4XEJnwL+A3hoLhgBkk="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index 3a70b148b114..641554e1d6cb 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.5.1"; + version = "2.5.2"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-vO8sBksh5gRq+s7VXshs5wZw4ygqbJzG2J3iSEGl/Ws="; + sha256 = "1q93l7jb0vs1d324453gk307hlhav2g0xjqkcz3f43rxhb0jbwpk"; stripRoot = false; }; - vendorSha256 = "sha256-tBUW6iBZZYc2OgSzFcDZ1C8YnyrXnuy3SdQiy8FPksM="; + vendorSha256 = "054l0b6xlbl9sh2bisnydm9dha30jrafybb06ggzbjffsqcgj7qw"; doCheck = false; @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://traefik.io"; description = "A modern reverse proxy"; + changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ vdemeester ]; }; diff --git a/nixpkgs/pkgs/servers/unpackerr/default.nix b/nixpkgs/pkgs/servers/unpackerr/default.nix index 0d1505a91ca2..3eaf95a45182 100644 --- a/nixpkgs/pkgs/servers/unpackerr/default.nix +++ b/nixpkgs/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-OJDFPSXbJffiKW1SmMptPxj69YU7cuOU1LgIiInurCM="; + sha256 = "08xcxs4qh25qsjaf6wivhpszl61zdp59hlkd57igf9fv4lywb41q"; }; - vendorSha256 = "sha256-n8gRefr+MyiSaATG1mZrS3lx4oDEfbQ1LQxQ6vp5l0Y="; + vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z"; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; diff --git a/nixpkgs/pkgs/servers/vouch-proxy/default.nix b/nixpkgs/pkgs/servers/vouch-proxy/default.nix index 8badb4f8fdd9..3c0551a2de87 100644 --- a/nixpkgs/pkgs/servers/vouch-proxy/default.nix +++ b/nixpkgs/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-thA3hsGNDifUc0XFsOB8cjJTrz4NY+NtK05a20AFzJ8="; + sha256 = "sha256-xkCnBRGSryFf90dOeoZKQhugX66zkF/gYF1v6N9yjTQ="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; diff --git a/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix b/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix index cfe00e59a2ed..70d91dba5c9e 100644 --- a/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { single-host-smoke-test = nixosTests.jitsi-meet; }; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Secure, Simple and Scalable Video Conferences"; longDescription = '' diff --git a/nixpkgs/pkgs/servers/web-apps/jitsi-meet/update.sh b/nixpkgs/pkgs/servers/web-apps/jitsi-meet/update.sh new file mode 100755 index 000000000000..9c80fa4e6039 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/jitsi-meet/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl https://download.jitsi.org/stable/ | \ + pup 'a[href] text{}' | \ + awk -F'[_-]' '/jitsi-meet-web_/ {printf $4"\n"}' | \ + sort -u | \ + tail -n 1)" + +update-source-version jitsi-meet "$version" diff --git a/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix b/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix index 285352da36e6..fc1aa09e4f69 100644 --- a/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix +++ b/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-xqC7MaPe5cClMUTSRE3HLTEH3LH1J1bJSdH+1ZOfGo4="; + sha256 = "sha256-43y9+y5VVgbCexHPsYZ9/Up84OoPSrThHWiKR0P1h3s="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-/vXyZznGxj5hxwqi4sttBBkEoS25DJqwoBtADCRO9Qc="; + vendorSha256 = "sha256-1tXnlOlVH61Y4jN07XBfTgZhAsU2HeudiEVAtlP+Cpk="; # checks need to be disabled because of needed internet for some checks doCheck = false; diff --git a/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix b/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix index e3b8a8785dec..6cca64e19ae9 100644 --- a/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-LUYBCdEwDMwhFuIIRmnrtQN9ChaEZyFbItMxh27H5XY="; + sha256 = "sha256-LV7+HfXeNcVHuoo+n6fuAQoIb/m0lOs6JYYMNLM/jTA="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix index fcab309118b9..c16f3a88b378 100644 --- a/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.201"; + version = "2.5.214"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; - sha256 = "sha256-k2G+jUne/lq0dRJsIQpWlRFg1Nq92bM28YkawKOKlsI="; + sha256 = "sha256-EXysHhEJ41LMLRueEoFr+SE9SdJEXMZLhJQSvZgToTg="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 43e77d918e1c..773632328a05 100644 --- a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -1,19 +1,24 @@ { stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg -, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop +, lua , nixosTests -, withLibevent ? true, luaevent ? null -, withDBI ? true, luadbi ? null +, withLibevent ? true +, withDBI ? true # use withExtraLibs to add additional dependencies of community modules , withExtraLibs ? [ ] , withOnlyInstalledCommunityModules ? [ ] , withCommunityModules ? [ ] }: -assert withLibevent -> luaevent != null; -assert withDBI -> luadbi != null; - with lib; +let + luaEnv = lua.withPackages(p: with p; [ + luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 + ] + ++ lib.optional withLibevent p.luaevent + ++ lib.optional withDBI p.luadbi + ); +in stdenv.mkDerivation rec { version = "0.11.10"; # also update communityModules pname = "prosody"; @@ -41,28 +46,24 @@ stdenv.mkDerivation rec { sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - lua5 makeWrapper libidn openssl - ] - # Lua libraries - ++ [ - luasocket luasec luaexpat luafilesystem luabitop + luaEnv libidn openssl ] - ++ optional withLibevent luaevent - ++ optional withDBI luadbi ++ withExtraLibs; configureFlags = [ "--ostype=linux" - "--with-lua-include=${lua5}/include" - "--with-lua=${lua5}" + "--with-lua-include=${luaEnv}/include" + "--with-lua=${luaEnv}" ]; postBuild = '' make -C tools/migration ''; + # the wrapping should go away once lua hook is fixed postInstall = '' ${concatMapStringsSep "\n" (module: '' cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ diff --git a/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix b/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix index 51e7dcc096b8..3547af490e6a 100644 --- a/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix @@ -1,17 +1,17 @@ -{ lib, buildFishPlugin, fetchFromGitHub, fzf, clownfish, fishtape_3 }: +{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }: buildFishPlugin rec { pname = "fzf.fish"; - version = "5.6"; + version = "7.3"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "1b280n8bh00n4vkm19zrn84km52296ljlm1zhz95jgaiwymf2x73"; + sha256 = "16mdfyznxjhv7x561srl559misn37a35d2q9fspxa7qg1d0sc3x9"; }; - checkInputs = [ fzf ]; + checkInputs = [ fzf fd util-linux ]; checkPlugins = [ clownfish fishtape_3 ]; checkFunctionDirs = [ "./functions" ]; checkPhase = '' @@ -20,10 +20,16 @@ buildFishPlugin rec { rm -r tests/*git* # Disable tests that are failing, probably because of our wrappers + rm -r tests/configure_bindings rm -r tests/search_shell_variables - fishtape tests/*/*.fish - ''; + # Disable tests that are failing, because there is not 'rev' command + rm tests/preview_file/custom_file_preview.fish + + '' + ( + if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' + else ''script -c 'fish -c "fishtape tests/*/*.fish"' '' + ); meta = with lib; { description = "Augment your fish command line with fzf key bindings"; diff --git a/nixpkgs/pkgs/shells/loksh/default.nix b/nixpkgs/pkgs/shells/loksh/default.nix new file mode 100644 index 000000000000..d8463d1773c4 --- /dev/null +++ b/nixpkgs/pkgs/shells/loksh/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, meson +, ninja +, pkg-config +, ncurses +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "loksh"; + version = "6.9"; + + src = fetchFromGitHub { + owner = "dimkr"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "0x33plxqhh5202hgqidgccz5hpg8d2q71ylgnm437g60mfi9z0px"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + ncurses + ]; + + postInstall = '' + mv $out/bin/ksh $out/bin/loksh + mv $out/share/man/man1/ksh.1 $out/share/man/man1/loksh.1 + mv $out/share/man/man1/sh.1 $out/share/man/man1/loksh-sh.1 + ''; + + passthru = { + shellPath = "/bin/loksh"; + }; + + meta = with lib; { + description = "Linux port of OpenBSD's ksh"; + homepage = "https://github.com/dimkr/loksh"; + license = licenses.publicDomain; + maintainers = with maintainers; [ cameronnemo ]; + platforms = platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index e78c208b56fe..63840a3b8ed8 100644 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-08-27"; + version = "2021-09-09"; pname = "oh-my-zsh"; - rev = "190325049ef93731ab28295dbedf36d44ab33d7a"; + rev = "358ac6a141010b19175d0eb5a6f28ff544aa75d3"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "x+cGlYjTgs7Esb4NNSBcKhoDb1SuEQxONt/sSHeVj0M="; + sha256 = "n4x61WeKTba7hRU/01iaU6OYT3741VbCNzLaui69r/Q="; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch new file mode 100644 index 000000000000..54b6ce26138a --- /dev/null +++ b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch @@ -0,0 +1,11 @@ +diff --git a/modules/Src/aloxaf/fzftab.c b/modules/Src/aloxaf/fzftab.c +index 60b6330..91975d8 100644 +--- a/modules/Src/aloxaf/fzftab.c ++++ b/modules/Src/aloxaf/fzftab.c +@@ -1,6 +1,5 @@ + #include "fzftab.mdh" + #include "fzftab.pro" +-#include <malloc.h> + #include <stdarg.h> + #include <stdlib.h> + #include <sys/stat.h> diff --git a/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix index ccf60e6d76af..ad1b7d3d740c 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -15,6 +15,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses ]; + patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + postConfigure = '' pushd modules ./configure --disable-gdbm --without-tcsetpgrp @@ -40,6 +42,6 @@ in stdenv.mkDerivation rec { description = "Replace zsh's default completion selection menu with fzf!"; license = licenses.mit; maintainers = with maintainers; [ vonfry ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/X11/xdotool/default.nix b/nixpkgs/pkgs/tools/X11/xdotool/default.nix index d917e54ec3fb..b9eca0d893a5 100644 --- a/nixpkgs/pkgs/tools/X11/xdotool/default.nix +++ b/nixpkgs/pkgs/tools/X11/xdotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xdotool"; - version = "3.20210804.2"; + version = "3.20210903.1"; src = fetchFromGitHub { owner = "jordansissel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7N5f/BFtq/m5MsXe7ZCTUTc1yp+JDJNRF1P9qB2l554="; + sha256 = "sha256-fmz/CJm1GgNOYjOfC6uNwDa8jV+GczPw8m6Qb2jw3rE="; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 7e4316bf52e6..b4dfcd17aeb3 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -125,5 +125,6 @@ in stdenv.mkDerivation rec { homepage = "https://cloud.google.com/sdk/"; maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + mainProgram = "gcloud"; }; } diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index 722e3b947738..523f8165802e 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -1,5 +1,5 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl -, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap , dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.17"; + version = "4.18"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl"; + sha256 = "19gkllahfd2fgz6vng5lrqx3bdrzaf9s874gzznvzvj9sgj0j3mn"; }; postPatch = '' @@ -34,12 +34,6 @@ buildGoPackage rec { ''; preBuild = '' - # unpack vendor - pushd go/src/github.com/lxc/lxd - rm _dist/src/github.com/lxc/lxd - cp -r _dist/src/* ../../.. - popd - # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" @@ -52,7 +46,7 @@ buildGoPackage rec { wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( networkPkgs - ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ] + ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ] ++ [ (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ] diff --git a/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 9f1239923ec4..0bf1359bc272 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,68 +1,68 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.10.0"; + version = "3.12.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-linux-x64.tar.gz"; - sha256 = "0rhsdxiz5lz4hlw6a1pkjfblsh42vnk9bw8xg7wbjl9wpld3rys1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-linux-x64.tar.gz"; + sha256 = "19b8yndff9ziilrw1lrwjjcxl1lpn9q52z5swjc41rr0j751v8b0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-linux-amd64.tar.gz"; - sha256 = "1s8w5kh9nfdv1vcdrpa2m76r2470k0j4frc3j3ijmqq1i0vv5yhk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-linux-amd64.tar.gz"; + sha256 = "10hgsnab1472dzdb2qrx90mx1xaq8zifcnrsgqqvilzfjnfrd9ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-linux-amd64.tar.gz"; - sha256 = "0scisiswjs3jx0wm6q8i7pgpr2js3kiilq7wc29afyjck6xa14rh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-linux-amd64.tar.gz"; + sha256 = "0rk1irqnmlxzdwx1jnls30xmsrkdn7qin561waqwxq9qrm5012i5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz"; - sha256 = "14s6jyackhp324gdlvvqnyi8s7hj0fb92ilrpd460p05p653zb4x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1f995sg2p1hpqagygsvyfq97gcmy4a925274p96vhy517568d5jg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-linux-amd64.tar.gz"; - sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-linux-amd64.tar.gz"; + sha256 = "1hz4w44c31wyi3vbr9sbph1007rj65vwwbhwrrzyhxy0i75r3igq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-linux-amd64.tar.gz"; - sha256 = "1a62af80czj9sahb52fiz25p59nbzjlr1h7ycdxpjl9m1bxhvlfr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-linux-amd64.tar.gz"; + sha256 = "1divf2nga5kc60mf0cjmyzyghpkkbw44jakfwc7fjiq6j4j0g2ia"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; - sha256 = "06j5k599i8giy5v6scggw8zx1pyfm6w20biwcizv81zk0zkg3fzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0ffqah4anhdacmfb8n3hdq17jhqq0qclc0l0cq77hvhvgn39yy4r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-linux-amd64.tar.gz"; sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-linux-amd64.tar.gz"; - sha256 = "11m1f80i33m4dh13z96yh655pfiwvk46sjspwql7s80kapl93pq9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-linux-amd64.tar.gz"; + sha256 = "1vryq0ki5iimqwxpnvc53m15641p1a1cdbf1xzn0ps4xdsg4xz7j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz"; - sha256 = "159lk4iv9zi2ggcjwjsg9an4rfjc0lbyn8d3kbv10p6cx109ljzg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-linux-amd64.tar.gz"; + sha256 = "1k7zd2cir6844awf1kpj7pifwvw74yfnrk78j0pall2jwmnf2zaa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-linux-amd64.tar.gz"; - sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-amd64.tar.gz"; + sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-linux-amd64.tar.gz"; - sha256 = "0inx40vasjlxfvzr0pxbzm6rki50h5x5qkzx2wc51vv3gjln104q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-linux-amd64.tar.gz"; + sha256 = "0g6h9j64aqj64slp8707kn6dwg32nyqy06xgwycz8ywcw5b2llqp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-linux-amd64.tar.gz"; - sha256 = "19zvqxf13lr98sp3p1ry3q1fvzx0rpxwz5wbk331n5jn0ljzr783"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-linux-amd64.tar.gz"; + sha256 = "0n7vlja8s854nba209sq2pwkd8jnmnmzya65ncqpb0aa9kn9lc2j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-linux-amd64.tar.gz"; - sha256 = "0vyqzphk75h1mk9p6wblgsw2cypycv32glzrnk4fildj48dakm5y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-linux-amd64.tar.gz"; + sha256 = "07zmx5gdwqsrhzm50fj3y9q435ygwmb2j1r2pvpv0i1s66g92kij"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz"; @@ -81,16 +81,16 @@ sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0s1fkj1s5qni84lz0gr1d10xyxp87877jana67lxbarskvzpys8r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-linux-amd64.tar.gz"; + sha256 = "1lmy0dmpspzflc9z8p4w1cz47lbqnbkq8dng3v40lpbs75pnprvs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz"; sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-linux-amd64.tar.gz"; - sha256 = "0rmk55qivand0wa82mxgvyzgg16nz1r3q99k0n9zdlvh9dbffnc8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-linux-amd64.tar.gz"; + sha256 = "1lmhsvzhryj9sl3v51dgq6rby3q5m169mc3dg1jbx1fvgwglmhqb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz"; @@ -99,64 +99,64 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.10.0-darwin-x64.tar.gz"; - sha256 = "18q1v1n3a497wbbzzjngpl90wpjnffn9wnpdp171r47k6xvbcsyq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-darwin-x64.tar.gz"; + sha256 = "1dlgcap861a5fljbadqikn0lm9gz6f1rdn0qhf1f9vyrj1jmwcqf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.15.0-darwin-amd64.tar.gz"; - sha256 = "1jnwlhfyyxz7196igi3gas3459k4nq1f4m1i4vdnxhkskp5838l0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-darwin-amd64.tar.gz"; + sha256 = "18n729y5r827ahaybz01q61r3cv5grxpnfqb0m8fzh2bd41izg4s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "0wy4ayrfqizf8izz5dgwv8xi5hvjh03jrg5lvglfph6549d4lpwc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-darwin-amd64.tar.gz"; + sha256 = "05z8zkbhpj0xsi7ffzd51j83sxx92k10r28gpznn43plnv1v5cjs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1bb78g8k6gnhyxxvcjspnhbw2fig58flr14zi5i1cbd89xkz0m3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "12nba4xjcrh4g9iy3mqalk56bga4l3izqm9rj0fg3cyivr9fffvr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "0xknmx3d6083qvp3v2v8qwjlfihj35r8gzhmhbh759ccjf1d6h4h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.0-darwin-amd64.tar.gz"; - sha256 = "062xzx7408xqlppw1nixs205i83436n0cbjngzc65wm03bzzj7mh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-darwin-amd64.tar.gz"; + sha256 = "00m9nn0mrjdqg0ijkv86376df9kpfd9alk8h2ynk53s6nbz9ff4b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0ffic6mqr1zyskrv60q9wg7jc0hq23l5g0pdh3clpnn2m1xnxnxm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "0j8ysk4wh78xhk3nv6c1dvvyw5ihs7amwlyqicch52yc6jq3v5a6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-darwin-amd64.tar.gz"; sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.15.0-darwin-amd64.tar.gz"; - sha256 = "01vrivbdhsl50kiv092j2a5jvikhrw1kzpa5ags701l721zslycq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-darwin-amd64.tar.gz"; + sha256 = "1cfxnshmc7b1ax819bvic4ih0gc1mi6rij1pp52nklzgby4zad6y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "1iwx80r9kmlrf961zck3qz2jb9shpmywdm5nkflvz6mhwrfsbz72"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "0fabb3zi5p24xfgsc0jn8ynavd1g0qrlm1yqifxv12zr5id4vcvk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-darwin-amd64.tar.gz"; - sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.2.0-darwin-amd64.tar.gz"; - sha256 = "0bj7ir7dpkfsb75bjl45irwi692zxnys0125kmwdn8gnamlij5fx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-darwin-amd64.tar.gz"; + sha256 = "03r5jxgjyrrpx082z785x2yxz3l4ja4al9yh2zhkvdcnjip88r35"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.6.0-darwin-amd64.tar.gz"; - sha256 = "0i06q1hrxi84r8ss3ck7jgk3g4lblkjvgm3wx35v551l0ynmmqqw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "0l1wxnkik28y9y257jdxiq3m3njmfq1awxajp152k11izddxs05i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0fwbh02n7cjmv6d9jbqpjnmvvdp1cnsyhy7gxd2863j4w5f17q48"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-darwin-amd64.tar.gz"; + sha256 = "0s8aaac55kdsid0ay2dm0if9irc55pslmy6lhf7v5bfpcb17i36w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz"; @@ -175,21 +175,203 @@ sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "1x5fm72v9h3lrqcyyq2xm14bc14rsqhjmc4mwa2wgbk4pvjgawyv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1j7z5dbqzsdq1q8ks9g5pwzyc3ml6avhhp6xj94dzdhskl6pd8w5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz"; sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.3.0-darwin-amd64.tar.gz"; - sha256 = "0ay8d84fc1hr1n4fpy1a4nj7bmhxzp86p0x68gz4rr9iwrd7xfgl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "01rrmj95lhvwxi8f338f50l2zspnin41j8hi2j9pjsjwfayhpq93"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz"; sha256 = "1qb2gaiinclmbswyn5aakwjmm3gaggscckb1q2syx69k42hvp3s3"; } ]; + aarch64-linux = [ + { + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-linux-arm64.tar.gz"; + sha256 = "1hzm80ajndaqchxrxdpg0fvc5rqqagbhd5zs8msw166xyanavl9p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-arm64.tar.gz"; + sha256 = "1l7zpvacq6kyzj8n82drs9gdfa16k4j945w8nsd0z33byrswxr3w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-linux-arm64.tar.gz"; + sha256 = "1d67npimg49lx1g9adds32gfpwwv0ikk52qz1kyzfbz10hz62xyx"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-linux-arm64.tar.gz"; + sha256 = "0fh4zrpmgg16jhzdmqihwq8k39bjlchd54mbkd50fphw1w2xw2jz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-arm64.tar.gz"; + sha256 = "1pjvrhmci1fbakx74yndjhkvxxy4yfnwrwbk12dyb3mxc07iycfj"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-linux-arm64.tar.gz"; + sha256 = "07c34x3g31f0bvwfwgxnnikqp5wzyn97hxzwlidvr6g1w7srj0qn"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-linux-arm64.tar.gz"; + sha256 = "1l1p5gqnxd3rb9107m9wi76k8d57ak9w86dniiwys3dqbwxjn1ix"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz"; + sha256 = "1lh1g90ab4blqmvx0yfp516hfsd6n1y751ab7fzhv7hcajf3klvi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-linux-arm64.tar.gz"; + sha256 = "0xibm242vjv1jr2c2v5a1ndlafybq66iqfdmdghys3fa4csb5d4s"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-linux-arm64.tar.gz"; + sha256 = "18as1qkqz0b4cminqf9czd5lx04nr8da7w3g0dbp6bpr7biakra0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-linux-arm64.tar.gz"; + sha256 = "0pwcn2hlfj5nh5fyql8nk4rzfpsrp6ph5kd3r62872z6kz4fr1f8"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-arm64.tar.gz"; + sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-linux-arm64.tar.gz"; + sha256 = "0bz4i7bga2vy4pki9k93f7q6zfcy9yg17xz0j4wfyqmlaanfz8r0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-linux-arm64.tar.gz"; + sha256 = "1vkfrgk6lk3v7fgs10ygaw3x3srp3mncr0wna1xdzf7s1gsz8m09"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-linux-arm64.tar.gz"; + sha256 = "1nyy1is8i9jx9ig1v01l5sbhp4xal1vklmfjnqhr8v8h5kjwkm4v"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-arm64.tar.gz"; + sha256 = "1hicy131pj6z4ni074f34qhvjyycjxl0024iir5021g1scm3hp7w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz"; + sha256 = "1slrl020xl092hjfr92zjf8i2ys8vzr3nxqh65fhnl0fzfsllvn0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-linux-arm64.tar.gz"; + sha256 = "1cpr53shxap4s25pw3xd9vnbwh4jbmp1x0qfqz46i9af0isa10i8"; + } + # pulumi-resource-packet skipped (does not exist on remote) + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-linux-arm64.tar.gz"; + sha256 = "0mddv37k87wiygh6x9bnxpcr721qbmbqf6l5zk3xl61n56j8qyb1"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-arm64.tar.gz"; + sha256 = "0y7wysd4j1dp73hrbydzj2bfvpgv8vxiza5m6dbg7nl66w9ng0rc"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-linux-arm64.tar.gz"; + sha256 = "0fa295br09w7392mb62qw31ia2116dqs15f4r634zcachb0ad93g"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-arm64.tar.gz"; + sha256 = "03z7b32l2jp1si13qy2rjvkjw789sqaypza7q2k4vhwaxyiw715z"; + } + ]; + aarch64-darwin = [ + { + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-darwin-arm64.tar.gz"; + sha256 = "1sasxi57ga7gazjmni4sksyih5dw1qx0bhcmh5f5xyznsb9flk4v"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-arm64.tar.gz"; + sha256 = "1rmvc2kgjmb978sfmlga6xy4i0f629lk1l95i30wg0rmj1hx3dag"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-darwin-arm64.tar.gz"; + sha256 = "0hw0x8bxj0rdkxchlsa30phkglgcln14xv2capx67vpdp9qg8iyi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-darwin-arm64.tar.gz"; + sha256 = "125mb2qmxb5cwnvqwckiaih9gq84azfb0qbrw2vmz338967sfz2c"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "0p7hmdax7bzn93mv6l79g3g38fh1axnryyq8sg3h16wj8gcc8kq5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "1aijk67byw9nwlsdvmw7fiks6ih6wlcbvqpmijchzn86qxikppcq"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-darwin-arm64.tar.gz"; + sha256 = "1smg4r1aijl42hv28v2gjvbmlrhmcs5p4w4pzngv7wsgsm5y6lzm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "1z0gd0fagv55dl3ki340h0ljw7dqj8818w4072pc5xxy5id90gb0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-darwin-arm64.tar.gz"; + sha256 = "1170s85p6d850czb0amzk06d3bcyzyp14p49sgqvpa099jyvs4mm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-darwin-arm64.tar.gz"; + sha256 = "0hvsprzznj0incv60lhxxh4jsx67h7l49v65288ic0x0nsgibn4x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "0qjpay735gff28xdvippm11lh8gk2xsvh2mcil679ybgpk6kypw2"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-darwin-arm64.tar.gz"; + sha256 = "1fcxgbqw6fpn202hza4yyq370r9vbfy8pw220g7yihg8vy9wb1dk"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-darwin-arm64.tar.gz"; + sha256 = "0h35d4j6s22sxgf579b6f0v14qp49z5rqzcb30pi4grsk8zkqrrr"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-darwin-arm64.tar.gz"; + sha256 = "0sg73w6h94w0mj9q45av9k2sw251k2a7lnh52ndkbc2phqx3rshh"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "118kszs5y3ajh702dyy4wivwdima30s3spbr3cdm9g7aabqhl5l6"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz"; + sha256 = "10a2f5kdgk3jcd1441zbfcfnrl5zj6ks832jjmbyym33by7scvgc"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "17imdik9gb3bhqh71b82h12sx6rn13iann9dlbdxy3zj3g59k3ri"; + } + # pulumi-resource-packet skipped (does not exist on remote) + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "0fj1ai1kv8xgmsvfbmy5gsinxag70rx9a9gkifqgcpn3r9mj48ks"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "0waf4apw5bzn276s34yaxvm3xyk5333l3zcz2j52c56wkadzxvpg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "1ywy4zv96k5x85j0fw36q331p11ka1fpg9x18d9ijwl424c7669j"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-arm64.tar.gz"; + sha256 = "0ci3xnxnwrk6dds21yifis1mrz24z2nxqdbya0qpqprkq6syvx41"; + } + ]; }; } diff --git a/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/nixpkgs/pkgs/tools/admin/pulumi/update.sh index b65ea5e34968..756dce6b8eea 100755 --- a/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -3,37 +3,37 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.10.0" +VERSION="3.12.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=2.2.0" - "aws=4.15.0" - "cloudflare=3.4.0" - "consul=3.2.0" - "datadog=3.3.0" - "digitalocean=4.6.0" - "docker=3.0.0" + "aws=4.19.0" + "cloudflare=3.5.0" + "consul=3.3.0" + "datadog=4.1.0" + "digitalocean=4.6.1" + "docker=3.1.0" "equinix-metal=2.0.0" - "gcp=5.15.0" - "github=4.2.0" - "gitlab=4.1.0" - "hcloud=1.2.0" - "kubernetes=3.6.0" - "linode=3.3.0" + "gcp=5.18.0" + "github=4.3.0" + "gitlab=4.2.0" + "hcloud=1.4.0" + "kubernetes=3.7.0" + "linode=3.3.2" "mailgun=3.1.0" "mysql=3.0.0" "openstack=3.3.0" "packet=3.2.2" - "postgresql=3.1.0" + "postgresql=3.2.0" "random=4.2.0" - "vault=4.3.0" + "vault=4.4.0" "vsphere=4.0.1" ) function genMainSrc() { - local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" + local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-${1}-${2}.tar.gz" local sha256 sha256=$(nix-prefetch-url "$url") echo " {" @@ -48,13 +48,17 @@ function genSrcs() { local version=${plugVers#*=} # url as defined here # https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197 - local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-$1-amd64.tar.gz" + local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-${1}-${2}.tar.gz" local sha256 sha256=$(nix-prefetch-url "$url") - echo " {" - echo " url = \"${url}\";" - echo " sha256 = \"$sha256\";" - echo " }" + if [ "$sha256" ]; then # file exists + echo " {" + echo " url = \"${url}\";" + echo " sha256 = \"$sha256\";" + echo " }" + else + echo " # pulumi-resource-${plug} skipped (does not exist on remote)" + fi done } @@ -65,16 +69,29 @@ function genSrcs() { { version = "${VERSION}"; pulumiPkgs = { - x86_64-linux = [ EOF - genMainSrc "linux" - genSrcs "linux" + + echo " x86_64-linux = [" + genMainSrc "linux" "x64" + genSrcs "linux" "amd64" echo " ];" + echo " x86_64-darwin = [" + genMainSrc "darwin" "x64" + genSrcs "darwin" "amd64" + echo " ];" - genMainSrc "darwin" - genSrcs "darwin" + echo " aarch64-linux = [" + genMainSrc "linux" "arm64" + genSrcs "linux" "arm64" echo " ];" + + echo " aarch64-darwin = [" + genMainSrc "darwin" "arm64" + genSrcs "darwin" "arm64" + echo " ];" + echo " };" echo "}" + } > data.nix diff --git a/nixpkgs/pkgs/tools/archivers/cabextract/default.nix b/nixpkgs/pkgs/tools/archivers/cabextract/default.nix index 4dddc4a5a6ae..c0c60aa1cde8 100644 --- a/nixpkgs/pkgs/tools/archivers/cabextract/default.nix +++ b/nixpkgs/pkgs/tools/archivers/cabextract/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"; }; + # Let's assume that fnmatch works for cross-compilation, otherwise it gives an error: + # undefined reference to `rpl_fnmatch'. + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_func_fnmatch_works=yes" + ]; + meta = with lib; { homepage = "https://www.cabextract.org.uk/"; description = "Free Software for extracting Microsoft cabinet files"; diff --git a/nixpkgs/pkgs/tools/archivers/unp/default.nix b/nixpkgs/pkgs/tools/archivers/unp/default.nix index c63ec008d678..aeb0fb91c989 100644 --- a/nixpkgs/pkgs/tools/archivers/unp/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unp/default.nix @@ -9,15 +9,14 @@ let in stdenv.mkDerivation { pname = "unp"; - version = "2.0-pre7"; + version = "2.0-pre9"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; src = fetchurl { - # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2"; - url = "mirror://debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2"; - sha256 = "09w2sy7ivmylxf8blf0ywxicvb4pbl0xhrlbb3i9x9d56ll6ybbw"; - name = "unp_2.0_pre7+nmu1.tar.bz2"; + url = "mirror://debian/pool/main/u/unp/unp_2.0~pre9.tar.xz"; + sha256 = "1lp5vi9x1qi3b21nzv0yqqacj6p74qkl5zryzwq30rjkyvahjya1"; + name = "unp_2.0_pre9.tar.xz"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix b/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix index 9118765cc1be..0d3ccc0d7a71 100644 --- a/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -14,6 +14,7 @@ pythonPackages.buildPythonApplication rec { postPatch = '' sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py sed -i -e '/namespace_packages/d' setup.py + sed -i -e 's/mediafile~=0.6.0/mediafile>=0.6.0/' setup.py ''; nativeBuildInputs = [ beets ]; diff --git a/nixpkgs/pkgs/tools/audio/tts/default.nix b/nixpkgs/pkgs/tools/audio/tts/default.nix index eb1ea2aa5923..2f8a9ac82a67 100644 --- a/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-7YMNxZ15qQowEE0tE6x/LbtirNGp7h9OLyS1JSl9x2A="; + sha256 = "sha256-hhL6/hBs2umR8/VEumr2LzuCAOkroK8vBfDuNVY0ygw="; }; postPatch = '' @@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication rec { pypinyin pysbd pytorch + pyworld scipy soundfile tensorboardx diff --git a/nixpkgs/pkgs/tools/backup/android-backup-extractor/default.nix b/nixpkgs/pkgs/tools/backup/android-backup-extractor/default.nix new file mode 100644 index 000000000000..8572efe6107f --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/android-backup-extractor/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, jre +}: + +stdenv.mkDerivation rec { + pname = "android-backup-extractor"; + version = "20210909062443-4c55371"; + + src = fetchurl { + url = "https://github.com/nelenkov/android-backup-extractor/releases/download/${version}/abe.jar"; + sha256 = "0ms241kb4h9y9apr637sb4kw5mml40c1ac0q4jcxhnwr3dr05w1q"; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jre ]; + + installPhase = '' + runHook preInstall + install -D $src $out/lib/android-backup-extractor/abe.jar + makeWrapper ${jre}/bin/java $out/bin/abe --add-flags "-cp $out/lib/android-backup-extractor/abe.jar org.nick.abe.Main" + runHook postInstall + ''; + + meta = with lib; { + description = "Utility to extract and repack Android backups created with adb backup"; + homepage = "https://github.com/nelenkov/android-backup-extractor"; + license = licenses.asl20; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix index 9cf489c4db5d..fe7b041b1533 100644 --- a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "discordchatexporter-cli"; - version = "2.30"; + version = "2.30.1"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "uTOeRsEab4vaAwtfysUTM3xFP5UMxpUQnuuU8hv3nk8="; + sha256 = "JSYIhd+DNVOKseHtWNNChECR5hKr+ntu1Yyqtnlg8rM="; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; diff --git a/nixpkgs/pkgs/tools/backup/mylvmbackup/default.nix b/nixpkgs/pkgs/tools/backup/mylvmbackup/default.nix new file mode 100644 index 000000000000..6c87fca05672 --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/mylvmbackup/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchurl +, perlPackages +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "mylvmbackup"; + version = "0.16"; + + src = fetchurl { + url = "https://www.lenzg.net/mylvmbackup/${pname}-${version}.tar.gz"; + sha256 = "sha256-vb7M3EPIrxIz6jUwm241fzaEz2czqdCObrFgSOSgJRU="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; + + dontConfigure = true; + + postPatch = '' + patchShebangs mylvmbackup + substituteInPlace Makefile \ + --replace "prefix = /usr/local" "prefix = ${builtins.placeholder "out"}" \ + --replace "sysconfdir = /etc" "sysconfdir = ${builtins.placeholder "out"}/etc" \ + --replace "/usr/bin/install" "install" + ''; + + postInstall = '' + wrapProgram "$out/bin/mylvmbackup" \ + --prefix PERL5LIB : "${perlPackages.makePerlPath ( + with perlPackages; [ + ConfigIniFiles + DBDmysql + DBI + TimeDate + FileCopyRecursive + ] + )}" + ''; + + meta = { + homepage = "https://www.lenzg.net/mylvmbackup/"; + description = "a tool for quickly creating full physical backups of a MySQL server's data files"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ ryantm ]; + platforms = with lib.platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix b/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix new file mode 100644 index 000000000000..f6a684084661 --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix @@ -0,0 +1,33 @@ +{ lib, python3Packages }: + +let + pythonPackages = python3Packages; + +in +pythonPackages.buildPythonApplication rec { + pname = "zfs_autobackup"; + version = "3.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "42c22001717b3d7cfdae6297fedc11b2dd1eb2a4bd25b6bb1c9232dd3b70ad67"; + }; + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "argparse" "" + ''; + + propagatedBuildInputs = with pythonPackages; [ colorama ]; + + # tests need zfs filesystem + doCheck = false; + pythonImportsCheck = [ "colorama" "argparse" ]; + + meta = with lib; { + homepage = "https://github.com/psy0rz/zfs_autobackup"; + description = "ZFS backup, replicationand snapshot tool"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mschneider ]; + }; +} diff --git a/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix new file mode 100644 index 000000000000..334b3abdfc95 --- /dev/null +++ b/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -0,0 +1,95 @@ +{ lib, stdenv, fetchurl, fetchpatch +, autoPatchelfHook, makeWrapper +, hexdump, exfat, dosfstools, e2fsprogs, xz, util-linux, bash, parted +}: + +let arch = { + x86_64-linux = "x86_64"; + i686-linux = "i386"; + aarch64-linux = "aarch64"; + mipsel-linux = "mips64el"; +}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); +in stdenv.mkDerivation rec { + pname = "ventoy-bin"; + version = "1.0.51"; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = [ hexdump exfat dosfstools e2fsprogs xz util-linux bash parted ]; + + src = fetchurl { + url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; + sha256 = "81ae02a06b132b5965dd09c9b64e000a6dafa1d57e03d8564feefda14ef1ee02"; + }; + patches = [ + (fetchpatch { + name = "sanitize.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=ventoy-bin&id=ce4c26c67a1de4b761f9448bf92e94ffae1c8148"; + sha256 = "c00f9f9cd5b4f81c566267b7b2480fa94d28dda43a71b1e47d6fa86f764e7038"; + }) + ./fix-for-read-only-file-system.patch + ]; + patchFlags = [ "-p0" ]; + postPatch = '' + # Fix permissions. + find -type f -name \*.sh -exec chmod a+x '{}' \; + + # Fix path to log. + sed -i 's:[lL]og\.txt:/var/log/ventoy\.log:g' WebUI/static/js/languages.js + ''; + installPhase = '' + # Setup variables. + local VENTOY_PATH="$out"/share/ventoy + local ARCH='${arch}' + + # Prepare. + cd tool/"$ARCH" + rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat* + for archive in *.xz; do + xzcat "$archive" > "''${archive%.xz}" + rm "$archive" + done + chmod a+x * + cd - + + # Cleanup. + case "$ARCH" in + x86_64) rm -r tool/{i386,aarch64,mips64el};; + i386) rm -r tool/{x86_64,aarch64,mips64el};; + aarch64) rm -r tool/{x86_64,i386,mips64el};; + mips64el) rm -r tool/{x86_64,i386,aarch64};; + esac + rm README + + # Copy from "$src" to "$out". + mkdir -p "$out"/bin "$VENTOY_PATH" + cp -r . "$VENTOY_PATH" + + # Fill bin dir. + for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \ + CreatePersistentImg.sh_ventoy-persistent \ + ExtendPersistentImg.sh_ventoy-extend-persistent; do + makeWrapper "$VENTOY_PATH/''${f%_*}" "$out/bin/''${f#*_}" \ + --prefix PATH : "${lib.makeBinPath buildInputs}" \ + --run "cd '$VENTOY_PATH' || exit 1" + done + ''; + + meta = with lib; { + description = "An open source tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files"; + longDescription = '' + An open source tool to create bootable USB drive for + ISO/WIM/IMG/VHD(x)/EFI files. With ventoy, you don't need to format the + disk over and over, you just need to copy the ISO/WIM/IMG/VHD(x)/EFI + files to the USB drive and boot them directly. You can copy many files + at a time and ventoy will give you a boot menu to select them + (screenshot). x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and + MIPS64EL UEFI are supported in the same way. Most type of OS supported + (Windows/WinPE/Linux/Unix/VMware/Xen...). + ''; + homepage = "https://www.ventoy.net"; + changelog = "https://www.ventoy.net/doc_news.html"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; + maintainers = with maintainers; [ k4leg ]; + }; +} diff --git a/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch b/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch new file mode 100644 index 000000000000..fa3eb7c38b34 --- /dev/null +++ b/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch @@ -0,0 +1,118 @@ +diff -Naurp0 old/CreatePersistentImg.sh new/CreatePersistentImg.sh +--- CreatePersistentImg.sh 2021-07-17 13:13:51.000000000 +0300 ++++ CreatePersistentImg.sh 2021-07-20 17:37:53.605911754 +0300 +@@ -94,7 +94,3 @@ if [ -n "$config" ]; then +- if [ -d ./persist_tmp_mnt ]; then +- rm -rf ./persist_tmp_mnt +- fi +- +- mkdir ./persist_tmp_mnt +- if mount $freeloop ./persist_tmp_mnt; then +- echo '/ union' > ./persist_tmp_mnt/$config ++ path_to_persist_mnt="$(mktemp -d)" ++ if mount $freeloop "$path_to_persist_mnt"; then ++ echo '/ union' > "$path_to_persist_mnt"/$config +@@ -102 +98 @@ if [ -n "$config" ]; then +- umount ./persist_tmp_mnt ++ umount "$path_to_persist_mnt" +@@ -104 +100 @@ if [ -n "$config" ]; then +- rm -rf ./persist_tmp_mnt ++ rm -rf "$path_to_persist_mnt" +diff -Naurp0 old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh +--- tool/VentoyWorker.sh 2021-07-17 13:13:51.000000000 +0300 ++++ tool/VentoyWorker.sh 2021-07-20 17:27:10.885452119 +0300 +@@ -153,12 +152,0 @@ fi +-#check tmp_mnt directory +-if [ -d ./tmp_mnt ]; then +- vtdebug "There is a tmp_mnt directory, now delete it." +- umount ./tmp_mnt >/dev/null 2>&1 +- rm -rf ./tmp_mnt +- if [ -d ./tmp_mnt ]; then +- vterr "tmp_mnt directory exits, please delete it first." +- exit 1 +- fi +-fi +- +- +@@ -322 +310 @@ if [ "$MODE" = "install" ]; then +- mkdir ./tmp_mnt ++ path_to_mnt="$(mktemp -d)" +@@ -326 +314 @@ if [ "$MODE" = "install" ]; then +- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then ++ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then +@@ -335,9 +323,9 @@ if [ "$MODE" = "install" ]; then +- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi +- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi +- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi +- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi +- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer +- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi ++ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer ++ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI +@@ -348 +336 @@ if [ "$MODE" = "install" ]; then +- if umount ./tmp_mnt; then ++ if umount "$path_to_mnt"; then +@@ -350 +338 @@ if [ "$MODE" = "install" ]; then +- rm -rf ./tmp_mnt ++ rm -rf "$path_to_mnt" +@@ -407,2 +395,2 @@ else +- rm -f ./diskuuid.bin +- dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin ++ path_to_diskuuid="$(mktemp)" ++ dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid" +@@ -411,2 +399,2 @@ else +- dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384 +- rm -f ./diskuuid.bin ++ dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384 ++ rm -f "$path_to_diskuuid" +@@ -415,2 +403,2 @@ else +- rm -f ./rsvdata.bin +- dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin ++ path_to_rsvdata="$(mktemp)" ++ dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata" +@@ -438,2 +426,2 @@ else +- dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK} +- rm -f ./rsvdata.bin ++ dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK} ++ rm -f "$path_to_rsvdata" +@@ -448 +436 @@ else +- mkdir ./tmp_mnt ++ path_to_mnt="$(mktemp -d)" +@@ -454 +442 @@ else +- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then ++ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then +@@ -463,9 +451,9 @@ else +- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi +- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi +- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi +- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi +- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer +- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi ++ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer ++ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI +@@ -476 +464 @@ else +- if umount ./tmp_mnt > /dev/null 2>&1; then ++ if umount "$path_to_mnt" > /dev/null 2>&1; then +@@ -478 +466 @@ else +- rm -rf ./tmp_mnt ++ rm -rf "$path_to_mnt" diff --git a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 29750531db20..59b65d4e72ed 100644 --- a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -8,12 +8,6 @@ , libfido2 }: -let - # pandoc is currently broken on aarch64-darwin - # because of missing ghc - brokenPandoc = stdenv.isDarwin && stdenv.isAarch64; -in - buildGoModule rec { pname = "gocryptfs"; version = "2.1"; @@ -29,7 +23,6 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals (!brokenPandoc) [ pandoc ]; @@ -45,7 +38,7 @@ buildGoModule rec { subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; - postBuild = lib.optionalString (!brokenPandoc) '' + postBuild = '' pushd Documentation/ mkdir -p $out/share/man/man1 # taken from Documentation/MANPAGE-render.bash diff --git a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix index 08562aed3635..912456154744 100644 --- a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rdfind"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz"; - sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih"; + sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21"; }; buildInputs = [ nettle ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.wmertens ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix index b14dc620e421..238223c4981e 100644 --- a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix @@ -48,7 +48,12 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=\${out}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" ] + makeFlags = [ + "XZ_SUPPORT=1" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + "AR=${stdenv.cc.targetPrefix}ar" + ] ++ lib.optional lz4Support "LZ4_SUPPORT=1"; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix index b46fd88ab99d..741468dfd994 100644 --- a/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix @@ -2,6 +2,7 @@ , cairo, gd, libcerf, pango, readline, zlib , withTeXLive ? false, texlive , withLua ? false, lua +, withCaca ? false, libcaca , libX11 ? null , libXt ? null , libXpm ? null @@ -33,6 +34,7 @@ in [ cairo gd libcerf pango readline zlib ] ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua + ++ lib.optional withCaca libcaca ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withQt [ qtbase qtsvg ] ++ lib.optional withWxGTK wxGTK; @@ -46,7 +48,7 @@ in (if withX then "--with-x" else "--without-x") (if withQt then "--with-qt=qt5" else "--without-qt") (if aquaterm then "--with-aquaterm" else "--without-aquaterm") - ]; + ] ++ lib.optional withCaca "--with-caca"; CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; diff --git a/nixpkgs/pkgs/tools/graphics/textplots/default.nix b/nixpkgs/pkgs/tools/graphics/textplots/default.nix new file mode 100644 index 000000000000..a0c5e72ac23c --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/textplots/default.nix @@ -0,0 +1,20 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "textplots"; + version = "0.8.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "07lxnvg8g24r1j6h07w91j5lp0azngmb76lagk55y28br0y70qr4"; + }; + + cargoSha256 = "19xb1ann3bqx26nhjjvcwqdsvzg7lflg9fdrnlx05ndd2ip44flz"; + + meta = with lib; { + description = "Terminal plotting written in Rust"; + homepage = "https://github.com/loony-bean/textplots-rs"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix b/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix new file mode 100644 index 000000000000..c541f874adc0 --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/texture-synthesis/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "texture-synthesis"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "embarkstudios"; + repo = pname; + rev = version; + sha256 = "0n1wbxcnxb7x5xwakxdzq7kg1fn0c48i520j03p7wvm5x97vm5h4"; + }; + + cargoSha256 = "1xszis3ip1hymzbhdili2hvdwd862cycwvsxxyjqmz3g2rlg5b64"; + + meta = with lib; { + description = "Example-based texture synthesis written in Rust"; + homepage = "https://github.com/embarkstudios/texture-synthesis"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/bandwidth/default.nix b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix index 677a9ddef514..710382fe8267 100644 --- a/nixpkgs/pkgs/tools/misc/bandwidth/default.nix +++ b/nixpkgs/pkgs/tools/misc/bandwidth/default.nix @@ -6,21 +6,35 @@ let in stdenv.mkDerivation rec { pname = "bandwidth"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; - sha256 = "0x798xj3vhiwq2hal0vmf92sq4h7yalp3i6ylqwhnnpv99m2zws4"; + sha256 = "sha256-trya+/cBNIittQAc5tcykZbImeISqIolO/Y8uOI0jGk="; }; postPatch = '' - sed -i 's,^CC=gcc .*,,' OOC/Makefile Makefile* sed -i 's,ar ,$(AR) ,g' OOC/Makefile + # Remove unnecessary -m32 for 32-bit targets + sed -i 's,-m32,,g' OOC/Makefile + # Fix wrong comment character + sed -i 's,# 32,; 32,g' routines-x86-32bit.asm + # Fix missing symbol exports for macOS clang + echo global _VectorToVector128 >> routines-x86-64bit.asm + echo global _VectorToVector256 >> routines-x86-64bit.asm ''; nativeBuildInputs = [ nasm ]; - buildFlags = [ arch ]; + buildFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + "CC=${stdenv.cc.targetPrefix}cc" + "ARM_AS=${stdenv.cc.targetPrefix}as" + "ARM_CC=$(CC)" + "UNAMEPROC=${stdenv.hostPlatform.parsed.cpu.name}" + "UNAMEMACHINE=${stdenv.hostPlatform.parsed.cpu.name}" + arch + ]; installPhase = '' mkdir -p $out/bin @@ -31,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://zsmith.co/bandwidth.html"; description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.gpl2Plus; - platforms = platforms.x86; + platforms = platforms.x86 ++ platforms.arm ++ platforms.aarch64; maintainers = with maintainers; [ r-burns ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index d65d31d44c4e..fd08f09b9607 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.39"; + version = "3.2.42"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w="; + sha256 = "sha256-NbtgtbhauEo7EGvNUNltUQRBpLlzBjAR0GLL9CadgsQ="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/tools/misc/chafa/default.nix b/nixpkgs/pkgs/tools/misc/chafa/default.nix index 041d799307ec..7a0178eea735 100644 --- a/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.8.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-isQxeb7OQh4W8RvtKWXbKVYJ8LlfLiOkMJoPjsGFouM="; + sha256 = "sha256-8ENPmcl0KVxoBu8FGOGk+y8XsONWW0YW32MHAKBUiPE="; }; nativeBuildInputs = [ autoconf diff --git a/nixpkgs/pkgs/tools/misc/clpeak/default.nix b/nixpkgs/pkgs/tools/misc/clpeak/default.nix index e8b2ab68f316..c87729d81ae0 100644 --- a/nixpkgs/pkgs/tools/misc/clpeak/default.nix +++ b/nixpkgs/pkgs/tools/misc/clpeak/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A tool which profiles OpenCL devices to find their peak capacities"; homepage = "https://github.com/krrishnarraj/clpeak/"; license = licenses.unlicense; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 09f27a0c22cb..bf5d4601475a 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/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 = "182"; + version = "183"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-atWyVMewm+I/SDdE9+z1JYLLVOFDsgps2BL9WgZLlVA="; + sha256 = "sha256-XFFrRmCpE2UvZRCELfPaotLklyjLiCDWkyFWkISOHZM="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/tools/misc/dupd/default.nix b/nixpkgs/pkgs/tools/misc/dupd/default.nix index 87b39b3b7040..2d601b20a765 100644 --- a/nixpkgs/pkgs/tools/misc/dupd/default.nix +++ b/nixpkgs/pkgs/tools/misc/dupd/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "dupd"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "jvirkki"; repo = "dupd"; rev = version; - sha256 = "0vg4vbiwjc5p22cisj8970mym4y2r29fcm08ibik92786vsbxcqk"; + sha256 = "sha256-jDFPvJqIUEu0/8bvq2PaaA1NnWakApegW8bxn+NKffs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/nixpkgs/pkgs/tools/misc/envsubst/default.nix index be563345b2c2..5ecae8dbcbe9 100644 --- a/nixpkgs/pkgs/tools/misc/envsubst/default.nix +++ b/nixpkgs/pkgs/tools/misc/envsubst/default.nix @@ -1,10 +1,9 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "envsubst"; version = "1.2.0"; - goPackagePath = "github.com/a8m/envsubst"; src = fetchFromGitHub { owner = "a8m"; repo = "envsubst"; @@ -12,6 +11,12 @@ buildGoPackage rec { sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n"; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} LICENSE *.md + ''; + meta = with lib; { description = "Environment variables substitution for Go"; homepage = "https://github.com/a8m/envsubst"; diff --git a/nixpkgs/pkgs/tools/misc/etcher/default.nix b/nixpkgs/pkgs/tools/misc/etcher/default.nix index 6834179cfe9a..1e5fefaf6451 100644 --- a/nixpkgs/pkgs/tools/misc/etcher/default.nix +++ b/nixpkgs/pkgs/tools/misc/etcher/default.nix @@ -10,7 +10,7 @@ let sha256 = { - "x86_64-linux" = "sha256-FRZTUOlOK1bIbrHdR9yQv45zMhby3tWbMPpaPPq3L9s="; + "x86_64-linux" = "sha256-Tasynkzyy8UIalQn6qhIuPWDflf4pL76D2czgEijrPw="; "i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1"; }."${stdenv.system}"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.121"; + version = "1.5.122"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; diff --git a/nixpkgs/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix index 9cabff9a9bef..632eb4590586 100644 --- a/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -18,21 +18,16 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; - nativeBuildInputs = [ - cmake pkg-config installShellFiles - # ghc is not supported on aarch64-darwin yet. - ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc; - + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man"; + outputs = [ "out" "man" ]; - postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") '' + postInstall = '' pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 installManPage man/exa.1 man/exa_colors.5 - '' + '' installShellCompletion \ --name exa completions/completions.bash \ --name exa.fish completions/completions.fish \ diff --git a/nixpkgs/pkgs/tools/misc/fbcat/default.nix b/nixpkgs/pkgs/tools/misc/fbcat/default.nix index 8769f65f68c4..532d87de669f 100644 --- a/nixpkgs/pkgs/tools/misc/fbcat/default.nix +++ b/nixpkgs/pkgs/tools/misc/fbcat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fbcat"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "jwilk"; repo = pname; rev = version; - sha256 = "08y79br4a4cgkjnslw0hw57441ybsapaw7wjdbak19mv9lnl5ll9"; + sha256 = "sha256-ORzcd8XGy2BfwuPK5UX+K5Z+FYkb+tdg/gHl3zHjvbk="; }; # hardcoded because makefile target "install" depends on libxslt dependencies from network diff --git a/nixpkgs/pkgs/tools/misc/fclones/default.nix b/nixpkgs/pkgs/tools/misc/fclones/default.nix new file mode 100644 index 000000000000..1072bbcc5da3 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }: + +rustPlatform.buildRustPackage rec { + pname = "fclones"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "pkolaczk"; + repo = pname; + rev = "v${version}"; + sha256 = "1ni5amy903cy822yhw070bcrrixrw2m1vr66q1h32bc98pyv4w05"; + }; + + cargoSha256 = "1gcb46k7bwdfsf6hyvmi6dna1nf6myzy63bhjfp0wy7c8g4m2mg8"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + + # tests in dedupe.rs fail due to + # "creation time is not available for the filesystem" + doCheck = false; + + meta = with lib; { + description = "Efficient Duplicate File Finder and Remover"; + homepage = "https://github.com/pkolaczk/fclones"; + license = licenses.mit; + maintainers = with maintainers; [ cyounkins ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile index 8cbed0ebac40..0b9993c1f197 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile +++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile @@ -6,7 +6,6 @@ gem 'fluent-plugin-s3' gem 'fluent-plugin-kinesis' gem 'fluent-plugin-kafka' gem 'fluent-plugin-elasticsearch' -gem 'fluent-plugin-scribe' gem 'fluent-plugin-mongo' gem 'fluent-plugin-webhdfs' gem 'fluent-plugin-rewrite-tag-filter' diff --git a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock index 1b1f6cec622e..6b3c8dd459ec 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock @@ -77,9 +77,6 @@ GEM aws-sdk-s3 (~> 1.0) aws-sdk-sqs (~> 1.0) fluentd (>= 0.14.22, < 2) - fluent-plugin-scribe (1.0.0) - fluentd - thrift (~> 0.8.0) fluent-plugin-webhdfs (1.2.4) fluentd (>= 0.14.22) webhdfs (>= 0.6.0) @@ -110,7 +107,6 @@ GEM sigdump (~> 0.2.2) sigdump (0.2.4) strptime (0.2.3) - thrift (0.8.0) tzinfo (2.0.0) concurrent-ruby (~> 1.0) tzinfo-data (1.2019.2) @@ -131,7 +127,6 @@ DEPENDENCIES fluent-plugin-record-reformer fluent-plugin-rewrite-tag-filter fluent-plugin-s3 - fluent-plugin-scribe fluent-plugin-webhdfs fluentd diff --git a/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix index 67b72d634bcf..ef063663c1a6 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix @@ -321,17 +321,6 @@ }; version = "1.1.11"; }; - fluent-plugin-scribe = { - dependencies = ["fluentd" "thrift"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30"; - type = "gem"; - }; - version = "1.0.0"; - }; fluent-plugin-webhdfs = { dependencies = ["fluentd" "webhdfs"]; groups = ["default"]; @@ -487,16 +476,6 @@ }; version = "0.2.3"; }; - thrift = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv"; - type = "gem"; - }; - version = "0.8.0"; - }; tzinfo = { dependencies = ["concurrent-ruby"]; groups = ["default"]; diff --git a/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/nixpkgs/pkgs/tools/misc/grub/trusted.nix index b0a8c9e10338..edb94891fbe9 100644 --- a/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake +{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -81,7 +81,14 @@ stdenv.mkDerivation rec { -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; - patches = [ ./fix-bash-completion.patch ]; + patches = [ + ./fix-bash-completion.patch + (fetchpatch { + # glibc-2.26 and above needs '<sys/sysmacros.h>' + url = "https://github.com/Rohde-Schwarz/TrustedGRUB2/commit/7a5b301e3adb8e054288518a325135a1883c1c6c.patch"; + sha256 = "1jfrrmcrd9a8w7n419kszxgbpshx7888wc05smg5q4jvc1ag3xm7"; + }) + ]; # save target that grub is compiled for grubTarget = if inPCSystems @@ -89,7 +96,9 @@ stdenv.mkDerivation rec { else ""; doCheck = false; - enableParallelBuilding = true; + # On -j16 races with early header creation: + # config.h:38:10: fatal error: ./config-util.h: No such file or directory + enableParallelBuilding = false; meta = with lib; { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; diff --git a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index 86d858153746..bd955b8136ec 100644 --- a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "10.0.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SmK4G9AoKGqKGbXucn5AO5DTOeVNq3gCBGvDTIJQgRU="; + sha256 = "198y2k3vi8dh9kfqgl7vpgkxvjlfvryi9c8hmb43m0lpwsja0010"; }; - cargoSha256 = "sha256-iY5xT8e/gRN/mBT9v5LhMcl9g1/SyrH/glPBP+toZ9o="; + cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y"; buildInputs = lib.optional stdenv.isDarwin [ Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; - homepage = "https://github.com/ul/kak-lsp"; + homepage = "https://github.com/kak-lsp/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.spacekookie ]; }; diff --git a/nixpkgs/pkgs/tools/misc/macchina/default.nix b/nixpkgs/pkgs/tools/misc/macchina/default.nix index 8b4b897526da..91f23e1bc1d5 100644 --- a/nixpkgs/pkgs/tools/misc/macchina/default.nix +++ b/nixpkgs/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "1.0.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZuQ0FZM77ENAQ57B0oFqFmGqQnFblCP2wJETb47yo1E="; + sha256 = "sha256:0afsv8n12z98z3dxdb4nflc6z8ss6n2prfqmjzy655ly9rrhkcrw"; }; - cargoSha256 = "sha256-YwhhOHiQcN8VS1DFTtZGvD2QvNAfPngPm/ZeOxzuDnw="; + cargoSha256 = "sha256:0jc2030217xz5v5h3ry2pb7rkakn9zmrcap55bv2r8p7hi5gvh60"; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/nixpkgs/pkgs/tools/misc/nncp/default.nix b/nixpkgs/pkgs/tools/misc/nncp/default.nix index fc02431c768a..1a20c412edba 100644 --- a/nixpkgs/pkgs/tools/misc/nncp/default.nix +++ b/nixpkgs/pkgs/tools/misc/nncp/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "6.5.0"; + version = "7.7.0"; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "16hbcwwf65h2avgdyya2bk42bmmqnfl1m5v7y23cyp174ykjl794"; + sha256 = "ppKi/JY8sKRb/Vt/SXom0L1zhjBPn6PNUm3Gn8o5Ke4="; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/nixpkgs/pkgs/tools/misc/qmk/default.nix b/nixpkgs/pkgs/tools/misc/qmk/default.nix index 3fa088d8e2b4..ef25a7361c26 100644 --- a/nixpkgs/pkgs/tools/misc/qmk/default.nix +++ b/nixpkgs/pkgs/tools/misc/qmk/default.nix @@ -1,18 +1,18 @@ -{ lib -, python3 -, fetchpatch -}: +{ lib, python3, fetchpatch, writeText }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; -in -buildPythonApplication rec { + setuppy = writeText "setup.py" '' + from setuptools import setup + setup() + ''; +in buildPythonApplication rec { pname = "qmk"; - version = "0.0.52"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ="; + sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,7 +27,7 @@ buildPythonApplication rec { appdirs argcomplete colorama - dotty-dict + qmk-dotty-dict hid hjson jsonschema @@ -36,6 +36,10 @@ buildPythonApplication rec { pyusb ]; + postConfigure = '' + cp ${setuppy} setup.py + ''; + # no tests implemented doCheck = false; @@ -57,6 +61,6 @@ buildPythonApplication rec { - ... and many more! ''; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; + maintainers = with maintainers; [ bhipple babariviere ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/quich/default.nix b/nixpkgs/pkgs/tools/misc/quich/default.nix index ea4fbc7eead4..1b54eb01112c 100644 --- a/nixpkgs/pkgs/tools/misc/quich/default.nix +++ b/nixpkgs/pkgs/tools/misc/quich/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "quich"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Usbac"; repo = pname; rev = "v${version}"; - sha256 = "1n9c01q2v6g9wnmxp248yclhp8cxclnj0yyn1qrvjsn6srcpr22c"; + sha256 = "sha256-4gsSjLZ7Z4ErNqe86Fy5IrzLMfvDyY18sE0yBnj9bvM="; }; doCheck = true; diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 157b0fe63764..37462910dcfe 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -4,23 +4,24 @@ let inherit (python3Packages) - python pytest nose cryptography pyyaml requests mock python-dateutil setuptools; + python pytest nose cryptography pyyaml requests mock requests-mock + python-dateutil setuptools; in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1bsinf2r07g8c03mcw4gprl92wmysyaa81s8wyck0c6wdq3hcsnp"; + sha256 = "04gmiqg6mq96fw4v1v6947i216fsf0vcnjp3ya8bbii5na91y1aa"; }; pythonPaths = [ cryptography pyyaml requests ]; - buildInputs = [ python perl mock python-dateutil setuptools ] ++ pythonPaths; + buildInputs = [ python perl python-dateutil setuptools ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip makeWrapper ]; - checkInputs = [ nose pytest ]; + checkInputs = [ nose pytest mock requests-mock ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix index 8ca102444a9d..71c6129b0ef9 100644 --- a/nixpkgs/pkgs/tools/misc/tfk8s/default.nix +++ b/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.6"; + version = "0.1.7"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "sha256-pjgacKyOAlaFqHCKcLmjTl/uWpjMzkHH0UcaIEb+IZI="; + sha256 = "0mkfggwjrsp0rzh7ll6nmp9kqcw4fl8q81vk67z5mbd276dkyxrb"; }; vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; diff --git a/nixpkgs/pkgs/tools/misc/yad/default.nix b/nixpkgs/pkgs/tools/misc/yad/default.nix index 77491f22f987..3e5ba0c5f492 100644 --- a/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "9.0"; + version = "10.1"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-P22DMmR+z2kl05SkOsbjFHFz9I5cu4W6EaYLpd1a0mg="; + sha256 = "sha256-k41Z3QVGm7JUR1ny0vJKLxakabK9Da5qCnrPUHvAkWE="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 7bf0c440a37a..680000b33713 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz ma27 zowoq ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz ma27 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index cf2226cad54c..2b7e73b35516 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -1,4 +1,4 @@ -{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1 }: +{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps }: python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; @@ -11,6 +11,11 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256:0ycp7k6lkxzqwkc16fifhyqaqi7hl3351pwddsn18r5l83jnzdn2"; }; + postPatch = '' + substituteInPlace "ykman/pcsc/__init__.py" \ + --replace '/usr/bin/pkill' '${procps}/bin/pkill' + ''; + format = "pyproject"; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/nixpkgs/pkgs/tools/misc/zellij/default.nix b/nixpkgs/pkgs/tools/misc/zellij/default.nix index c7889b158735..2d07c45e61db 100644 --- a/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -6,20 +6,21 @@ , pkg-config , libiconv , openssl +, expect }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc="; + sha256 = "sha256-2DYNgPURQzHaR8wHKEzuXSzubrxsQHpl3H3ko4okY7M="; }; - cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw="; + cargoSha256 = "sha256-AxtXWBfOzdLCpRchaQJbBBs+6rIyF+2ralOflRvkY4k="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -31,9 +32,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd $pname \ - --bash <($out/bin/zellij setup --generate-completion bash) \ - --fish <($out/bin/zellij setup --generate-completion fish) \ - --zsh <($out/bin/zellij setup --generate-completion zsh) + --bash <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion bash) \ + --fish <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion fish) \ + --zsh <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion zsh) ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/boundary/default.nix b/nixpkgs/pkgs/tools/networking/boundary/default.nix index 7b96bcb05c8e..02dc1cd9c487 100644 --- a/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.5.1"; + version = "0.6.0"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-+e4wo2vYSE3Z0icHcOu9aW6ZR6EDKiTe+S58d9s/1m4="; - aarch64-linux = "sha256-WR9SmUO/fHivUAAYpbXujQC0zjUmG8ATiTqGVZHly1s="; - x86_64-darwin = "sha256-Ih2uO4s0rukGDC8DhamaFb0HT4OKiBtQovRTD3rL9XY="; + x86_64-linux = "sha256-9xgvSnfMh5kX/RtC/B+tkbSNcB82U6SYzCs5V04VzW0="; + aarch64-linux = "sha256-ARSZygm1OayiOxF7I+/5ebwtaO0z/lYztuwNSD4Zu+0="; + x86_64-darwin = "sha256-GFLLpOt3BEJI14xKjnjK6nd4h/0+/aSLOagZphOKErE="; }; in fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/checkip/default.nix b/nixpkgs/pkgs/tools/networking/checkip/default.nix new file mode 100644 index 000000000000..b379a1725de9 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/checkip/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "checkip"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "jreisinger"; + repo = pname; + rev = "v${version}"; + sha256 = "065426z4iak72h56qvp1vk86r2vw5rdqy3qi1zbw1l0hnyq83zwq"; + }; + + vendorSha256 = "10hk2wfkpvnavs20q390qgaj1gj10j1fy8vlqb9s9f76gpb130h4"; + + postFixup = '' + # Rename binary + mv $out/bin/cmd $out/bin/${pname} + ''; + + # Requires network + doCheck = false; + + meta = with lib; { + description = "CLI tool that checks an IP address using various public services"; + homepage = "https://github.com/jreisinger/checkip"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/flannel/plugin.nix b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix new file mode 100644 index 000000000000..657be79b61bf --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "cni-plugin-flannel"; + version = "unstable-2021-09-10"; + + src = fetchFromGitHub { + owner = "flannel-io"; + repo = "cni-plugin"; + rev = "8ce83510da59681da905dccb8364af9472cac341"; + sha256 = "sha256-x6F8n+IJ1pZdbDwniWWmoGKgQm235ax3mbOcbYqWLCs="; + }; + + vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; + + postInstall = '' + mv $out/bin/cni-plugin $out/bin/flannel + ''; + + doCheck = false; + + meta = with lib; { + description = "flannel CNI plugin"; + homepage = "https://github.com/flannel-io/cni-plugin/"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/hurl/default.nix b/nixpkgs/pkgs/tools/networking/hurl/default.nix index 6ecff2e6e389..de3b08bee2ad 100644 --- a/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "0hbyqj794pvvfrg6jgz63mih73bnmnvgmwbv705c2238w7wsgk9w"; + sha256 = "sha256-bAUuNKaS0BQ31GxTd8C2EVZiD8ryevFBOfxLCq6Ccz4="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "09ndgm6kmqwdz7yn2rqxk5xr1qkai87zm1k138cng4wq135c3w6g"; + cargoSha256 = "sha256-dc1hu5vv2y4S1sskO7YN7bm+l2j5Jp5xOLMvXzX8Ago="; meta = with lib; { description = "Command line tool that performs HTTP requests defined in a simple plain text format."; diff --git a/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix b/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix index 158a979fb40c..bb0d7e698f21 100644 --- a/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix @@ -1,20 +1,33 @@ -{ lib, stdenv, fetchurl, getopt, ip2location-c, openssl, perl -, libmaxminddb ? null, geolite-legacy ? null }: +{ lib +, stdenv +, fetchFromGitHub +, getopt +, ip2location-c +, openssl +, perl +, libmaxminddb ? null +, geolite-legacy ? null +}: stdenv.mkDerivation rec { pname = "ipv6calc"; - version = "2.2.0"; + version = "3.2.0"; - src = fetchurl { - urls = [ - "https://www.deepspace6.net/ftp/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz" - "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz" - "ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${pname}-${version}.tar.gz" - ]; - sha256 = "18acy0sy3n6jcjjwpxskysinw06czyayx1q4rqc7zc3ic4pkad8r"; + src = fetchFromGitHub { + owner = "pbiering"; + repo = pname; + rev = version; + sha256 = "1iis7qw803k9z52j30hn9sv8c3b0xyr9v7kb4fvcyiry1iaxcgfk"; }; - buildInputs = [ libmaxminddb geolite-legacy getopt ip2location-c openssl perl ]; + buildInputs = [ + libmaxminddb + geolite-legacy + getopt + ip2location-c + openssl + perl + ]; postPatch = '' patchShebangs *.sh */*.sh @@ -30,9 +43,13 @@ stdenv.mkDerivation rec { "--disable-bundled-md5" "--disable-dynamic-load" "--enable-shared" - ] ++ lib.optional (libmaxminddb != null) "--enable-mmdb" - ++ lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP" - ++ lib.optional (ip2location-c != null) "--enable-ip2location"; + ] ++ lib.optional (libmaxminddb != null) [ + "--enable-mmdb" + ] ++ lib.optional (geolite-legacy != null) [ + "--with-geoip-db=${geolite-legacy}/share/GeoIP" + ] ++ lib.optional (ip2location-c != null) [ + "--enable-ip2location" + ]; enableParallelBuilding = true; @@ -47,7 +64,8 @@ stdenv.mkDerivation rec { Now only one utiltity is needed to do a lot. ''; homepage = "http://www.deepspace6.net/projects/ipv6calc.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/kapp/default.nix b/nixpkgs/pkgs/tools/networking/kapp/default.nix index 181a9d9b85ef..437089cc3967 100644 --- a/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-SxS6KBiKc68PcRycdVDWWfXBKOJvo7GuG/0dUQGcHsg="; + sha256 = "sha256-sUP+C4ynqeODAKkjUWhL1yqlzXkXydd1ENgHQw4enA4="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix index 8928215dccb7..63afc04ad117 100644 --- a/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.10"; + version = "1.9.11"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "08pr2qav87jmrf074v8zbqyjkl51wf6r9hhgbkzhdav9d4f9kny3"; + sha256 = "sha256-fSyJYsAshtEviybA67UzGCWK2iHJYJy5tJIZxxzTfyU="; }; patches = [ ./dont-create-var.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/linux-router/default.nix b/nixpkgs/pkgs/tools/networking/linux-router/default.nix new file mode 100644 index 000000000000..a378a729c7b5 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/linux-router/default.nix @@ -0,0 +1,81 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper + +# --- Runtime Dependencies --- +, bash, procps, iproute2, dnsmasq, iptables +, coreutils, flock, gawk, getopt, gnugrep, gnused, which +# `nmcli` is not required for create_ap. +# Use NetworkManager by default because it is very likely already present +, useNetworkManager ? true +, networkmanager + +# --- WiFi Hotspot Dependencies --- +, useWifiDependencies ? true +, hostapd, iw +# You only need this if 'iw' can not recognize your adapter. +, useWirelessTools ? true +, wirelesstools # for iwconfig +# To fall back to haveged if entropy is low. +# Defaulting to false because not having it does not break things. +# If it is really needed, warnings will be logged to journal. +, useHaveged ? false +, haveged +# You only need this if you wish to show WiFi QR codes in terminal +, useQrencode ? true +, qrencode +}: + +stdenv.mkDerivation rec { + pname = "linux-router"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "garywill"; + repo = "linux-router"; + rev = "${version}"; + sha256 = "193bnlwmjxsk0cri6xdylf218qayldn02pdnppvbd39ls361776z"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = with lib; let + binPath = makeBinPath ([ procps iproute2 getopt bash dnsmasq + iptables coreutils which flock gnugrep gnused gawk ] + ++ optional useNetworkManager networkmanager + ++ optional useWifiDependencies hostapd + ++ optional useWifiDependencies iw + ++ optional (useWifiDependencies && useWirelessTools) wirelesstools + ++ optional (useWifiDependencies && useHaveged) haveged + ++ optional (useWifiDependencies && useQrencode) qrencode); + in + '' + mkdir -p $out/bin/ $out/.bin-wrapped + mv lnxrouter $out/.bin-wrapped/lnxrouter + makeWrapper $out/.bin-wrapped/lnxrouter $out/bin/lnxrouter --prefix PATH : ${binPath} + ''; + + meta = with lib; { + homepage = "https://github.com/garywill/linux-router"; + description = "Set Linux as router / Wifi hotspot / proxy in one command"; + longDescription = '' + Features: + + - Create a NATed sub-network + - Provide Internet + - DHCP server and RA + - DNS server + - IPv6 (behind NATed LAN, like IPv4) + - Creating Wifi hotspot: + - Channel selecting + - Choose encryptions: WPA2/WPA, WPA2, WPA, No encryption + - Create AP on the same interface you are getting Internet (require same channel) + - Transparent proxy (redsocks) + - DNS proxy + - Compatible with NetworkManager (automatically set interface as unmanaged) + ''; + license = licenses.lgpl21; + maintainers = with maintainers; [ x3ro ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index db8f9bdb9d1a..4b9efdc24a60 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ="; + sha256 = "64TfXPz1NCGKnozI9j+yog+hln1rA/qpzCLvPNSvH+c="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix index 50fc66a8d68b..14a7e11aade1 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.8.30"; + version = "1.8.32"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys"; + sha256 = "Cle5Oi+tQ6zHY/Mg3Tp6k8QpsOMRjfpUnWeCTN3E6QU="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/networking/oha/default.nix b/nixpkgs/pkgs/tools/networking/oha/default.nix new file mode 100644 index 000000000000..185176440c1b --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/oha/default.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, lib, pkg-config, rustPlatform, stdenv, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "oha"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "hatoo"; + repo = pname; + rev = "v${version}"; + sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja"; + }; + + cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc"; + + nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + + buildInputs = lib.optional stdenv.isLinux openssl + ++ lib.optional stdenv.isDarwin Security; + + # tests don't work inside the sandbox + doCheck = false; + + meta = with lib; { + description = "HTTP load generator inspired by rakyll/hey with tui animation"; + homepage = "https://github.com/hatoo/oha"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix index 13efa6e999cf..5800df6950ba 100644 --- a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix +++ b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2LyCiW1MrAahpbzyxot0INPMzo0Vl/JToMZTinCQdgs="; + sha256 = "sha256-UZLVkTkuJPzju9fl4N6Lgdn3gNBpKruNFxDcoTwdtYc="; }; - cargoSha256 = "sha256-AGwiyC7Zf8KHQIHfHByL06sdbS4vEXUyj1wGw7Q1N9I="; + cargoSha256 = "sha256-bHwp0U83uvhFOi9oaeVwNrqHkxK2IQs/bvxqUl/rpjI="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/spoof-mac/default.nix b/nixpkgs/pkgs/tools/networking/spoof-mac/default.nix new file mode 100644 index 000000000000..fdd282fa8b5f --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/spoof-mac/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, docopt }: + +buildPythonPackage rec { + pname = "spoof-mac"; + version = "unstable-2018-01-27"; + + src = fetchFromGitHub { + owner = "feross"; + repo = "SpoofMAC"; + rev = "2cfc796150ef48009e9b765fe733e37d82c901e0"; + sha256 = "sha256-Qiu0URjUyx8QDVQQUFGxPax0J80e2m4+bPJeqFoKxX8="; + }; + + propagatedBuildInputs = [ docopt ]; + + # No tests + doCheck = false; + + meta = with lib; { + description = "Change your MAC address for debugging purposes"; + homepage = "https://github.com/feross/SpoofMAC"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/sstp/default.nix b/nixpkgs/pkgs/tools/networking/sstp/default.nix index 97e35949b15a..151538462a35 100644 --- a/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -2,18 +2,17 @@ stdenv.mkDerivation rec { pname = "sstp-client"; - version = "1.0.13"; + version = "1.0.15"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz"; - sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln"; + sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ="; }; - patchPhase = - '' - sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c - sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c - ''; + postPatch = '' + sed 's,/usr/sbin/pppd,${ppp}/sbin/pppd,' -i src/sstp-pppd.c + sed "s,sstp-pppd-plugin.so,$out/lib/pppd/sstp-pppd-plugin.so," -i src/sstp-pppd.c + ''; configureFlags = [ "--with-openssl=${openssl.dev}" @@ -22,13 +21,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevent openssl ppp ]; - meta = { + meta = with lib; { description = "SSTP client for Linux"; homepage = "http://sstp-client.sourceforge.net/"; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.ktosiek ]; - license = lib.licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ktosiek ]; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/tools/networking/stuntman/default.nix b/nixpkgs/pkgs/tools/networking/stuntman/default.nix new file mode 100644 index 000000000000..1825a3971a74 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/stuntman/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, openssl, boost }: + +stdenv.mkDerivation { + pname = "stuntman"; + version = "1.2.16"; + + src = fetchFromGitHub { + owner = "jselbie"; + repo = "stunserver"; + rev = "cfadf9c3836d5ae63a682913de24ba085df924f3"; + sha256 = "1gcx4zj44f0viddnn5klkmq0dgd29av5p06iyf9f1va4a3lk0cbg"; + }; + + buildInputs = [ + boost + openssl + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv stunserver $out/bin/ + mv stunclient $out/bin/ + + runHook postInstall + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + + ./stuntestcode + + runHook postCheck + ''; + + meta = with lib; { + description = "STUNTMAN - an open source STUN server and client"; + homepage = "http://www.stunprotocol.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ mattchrist ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 33fbd5bc92f5..719e1d9b44f3 100644 --- a/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.41.1"; + version = "4.42.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "14zqvmf7xa4knmc57ck1ns0i0va0223qdp64qmm3q2w82dh9mnb8"; + sha256 = "19xkbkzv9bgj68kmvrxsdqzx40vlyvzl8nn2n19hwwmkrazqgf04"; }; - vendorSha256 = "sha256-K8gFF9TbhVgNOySz7nhPFIdSNWNYKUyFD0LIk6acnkc="; + vendorSha256 = "sha256-N1DYV0zSzCepkRMbcQUHqjITvmGahYKNn1uhL+csMSc="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202107290023"; - geoipSha256 = "14xgy0bsamj2k4knfs1r453yp27wq8qmjqifq63zbp4lb9v8xnjy"; + geoipRev = "202109102251"; + geoipSha256 = "0qh8yf0m6sna3z5i2plbgw61q08qcfcx0l1z5bmwxijagf1yb7fa"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210727125446"; - geositeSha256 = "14z1419dkbippm12z6gvwh3q1wd6x1p4sk6zp2i4qa408i1gc81c"; + geositeRev = "20210910080130"; + geositeSha256 = "0d6bzrs5mhca59j1w73kqw10jqkwic9ywm3jvszpd077qwh64dwn"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/nixpkgs/pkgs/tools/networking/wicd/default.nix b/nixpkgs/pkgs/tools/networking/wicd/default.nix deleted file mode 100644 index e4eb0a2cdc8c..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib, stdenv, fetchurl, python2Packages -, wpa_supplicant, dhcp, dhcpcd, wirelesstools -, nettools, openresolv, iproute2, iputils }: - -let - inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; -in stdenv.mkDerivation rec { - pname = "wicd"; - version = "1.7.2.4"; - - src = fetchurl { - url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; - }; - - buildInputs = with python2Packages; [ - python Babel urwid notify - ]; - - patches = [ - ./no-var-install.patch - ./pygtk.patch - ./no-optimization.patch - ./dhclient.patch - ./fix-app-icon.patch - ./fix-gtk-issues.patch - ./urwid-api-update.patch - ./fix-curses.patch - ]; - - # Should I be using pygtk's propagated build inputs? - # !!! Should use makeWrapper. - postPatch = '' - # We don't have "python2". - substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'" - - substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - - sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute2 ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in - sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in - sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in - sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in - sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in - rm po/ast.po - ''; - - configurePhase = '' - python setup.py configure \ - --lib=$out/lib/ \ - --share=$out/share/ \ - --etc=/var/lib/wicd/ \ - --scripts=$out/etc/scripts/ \ - --pixmaps=$out/share/pixmaps/ \ - --images=$out/share/pixmaps/wicd/ \ - --encryption=$out/etc/encryption/templates/ \ - --bin=$out/bin/ \ - --sbin=$out/sbin/ \ - --backends=$out/share/backends/ \ - --daemon=$out/share/daemon/ \ - --curses=$out/share/curses/ \ - --gtk=$out/share/gtk/ \ - --cli=$out/share/cli/ \ - --networks=/var/lib/wicd/configurations/ \ - --resume=$out/etc/acpi/resume.d/ \ - --suspend=$out/etc/acpi/suspend.d/ \ - --pmutils=$out/lib/pm-utils/sleep.d/ \ - --dbus=$out/etc/dbus-1/system.d/ \ - --dbus-service=$out/etc/dbus-1/system-services/ \ - --systemd=$out/lib/systemd/ \ - --logrotate=$out/etc/logrotate.d/ \ - --desktop=$out/share/applications/ \ - --icons=$out/share/icons/hicolor/ \ - --translations=$out/share/locale/ \ - --autostart=$out/etc/xdg/autostart/ \ - --varlib=$out/var/lib/ \ - --docdir=$out/share/doc/ \ - --mandir=$out/share/man/ \ - --kdedir=$out/share/autostart/ \ - --python=${python}/bin/python \ - --distro=nix \ - --wicdgroup=users \ - --no-install-init \ - --no-install-kde \ - --no-install-acpi \ - --no-install-pmutils \ - ''; - - installPhase = '' - python setup.py install --prefix=$out --install-lib=$out/${python.sitePackages} - mkdir -p $out/share/other - cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default - - # Add a template for "WPA2 Enterprise" encryption as used, e.g., by the - # Eduroam network. Taken and adapted from - # <http://wicd.net/punbb/viewtopic.php?id=87>. - cp -v "${./wpa2-ttls}" "$out/etc/encryption/templates/wpa2-ttls" - echo "wpa2-ttls" >> "$out/etc/encryption/templates/active" - ''; - - meta = with lib; { - homepage = "http://wicd.net/"; - description = "A wiredless and wired network manager"; - longDescription='' - A complete network connection manager - Wicd supports wired and wireless networks, and capable of - creating and tracking profiles for both. It has a - template-based wireless encryption system, which allows the user - to easily add encryption methods used. It ships with some common - encryption types, such as WPA and WEP. Wicd will automatically - connect at startup to any preferred network within range. - ''; - maintainers = [ maintainers.roconnor ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/wicd/dhclient.patch b/nixpkgs/pkgs/tools/networking/wicd/dhclient.patch deleted file mode 100644 index fbda1caacb7a..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/dhclient.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -ruN wicd-1.7.2.4.orig/wicd/wicd-daemon.py wicd-1.7.2.4/wicd/wicd-daemon.py ---- wicd-1.7.2.4.orig/wicd/wicd-daemon.py 2013-06-22 18:55:02.641242947 +0000 -+++ wicd-1.7.2.4/wicd/wicd-daemon.py 2013-06-22 18:58:33.990244153 +0000 -@@ -69,6 +69,7 @@ - wireless_conf = os.path.join(wpath.etc, "wireless-settings.conf") - wired_conf = os.path.join(wpath.etc, "wired-settings.conf") - dhclient_conf = os.path.join(wpath.etc, "dhclient.conf.template") -+dhclient_conf_default = os.path.join(wpath.share, "other", "dhclient.conf.template.default") - - class WicdDaemon(dbus.service.Object): - """ The main wicd daemon class. -@@ -910,7 +911,7 @@ - - if not os.path.isfile(dhclient_conf): - print "dhclient.conf.template not found, copying..." -- shutil.copy(dhclient_conf + ".default", dhclient_conf) -+ shutil.copy(dhclient_conf_default, dhclient_conf) - # Hide the files, so the keys aren't exposed. - print "chmoding configuration files 0600..." - os.chmod(app_conf.get_config(), 0600)diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py ---- wicd-1.7.2.4.orig/wicd/wnettools.py 2013-03-30 21:47:19.804907552 +0000 -+++ wicd-1.7.2.4/wicd/wnettools.py 2013-03-31 08:44:37.572792110 +0000 -@@ -37,6 +37,7 @@ - import time - from string import maketrans, translate - -+import tempfile - import wpath - import misc - from misc import find_path -@@ -216,6 +217,7 @@ - self.flush_tool = None - self.link_detect = None - self.dhcp_object = None -+ self.dhclient_conf_path = None; - - def SetDebugMode(self, value): - """ If True, verbose output is enabled. """ -@@ -277,12 +279,6 @@ - cmd = "" - return (client, cmd) - -- # probably /var/lib/wicd/dhclient.conf with defaults -- dhclient_conf_path = os.path.join( -- wpath.varlib, -- 'dhclient.conf' -- ) -- - client_dict = { - "dhclient" : - {'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s", -@@ -307,41 +303,44 @@ - } - (client_name, cmd) = get_client_name(self.DHCP_CLIENT) - -- # cause dhclient doesn't have a handy dandy argument -- # for specifing the hostname to be sent -- if client_name == "dhclient" and flavor: -- if hostname == None: -- # <hostname> will use the system hostname -- # we'll use that if there is hostname passed -- # that shouldn't happen, though -- hostname = '<hostname>' -- print 'attempting to set hostname with dhclient' -- print 'using dhcpcd or another supported client may work better' -- dhclient_template = \ -- open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r') -- -- output_conf = open(dhclient_conf_path, 'w') -- -- for line in dhclient_template.readlines(): -- line = line.replace('$_HOSTNAME', hostname) -- output_conf.write(line) -- -- output_conf.close() -- dhclient_template.close() -- os.chmod(dhclient_conf_path, 0644) -- - if not client_name or not cmd: - print "WARNING: Failed to find a valid dhcp client!" - return "" - - if flavor == "connect": -+ # cause dhclient doesn't have a handy dandy argument -+ # for specifing the hostname to be sent -+ if client_name == "dhclient" and flavor: -+ if hostname == None: -+ # <hostname> will use the system hostname -+ # we'll use that if there is hostname passed -+ # that shouldn't happen, though -+ hostname = '<hostname>' -+ print 'attempting to set hostname with dhclient' -+ print 'using dhcpcd or another supported client may work better' -+ if not self.dhclient_conf_path: -+ _,self.dhclient_conf_path = tempfile.mkstemp() -+ print 'New dhclient conf path: %s ' % self.dhclient_conf_path -+ dhclient_template = \ -+ open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r') -+ -+ output_conf = open(self.dhclient_conf_path, 'w') -+ -+ for line in dhclient_template.readlines(): -+ line = line.replace('$_HOSTNAME', hostname) -+ output_conf.write(line) -+ -+ output_conf.close() -+ dhclient_template.close() -+ os.chmod(self.dhclient_conf_path, 0644) -+ - if not hostname: - hostname = os.uname()[1] - return client_dict[client_name]['connect'] % \ - { "cmd" : cmd, - "iface" : self.iface, - "hostname" : hostname, -- 'dhclientconf' : dhclient_conf_path } -+ 'dhclientconf' : self.dhclient_conf_path } - elif flavor == "release": - return client_dict[client_name]['release'] % {"cmd":cmd, "iface":self.iface} - else: diff --git a/nixpkgs/pkgs/tools/networking/wicd/fix-app-icon.patch b/nixpkgs/pkgs/tools/networking/wicd/fix-app-icon.patch deleted file mode 100644 index 31b47bb45881..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/fix-app-icon.patch +++ /dev/null @@ -1,19 +0,0 @@ -Someone forgot to pack wicd.png icon. We will replace it with existing one. - -diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py ---- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-30 21:47:19.802907553 +0000 -+++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 08:13:32.876871673 +0000 -@@ -205,8 +205,10 @@ - - self.status_area.hide_all() - -- if os.path.exists(os.path.join(wpath.images, "wicd.png")): -- self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) -+ if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")): -+ self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png")) -+ else: -+ print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png") - self.statusID = None - self.first_dialog_load = True - self.is_visible = True - diff --git a/nixpkgs/pkgs/tools/networking/wicd/fix-curses.patch b/nixpkgs/pkgs/tools/networking/wicd/fix-curses.patch deleted file mode 100644 index 138dfbabfd5c..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/fix-curses.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300 -+++ b/curses/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300 -@@ -1153,9 +1153,10 @@ - if not ui._started: - return False - -- input_data = ui.get_input_nonblocking() -+ ui.set_input_timeouts(max_wait=0) -+ input_data = ui.get_input() - # Resolve any "alarms" in the waiting -- self.handle_keys(input_data[1]) -+ self.handle_keys(input_data) - - # Update the screen - canvas = self.frame.render((self.size), True) diff --git a/nixpkgs/pkgs/tools/networking/wicd/fix-gtk-issues.patch b/nixpkgs/pkgs/tools/networking/wicd/fix-gtk-issues.patch deleted file mode 100644 index 31e553b46b50..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/fix-gtk-issues.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py ---- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-31 17:01:29.367001288 +0000 -+++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 17:55:20.826028396 +0000 -@@ -35,7 +35,7 @@ - from wicd import misc - from wicd import wpath - from wicd import dbusmanager --from wicd.misc import noneToString -+from wicd.misc import noneToString, _status_dict - from wicd.translations import _, language - import prefs - from prefs import PreferencesDialog -@@ -250,7 +250,7 @@ - - def handle_connection_results(self, results): - if results not in ['success', 'aborted'] and self.is_visible: -- error(self.window, language[results], block=False) -+ error(self.window, misc._status_dict[results], block=False) - - def create_adhoc_network(self, widget=None): - """ Shows a dialog that creates a new adhoc network. """ -diff -ruN wicd-1.7.2.4.orig/po/ru.po wicd-1.7.2.4/po/ru.po ---- wicd-1.7.2.4.orig/po/ru.po 2013-03-31 17:01:29.362001288 +0000 -+++ wicd-1.7.2.4/po/ru.po 2013-03-31 17:43:37.909022515 +0000 -@@ -173,7 +173,7 @@ - - #: wicd/misc.py:79 - msgid "Connection Failed: Bad password" --msgstr "Ошибка соединения: Неверный пароль:" -+msgstr "Ошибка соединения: Неверный пароль" - - #: wicd/misc.py:89 - msgid "Connection Failed: No DHCP offers received." -diff -ruN wicd-1.7.2.4.orig/wicd/misc.py wicd-1.7.2.4/wicd/misc.py ---- wicd-1.7.2.4.orig/wicd/misc.py 2013-03-31 17:01:29.369001288 +0000 -+++ wicd-1.7.2.4/wicd/misc.py 2013-03-31 17:23:56.822012593 +0000 -@@ -430,7 +430,9 @@ - """ Sanitize property names to be used in config-files. """ - allowed = string.ascii_letters + '_' + string.digits - table = string.maketrans(allowed, ' ' * len(allowed)) -- return s.translate(None, table) -+ #return s.translate(None, table) -+ #return s.translate(table) -+ return s - - def sanitize_escaped(s): - """ Sanitize double-escaped unicode strings. """ diff --git a/nixpkgs/pkgs/tools/networking/wicd/no-optimization.patch b/nixpkgs/pkgs/tools/networking/wicd/no-optimization.patch deleted file mode 100644 index 785cae7b6ed5..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/no-optimization.patch +++ /dev/null @@ -1,21 +0,0 @@ -With optimizations on, python will overwrite the nix store. - ---- wicd-1.7.0/in/scripts=wicd.in 2011-04-05 14:31:09.733096865 -0400 -+++ wicd-1.7.0/in/scripts=wicd.in 2011-04-05 14:31:16.397096864 -0400 -@@ -1,3 +1,3 @@ - #!/bin/bash - --exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@ -+exec %PYTHON% -B %SHARE%daemon/wicd-daemon.py $@ - ---- wicd-1.7.2.4/wicd/wicd-daemon.py 2012-04-30 21:19:45.000000000 +0200 -+++ wicd-1.7.2.4/wicd/wicd-daemon.pynew 2013-03-14 21:35:23.250306592 +0100 -@@ -1812,7 +1812,7 @@ - daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect) - child_pid = None - if not no_poll: -- child_pid = Popen([wpath.python, "-O", -+ child_pid = Popen([wpath.python, "-B", - os.path.join(wpath.daemon, "monitor.py")], - shell=False, close_fds=True).pid - atexit.register(on_exit, child_pid) diff --git a/nixpkgs/pkgs/tools/networking/wicd/no-var-install.patch b/nixpkgs/pkgs/tools/networking/wicd/no-var-install.patch deleted file mode 100644 index b01f0e5a438a..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/no-var-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -The install tries to create files in /var. This patch removes those steps. - ---- wicd-1.7.2.4/setup.py 2013-03-14 21:28:21.360580941 +0100 -+++ wicd-1.7.2.4/setup.py 2013-03-14 21:22:50.125721943 +0100 -@@ -505,11 +505,8 @@ - (wpath.dbus_service, ['other/org.wicd.daemon.service']), - (wpath.systemd, ['other/wicd.service']), - (wpath.logrotate, ['other/wicd.logrotate']), -- (wpath.log, [empty_file]), -- (wpath.etc, ['other/dhclient.conf.template.default']), - (wpath.encryption, [('encryption/templates/' + b) for b in - os.listdir('encryption/templates') if not b.startswith('.')]), -- (wpath.networks, [empty_file]), - (wpath.sbin, ['scripts/wicd']), - (wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py', - 'wicd/suspend.py', 'wicd/autoconnect.py']), - diff --git a/nixpkgs/pkgs/tools/networking/wicd/pygtk.patch b/nixpkgs/pkgs/tools/networking/wicd/pygtk.patch deleted file mode 100644 index f015e50d684a..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/pygtk.patch +++ /dev/null @@ -1,15 +0,0 @@ -For some reason nix's pygtk doesn't have a pygtk module so we remove the version check. -If this ever changes we could remove this patch. - ---- wicd-1.7.0/gtk/wicd-client.py 2009-09-01 11:05:31.000000000 -0400 -+++ wicd-1.7.0/gtk/wicd-client.py 2009-12-28 00:22:57.000000000 -0500 -@@ -43,9 +43,6 @@ - import atexit - from dbus import DBusException - --import pygtk --pygtk.require('2.0') -- - HAS_NOTIFY = True - try: - import pynotify diff --git a/nixpkgs/pkgs/tools/networking/wicd/urwid-api-update.patch b/nixpkgs/pkgs/tools/networking/wicd/urwid-api-update.patch deleted file mode 100644 index a794f6caaeee..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/urwid-api-update.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/curses/curses_misc.py -+++ a/curses/curses_misc.py -@@ -358,6 +358,19 @@ class ComboBox(urwid.WidgetWrap): - self.parent = None - self.ui = None - self.row = None -+ -+ @property -+ def focus(self): -+ return self._focus -+ -+ @focus.setter -+ def focus(self, index): -+ self._focus = index -+ -+ @focus.deleter -+ def focus(self): -+ del self._focus -+ - def set_list(self,list): - self.list = list diff --git a/nixpkgs/pkgs/tools/networking/wicd/wpa2-ttls b/nixpkgs/pkgs/tools/networking/wicd/wpa2-ttls deleted file mode 100644 index 650375cbbaae..000000000000 --- a/nixpkgs/pkgs/tools/networking/wicd/wpa2-ttls +++ /dev/null @@ -1,20 +0,0 @@ -name = WPA2-TTLS -author = various contributors -version = 1 -require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert -protected password *Password ------ -ctrl_interface=/run/wpa_supplicant -network={ - ssid="$_ESSID" - scan_ssid=$_SCAN - proto=WPA2 - key_mgmt=WPA-EAP - group=CCMP TKIP - eap=TTLS - identity="$_IDENTITY" - password="$_PASSWORD" - anonymous_identity="$_ANONYMOUS_IDENTITY" - ca_cert="$_CA_CERT" - phase2="auth=PAP" -} diff --git a/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix index b0fba9d047ab..a27aa8d3c3bd 100644 --- a/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-query-tree-viewer"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cdepillabout"; - repo = "nix-query-tree-viewer"; + repo = pname; rev = "v${version}"; - sha256 = "0vjcllhgq64n7mwxvyhmbqd6fpa9lwrpsnggc1kdlgd14ggq6jj6"; + sha256 = "sha256-Lc9hfjybnRrkd7PZMa2ojxOM04bP4GJyagkZUX2nVwY="; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { gtk3 ]; - cargoSha256 = "1i9sjs77v1c3lch93pzjgr1zl0k1mlwkdpf3zfp13hyjn6zpldnj"; + cargoSha256 = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E="; meta = with lib; { description = "GTK viewer for the output of `nix store --query --tree`"; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix index 00b3a65be0d4..82c52419c67c 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "RustSec"; repo = "rustsec"; rev = "cargo-audit%2Fv${version}"; - sha256 = "0pvb1m9277ysjzydjvx7viybi6bd23ch7sbjyx1wnz45ahrmia1j"; + sha256 = "1rmhizgld35996kzp3fal2zl20aqpnmkzx0clc80n30p814isdrw"; }; - cargoSha256 = "0cf8kg8vhfqbrkm227rzyl3394n7fsqhqgq13qks7374h5d04haw"; + cargoSha256 = "10li9w3m4xxb8943802y74dgb1wsgjkn74hwn2x47c0w0yjiig7p"; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 8f89fd6641d1..61c6ab3efb51 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -234,13 +234,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210802_47e96bb"; + suffix = "pre20210908_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "47e96bb533f8cacc171bec9b688b134de31a48a9"; - sha256 = "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg="; + rev = "3c56f62093601143838af923195f630d8ffae2d4"; + sha256 = "sha256-pjdzLOEt8i1NQe4drLpp8+LrRd2MgsISSQEsMebz2kc="; }; boehmgc = boehmgc_nixUnstable; diff --git a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix index cbe10e85f667..99751c00d99c 100644 --- a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix +++ b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix @@ -2,23 +2,24 @@ , buildPythonApplication , fetchFromGitHub , setuptools-scm +, setuptools , vdf , bash , steam-run , winetricks -, zenity +, yad , pytestCheckHook }: buildPythonApplication rec { pname = "protontricks"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - hash = "sha256-Vmxb8SjPhcSqFzykHRPsLtAoSwomN+se+icwHkucbX8="; + hash = "sha256-sbYIqVsuDZ2Htb6SVIe/gBA1UIvUzu4fjTjWQ7k1WFs="; }; patches = [ @@ -27,23 +28,31 @@ buildPythonApplication rec { ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ vdf ]; + + propagatedBuildInputs = [ + setuptools # implicit dependency, used to find data/icon_placeholder.png + vdf + ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ bash steam-run - (winetricks.override { - # Remove default build of wine to reduce closure size. - # Falls back to wine in PATH when --no-runtime is passed. - wine = null; - }) - zenity + winetricks + yad ]}" ]; checkInputs = [ pytestCheckHook ]; + + # From 1.6.0 release notes (https://github.com/Matoking/protontricks/releases/tag/1.6.0): + # In most cases the script is unnecessary and should be removed as part of the packaging process. + postInstall = '' + rm "$out/bin/protontricks-desktop-install" + ''; + pythonImportsCheck = [ "protontricks" ]; meta = with lib; { @@ -51,6 +60,6 @@ buildPythonApplication rec { homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3Only; maintainers = with maintainers; [ kira-bruneau ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch b/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch index 82ddec1abb89..0144160c5af8 100644 --- a/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,31 +1,31 @@ -diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index cc65a03..5c3fc7a 100755 ---- a/src/protontricks/cli.py -+++ b/src/protontricks/cli.py -@@ -15,8 +15,8 @@ import sys - - from . import __version__ - from .gui import select_steam_app_with_gui --from .steam import (find_legacy_steam_runtime_path, find_proton_app, -- find_steam_path, get_steam_apps, get_steam_lib_paths) -+from .steam import (find_proton_app, find_steam_path, get_steam_apps, -+ get_steam_lib_paths) - from .util import run_command, is_flatpak_sandbox - from .winetricks import get_winetricks_path - -@@ -77,8 +77,7 @@ def main(args=None): +diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py +index 535ec9b..690c1f9 100755 +--- a/src/protontricks/cli/main.py ++++ b/src/protontricks/cli/main.py +@@ -14,8 +14,8 @@ import sys + + from .. import __version__ + from ..gui import select_steam_app_with_gui +-from ..steam import (find_legacy_steam_runtime_path, find_proton_app, +- find_steam_path, get_steam_apps, get_steam_lib_paths) ++from ..steam import (find_proton_app, find_steam_path, get_steam_apps, ++ get_steam_lib_paths) + from ..util import is_flatpak_sandbox, run_command + from ..winetricks import get_winetricks_path + from .util import (CustomArgumentParser, cli_error_handler, enable_logging, +@@ -60,8 +60,7 @@ def main(args=None): "WINE: path to a custom 'wine' executable\n" "WINESERVER: path to a custom 'wineserver' executable\n" "STEAM_RUNTIME: 1 = enable Steam Runtime, 0 = disable Steam " - "Runtime, valid path = custom Steam Runtime path, " -- "empty = enable automatically (default)" -+ "Runtime, empty = enable automatically (default)" +- "empty = enable automatically (default)\n" ++ "Runtime, empty = enable automatically (default)\n" + "PROTONTRICKS_GUI: GUI provider to use, accepts either 'yad' " + "or 'zenity'" ), - formatter_class=argparse.RawTextHelpFormatter - ) -@@ -148,18 +147,9 @@ def main(args=None): - ) - sys.exit(-1) +@@ -147,17 +146,9 @@ def main(args=None): + if not steam_path: + exit_("Steam installation directory could not be found.") - # 2. Find the pre-installed legacy Steam Runtime if enabled - legacy_steam_runtime_path = None @@ -38,13 +38,12 @@ index cc65a03..5c3fc7a 100755 - ) - - if not legacy_steam_runtime_path: -- print("Steam Runtime was enabled but couldn't be found!") -- sys.exit(-1) +- exit_("Steam Runtime was enabled but couldn't be found!") + use_steam_runtime = True else: use_steam_runtime = False logger.info("Steam Runtime disabled.") -@@ -222,7 +212,6 @@ def main(args=None): +@@ -218,7 +209,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -52,7 +51,7 @@ index cc65a03..5c3fc7a 100755 command=[winetricks_path, "--gui"], use_bwrap=use_bwrap ) -@@ -292,7 +281,6 @@ def main(args=None): +@@ -286,7 +276,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -60,7 +59,7 @@ index cc65a03..5c3fc7a 100755 use_bwrap=use_bwrap, command=[winetricks_path] + args.winetricks_command) elif args.command: -@@ -302,7 +290,6 @@ def main(args=None): +@@ -296,7 +285,6 @@ def main(args=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, @@ -69,7 +68,7 @@ index cc65a03..5c3fc7a 100755 # Pass the command directly into the shell *without* # escaping it diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index 4ab778b..f3f5f99 100644 +index e898caf..7448d11 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py @@ -12,8 +12,8 @@ from .util import lower_dict @@ -77,13 +76,13 @@ index 4ab778b..f3f5f99 100644 __all__ = ( "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", - "find_legacy_steam_runtime_path", "get_appinfo_sections", -- "get_proton_appid", "find_steam_proton_app", "find_appid_proton_prefix", -+ "get_appinfo_sections", "get_proton_appid", -+ "find_steam_proton_app", "find_appid_proton_prefix", +- "get_tool_appid", "find_steam_compat_tool_app", "find_appid_proton_prefix", ++ "get_appinfo_sections", "get_tool_appid", ++ "find_steam_compat_tool_app", "find_appid_proton_prefix", "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", - "get_custom_proton_installations_in_dir", "get_custom_proton_installations", + "get_custom_compat_tool_installations_in_dir", "get_custom_compat_tool_installations", "find_current_steamid3", "get_appid_from_shortcut", -@@ -300,37 +300,6 @@ def find_steam_path(): +@@ -311,37 +311,6 @@ def find_steam_path(): return None, None @@ -122,12 +121,12 @@ index 4ab778b..f3f5f99 100644 APPINFO_STRUCT_SECTION = "<LLLLQ20sL" diff --git a/src/protontricks/util.py b/src/protontricks/util.py -index b6617de..85f8b2d 100644 +index 5252d6c..f16dfec 100644 --- a/src/protontricks/util.py +++ b/src/protontricks/util.py -@@ -4,15 +4,14 @@ import shlex - import shutil +@@ -5,15 +5,14 @@ import shutil import stat + from pathlib import Path -from subprocess import check_output, run, PIPE +from subprocess import run, PIPE @@ -146,7 +145,7 @@ index b6617de..85f8b2d 100644 ) logger = logging.getLogger("protontricks") -@@ -46,24 +45,6 @@ def lower_dict(d): +@@ -47,24 +46,6 @@ def lower_dict(d): return {k.lower(): _lower_value(v) for k, v in d.items()} @@ -171,7 +170,7 @@ index b6617de..85f8b2d 100644 def get_host_library_paths(): """ Get host library paths to use when creating the LD_LIBRARY_PATH environment -@@ -75,7 +56,7 @@ def get_host_library_paths(): +@@ -76,7 +57,7 @@ def get_host_library_paths(): # Since that command is unavailable with newer Steam Runtime releases, # do it ourselves here. result = run( @@ -180,7 +179,7 @@ index b6617de..85f8b2d 100644 check=True, stdout=PIPE, stderr=PIPE ) lines = result.stdout.decode("utf-8").split("\n") -@@ -93,7 +74,7 @@ RUNTIME_ROOT_GLOB_PATTERNS = ( +@@ -94,7 +75,7 @@ RUNTIME_ROOT_GLOB_PATTERNS = ( ) @@ -189,7 +188,7 @@ index b6617de..85f8b2d 100644 """ Get LD_LIBRARY_PATH value to use when running a command using Steam Runtime """ -@@ -116,7 +97,7 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): +@@ -117,7 +98,7 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): ) ) @@ -198,7 +197,7 @@ index b6617de..85f8b2d 100644 return "".join([ str(proton_app.proton_dist_path / "lib"), os.pathsep, str(proton_app.proton_dist_path / "lib64"), os.pathsep -@@ -132,14 +113,19 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): +@@ -133,14 +114,19 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): ]) @@ -225,19 +224,18 @@ index b6617de..85f8b2d 100644 # Helper script created by Protontricks to run Wine binaries using Steam Runtime set -o errexit -@@ -207,7 +193,10 @@ if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" ]]; then +@@ -208,7 +194,9 @@ if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" ]]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$PROTON_LD_LIBRARY_PATH" "$PROTON_DIST_PATH"/bin/{name} "$@" else - exec "$STEAM_RUNTIME_PATH"/run --share-pid --batch \ + exec steam-run "$STEAM_RUNTIME_PATH"/pressure-vessel/bin/pressure-vessel-wrap \ -+ --runtime-archive=$(echo "$STEAM_RUNTIME_PATH"/*runtime.tar.gz) \ + --variable-dir="${{PRESSURE_VESSEL_VARIABLE_DIR:-$STEAM_RUNTIME_PATH/var}}" \ + --share-pid --batch \ "${{mount_params[@]}}" -- \ env PROTONTRICKS_INSIDE_STEAM_RUNTIME=1 \ "$PROTONTRICKS_PROXY_SCRIPT_PATH" "$@" -@@ -273,7 +262,6 @@ def create_wine_bin_dir(proton_app, use_bwrap=True): +@@ -274,7 +262,6 @@ def create_wine_bin_dir(proton_app, use_bwrap=True): def run_command( winetricks_path, proton_app, steam_app, command, use_steam_runtime=False, @@ -245,7 +243,7 @@ index b6617de..85f8b2d 100644 use_bwrap=True, **kwargs): """Run an arbitrary command with the correct environment variables -@@ -350,7 +338,7 @@ def run_command( +@@ -351,7 +338,7 @@ def run_command( os.environ["STEAM_RUNTIME_PATH"] = \ str(proton_app.required_tool_app.install_path) os.environ["PROTON_LD_LIBRARY_PATH"] = \ @@ -254,7 +252,7 @@ index b6617de..85f8b2d 100644 runtime_name = proton_app.required_tool_app.name logger.info( -@@ -373,11 +361,8 @@ def run_command( +@@ -372,11 +359,8 @@ def run_command( "Current Steam Runtime not recognized by Protontricks." ) else: @@ -267,7 +265,7 @@ index b6617de..85f8b2d 100644 # When Steam Runtime is enabled, create a set of helper scripts # that load the underlying Proton Wine executables with Steam Runtime -@@ -385,8 +370,6 @@ def run_command( +@@ -384,8 +368,6 @@ def run_command( wine_bin_dir = create_wine_bin_dir( proton_app=proton_app, use_bwrap=use_bwrap ) @@ -276,11 +274,11 @@ index b6617de..85f8b2d 100644 os.environ["PATH"] = "".join([ str(wine_bin_dir), os.pathsep, os.environ["PATH"] -diff --git a/tests/test_cli.py b/tests/test_cli.py -index 580bb5b..3a05ad3 100644 ---- a/tests/test_cli.py -+++ b/tests/test_cli.py -@@ -117,15 +117,10 @@ class TestCLIRun: +diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py +index e6da0fb..46b9545 100644 +--- a/tests/cli/test_main.py ++++ b/tests/cli/test_main.py +@@ -116,15 +116,10 @@ class TestCLIRun: assert str(command.args[0]).endswith(".local/bin/winetricks") assert command.args[1] == "winecfg" assert command.env["PATH"].startswith(str(wine_bin_dir)) @@ -296,7 +294,7 @@ index 580bb5b..3a05ad3 100644 assert "STEAM_RUNTIME_PATH" not in command.env for name in ("wine", "wineserver"): -@@ -166,16 +161,14 @@ class TestCLIRun: +@@ -165,16 +160,14 @@ class TestCLIRun: assert command.env["PATH"].startswith(str(wine_bin_dir)) # Compared to the traditional Steam Runtime, PROTON_LD_LIBRARY_PATH @@ -315,7 +313,7 @@ index 580bb5b..3a05ad3 100644 assert command.env["STEAM_RUNTIME_PATH"] == \ str(steam_runtime_soldier.install_path) -@@ -239,9 +232,7 @@ class TestCLIRun: +@@ -238,9 +231,7 @@ class TestCLIRun: str(runtime_root / "lib" / "x86_64-linux-gnu") ])) @@ -326,9 +324,17 @@ index 580bb5b..3a05ad3 100644 assert command.env["STEAM_RUNTIME_PATH"] == \ str(steam_runtime_soldier.install_path) -@@ -324,20 +315,6 @@ class TestCLIRun: +@@ -335,7 +326,6 @@ class TestCLIRun: + + # Also ensure log messages are included in the error message + assert b"Found Steam directory at" in message +- assert b"Using default Steam Runtime" in message + + def test_run_gui_provider_not_found(self, cli, home_dir, steam_app_factory): + """ +@@ -349,20 +339,6 @@ class TestCLIRun: - assert "Zenity is not installed" in result + assert "YAD or Zenity is not installed" in result - def test_run_steam_runtime_not_found( - self, cli, steam_dir, steam_app_factory): diff --git a/nixpkgs/pkgs/tools/security/age/default.nix b/nixpkgs/pkgs/tools/security/age/default.nix index 20735c6e5782..fd59f9534fe7 100644 --- a/nixpkgs/pkgs/tools/security/age/default.nix +++ b/nixpkgs/pkgs/tools/security/age/default.nix @@ -1,17 +1,37 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "age"; - version = "1.0.0-rc.3"; - vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI="; + version = "1.0.0"; + vendorSha256 = "sha256-cnFDs5Qos1KHn7TqaEgmt4sSzpjZor615euwxka14mY="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU="; + sha256 = "sha256-MfyW8Yv8swKqA7Hl45l5Zn4wZrQmE661eHsKIywy36U="; }; + ldflags = [ + "-s" "-w" "-X main.Version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + preInstall = '' + installManPage doc/*.1 + ''; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + meta = with lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock index c0610480c723..f1671500fe43 100644 --- a/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - bundler-audit (0.8.0) + bundler-audit (0.9.0.1) bundler (>= 1.2.0, < 3) thor (~> 1.0) thor (1.1.0) @@ -13,4 +13,4 @@ DEPENDENCIES bundler-audit BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix b/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix index ff4d6da80691..a740f40e4073 100644 --- a/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix +++ b/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00l8rs7cna0j3yh4s9sza0r88x7kjc7j4gp9yl378422k7i0r73v"; + sha256 = "05k19l5388248rd74cn2lm2ksci7fzmga74n835v7k31m4kbzw8v"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0.1"; }; thor = { groups = ["default"]; diff --git a/nixpkgs/pkgs/tools/security/cfssl/default.nix b/nixpkgs/pkgs/tools/security/cfssl/default.nix index 1e95d1d6f2f9..4b4e6cedc5cd 100644 --- a/nixpkgs/pkgs/tools/security/cfssl/default.nix +++ b/nixpkgs/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "sha256-29HEaW5LCoHcuJrfVUN2hnsRtaSTrvIBo8ok2UJbfuQ="; + sha256 = "sha256-QY04MecjQTmrkPkWcLkXJWErtaw7esb6GnPIKGTJL34="; }; subPackages = [ diff --git a/nixpkgs/pkgs/tools/security/cowpatty/default.nix b/nixpkgs/pkgs/tools/security/cowpatty/default.nix index 4cd420650f3b..934b31a35da6 100644 --- a/nixpkgs/pkgs/tools/security/cowpatty/default.nix +++ b/nixpkgs/pkgs/tools/security/cowpatty/default.nix @@ -1,26 +1,48 @@ -{ lib, stdenv, fetchurl, openssl, libpcap +{ lib +, stdenv +, clang +, fetchFromGitHub +, installShellFiles +, openssl +, libpcap }: -with lib; - stdenv.mkDerivation rec { pname = "cowpatty"; - version = "4.6"; - - buildInputs = [ openssl libpcap ]; + version = "4.8"; - src = fetchurl { - url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz"; - sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd"; + src = fetchFromGitHub { + owner = "joswr1ght"; + repo = pname; + rev = version; + sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s"; }; - installPhase = "make DESTDIR=$out BINDIR=/bin install"; + nativeBuildInputs = [ + clang + installShellFiles + ]; + + buildInputs = [ + openssl + libpcap + ]; + + makeFlags = [ + "DESTDIR=$(out)" + "BINDIR=/bin" + ]; + + postInstall = '' + installManPage cowpatty.1 + installManPage genpmk.1 + ''; - meta = { + meta = with lib; { description = "Offline dictionary attack against WPA/WPA2 networks"; - license = licenses.gpl2; - homepage = "https://www.willhackforsushi.com/?page_id=50"; - maintainers = with maintainers; [ nico202 ]; + homepage = "https://github.com/joswr1ght/cowpatty"; + license = licenses.bsd3; + maintainers = with maintainers; [ nico202 fab ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/security/credential-detector/default.nix b/nixpkgs/pkgs/tools/security/credential-detector/default.nix new file mode 100644 index 000000000000..1e3497b0ca0e --- /dev/null +++ b/nixpkgs/pkgs/tools/security/credential-detector/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "credential-detector"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "ynori7"; + repo = pname; + rev = "v${version}"; + sha256 = "1g5ja32rsf1b7y9gvmy29qz2ymyyvgh53wzd6vvknfla1df0slab"; + }; + + vendorSha256 = "1mn3sysvdz4b94804gns1yssk2q08djq3kq3cd1h7gm942zwrnq4"; + + meta = with lib; { + description = "Tool to detect potentially hard-coded credentials"; + homepage = "https://github.com/ynori7/credential-detector"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/dorkscout/default.nix b/nixpkgs/pkgs/tools/security/dorkscout/default.nix new file mode 100644 index 000000000000..27cc5a0d4e1b --- /dev/null +++ b/nixpkgs/pkgs/tools/security/dorkscout/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dorkscout"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "R4yGM"; + repo = pname; + rev = version; + sha256 = "0h2m458jxdm3xg0h2vb8yq1jc28jqwinv1pdqypdsbvsz48s0hxz"; + }; + + vendorSha256 = "05vn9hd5r8cy45b3ixjch17v38p08k8di8gclq0i9rkz9bvy1nph"; + + meta = with lib; { + description = "Tool to automate the work with Google dorks"; + homepage = "https://github.com/R4yGM/dorkscout"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix b/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix index d2fda127e8c7..a84de966b6f4 100644 --- a/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix +++ b/nixpkgs/pkgs/tools/security/enum4linux-ng/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "enum4linux-ng"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "cddmp"; repo = pname; rev = "v${version}"; - sha256 = "1j6qrhrzc4f9crbii4dpgxipngjh5icrhljxf26a7662dd4f7l8q"; + sha256 = "0fk6hzmvxb5y3nb41qr6dssxhdahkh5nxhbx480x42fhnqpssir5"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/nixpkgs/pkgs/tools/security/exploitdb/default.nix index b112627656b1..911592736801 100644 --- a/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-03"; + version = "2021-09-10"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-9roj5/DfbbN98jy/aO1Ua4pTMxgr4UbqXFicN2ONQgE="; + sha256 = "sha256-OU9IchkouABYw0k4O4WBLu1aklLCH/S90IPMPLOZWY0="; }; installPhase = '' diff --git a/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/nixpkgs/pkgs/tools/security/gitleaks/default.nix index b8878cbbb873..16e1013c7c01 100644 --- a/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "7.6.0"; + version = "7.6.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XRpbbtQiF9EnGMICjyXXm2XjuR0jGC7UiY+UHIAMODM="; + sha256 = "sha256-52Wi3bQvKdHoJ1nVb4OVJ9wd8hDVF+6zlVSpsEai0Jw="; }; vendorSha256 = "sha256-86PspExE+T/IuCvpf6LAkWcCRlHPqP5VUbHAckEzALc="; diff --git a/nixpkgs/pkgs/tools/security/kubescape/default.nix b/nixpkgs/pkgs/tools/security/kubescape/default.nix new file mode 100644 index 000000000000..d3113af0cd08 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "kubescape"; + version = "1.0.64"; + + src = fetchFromGitHub { + owner = "armosec"; + repo = pname; + rev = "v${version}"; + sha256 = "0vc673w40cgjw6jxlwg9ggwzb7yvmsqshihms6ahspc3qiwz56ah"; + }; + + vendorSha256 = "18mvv70g65pq1c7nn752j26d0vasx6cl2rqp5g1hg3cb61hjbn0n"; + + # One test is failing, disabling for now + doCheck = false; + + meta = with lib; { + description = "Tool for testing if Kubernetes is deployed securely"; + homepage = "https://github.com/armosec/kubescape"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index cae010c5a19f..d02ac5503afd 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6mZ8XstophadNk/3zJe2n3WL4u34jjnWh9m2qrt06hw="; + sha256 = "sha256-SdN8M3Mr3bywpBUwIVOIctYdkueq/0no4wlI7Ft8Uws="; }; - vendorSha256 = "sha256-tJ9cdZloTSXoytmMJ+6S5XAKHYs16SZmbUwZdmVnDzc="; + vendorSha256 = "sha256-Tz96AXGMyHNHG/3JrmZvisOEty/tDhoK1ZUngDSXOcc="; modRoot = "./v2"; subPackages = [ diff --git a/nixpkgs/pkgs/tools/security/quill/default.nix b/nixpkgs/pkgs/tools/security/quill/default.nix index 9440823f4292..9f5465901b17 100644 --- a/nixpkgs/pkgs/tools/security/quill/default.nix +++ b/nixpkgs/pkgs/tools/security/quill/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "quill"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "dfinity"; repo = "quill"; rev = "v${version}"; - sha256 = "sha256-rR5VgdlJy6TQBmCHuKc7nPjznbeLjCmQdUJKjY0GsNI="; + sha256 = "sha256-lvINDtOG2mmz0ESxL11DQVZh3IcEiZYYMu5oN5Q9WKA="; }; ic = fetchFromGitHub { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { export OPENSSL_LIB_DIR=${openssl.out}/lib ''; - cargoSha256 = "sha256-nLNuOqShOq01gVWoRCbsvfAd7B9VClUA8Hu8/UQNILg="; + cargoSha256 = "sha256-F2RMfHVFqCq9cb+9bjPWaRcQWKYIwwffWCssoQ6sSdU="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/tools/security/scilla/default.nix b/nixpkgs/pkgs/tools/security/scilla/default.nix index 1983aef17265..791792195830 100644 --- a/nixpkgs/pkgs/tools/security/scilla/default.nix +++ b/nixpkgs/pkgs/tools/security/scilla/default.nix @@ -5,17 +5,16 @@ buildGoModule rec { pname = "scilla"; - version = "20210118-${lib.strings.substring 0 7 rev}"; - rev = "74dd81492fef92b95765df1d0f629276a146a5a4"; + version = "1.1.1"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; - inherit rev; - sha256 = "10qvaigfarljydfb9vx2fb9nk293j4g9w2h9mr8xw6adbvl0qr9q"; + rev = "v${version}"; + sha256 = "sha256-xg8qnpYRdSGaFkjmQLbjMFIU419ASEHtFA8h8ads/50="; }; - vendorSha256 = "04wqsl4269gc3r6l9srqhcq19zarnyyab8k1shj3w6lkfcc61z25"; + vendorSha256 = "sha256-PFfzlqBuasTNeCNnu5GiGyQzBQkbe83q1EqCsWTor18="; meta = with lib; { description = "Information gathering tool for DNS, ports and more"; diff --git a/nixpkgs/pkgs/tools/security/sn0int/default.nix b/nixpkgs/pkgs/tools/security/sn0int/default.nix index 43a390104413..bdcfe6e28bac 100644 --- a/nixpkgs/pkgs/tools/security/sn0int/default.nix +++ b/nixpkgs/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.21.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BKdi/o/A0fJBlcKTDTCX7uGkK6QR0S9hIn0DI3CN5Gg="; + sha256 = "sha256-0BadgWZhP73WOVO18jtcdhsM0L7AM0TQ3PF7MNJM7M0="; }; - cargoSha256 = "sha256-MeMTXwb5v4iUJQSViOraXAck7n6VlIW2Qa0qNUZWu1g="; + cargoSha256 = "sha256-KYrJIOaFX2wTDj4KeHn3d8wBHfVevCKQK/bDglfLWAU="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/security/step-ca/default.nix b/nixpkgs/pkgs/tools/security/step-ca/default.nix index 9b645dcba927..85501ff18e6e 100644 --- a/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/nixpkgs/pkgs/tools/security/step-ca/default.nix @@ -42,10 +42,9 @@ buildGoModule rec { install -Dm444 -t $out/lib/systemd/system systemd/step-ca.service ''; - # Tests fail on darwin with - # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered] - # probably some sandboxing issue - doCheck = stdenv.isLinux; + # Tests start http servers which need to bind to local addresses: + # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted + __darwinAllowLocalNetworking = true; meta = with lib; { description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; diff --git a/nixpkgs/pkgs/tools/system/acpica-tools/default.nix b/nixpkgs/pkgs/tools/system/acpica-tools/default.nix index b035ae04215d..4f0ab0297506 100644 --- a/nixpkgs/pkgs/tools/system/acpica-tools/default.nix +++ b/nixpkgs/pkgs/tools/system/acpica-tools/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex ]; + # We can handle stripping ourselves. + INSTALLFLAGS = "-m 555"; + installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/system/cm-rgb/default.nix b/nixpkgs/pkgs/tools/system/cm-rgb/default.nix index 3a6c7c6e57c5..adc291d4f85d 100644 --- a/nixpkgs/pkgs/tools/system/cm-rgb/default.nix +++ b/nixpkgs/pkgs/tools/system/cm-rgb/default.nix @@ -54,6 +54,6 @@ buildPythonApplication rec { homepage = "https://github.com/gfduszynski/cm-rgb"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/system/consul-template/default.nix b/nixpkgs/pkgs/tools/system/consul-template/default.nix index 5326f8722d81..020e56a1526b 100644 --- a/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-upVCztpfT+SuuB343GEnT4KSnWul10/cItKJvUqJYo4="; + sha256 = "sha256-XzsewkHaFIq1kvFDHIsnhfhtLPLFRin7YrhiZuF1+co="; }; - vendorSha256 = "sha256-IAWuqg8zZ9/ny3ZijxGgHAJDICV09NTGxPvLLP4oLzw="; + vendorSha256 = "sha256-/4ZY4YRGsUSL2e6uYPJ9tWEvXDjU5/L56yf49pUkJ2E="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock index a2a7824f7aa8..1bafc658cbc0 100644 --- a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock @@ -1,15 +1,13 @@ GEM remote: https://rubygems.org/ specs: - foreman (0.78.0) - thor (~> 0.19.1) - thor (0.19.1) + foreman (0.87.2) PLATFORMS - ruby + x86_64-linux DEPENDENCIES foreman BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/nixpkgs/pkgs/tools/system/foreman/gemset.nix b/nixpkgs/pkgs/tools/system/foreman/gemset.nix index f747a2b0634a..d5b053daf4c0 100644 --- a/nixpkgs/pkgs/tools/system/foreman/gemset.nix +++ b/nixpkgs/pkgs/tools/system/foreman/gemset.nix @@ -1,18 +1,12 @@ { - thor = { - version = "0.19.1"; - source = { - type = "gem"; - remotes = ["https://rubygems.org"]; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; foreman = { - version = "0.78.0"; + groups = ["default"]; + platforms = []; source = { - type = "gem"; remotes = ["https://rubygems.org"]; - sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; + sha256 = "0szgxvnzwkzrfbq5dkwa98mig78aqglfy6irdsvq1gq045pbq9r7"; + type = "gem"; }; + version = "0.87.2"; }; } diff --git a/nixpkgs/pkgs/tools/system/gdu/default.nix b/nixpkgs/pkgs/tools/system/gdu/default.nix index 9db56026e07e..630cc66da0ef 100644 --- a/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.6.2"; + version = "5.7.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9Qdl+5BvzYbBw90+9V5bKBrikxlxMt7UxMQ54XwgbTk="; + sha256 = "sha256-zotCn8J6zQtHd/YDT87l6Vh4Xh51tOJENBCdxZ5rqWU="; }; - vendorSha256 = "sha256-TxtYsM1qtpvI5IbkM3vicCgJ0+EqelFJ8Vc6+Ff5wd8="; + vendorSha256 = "sha256-TBWhF2YmlJPNFr3sKSFhuzoBD0Hp1tnYAMJDUwO/QFM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/system/natscli/default.nix b/nixpkgs/pkgs/tools/system/natscli/default.nix index a7f4337ce815..226528782e5f 100644 --- a/nixpkgs/pkgs/tools/system/natscli/default.nix +++ b/nixpkgs/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = version; - sha256 = "180511x3sciqs0njz80qc1a785m84ks9l338qi3liv7bcd541xcr"; + sha256 = "sha256-w0a2BzfRKf55hFgdaDLsR2YeC5Jqa2uynlRN2oGPX8g="; }; - vendorSha256 = "1j2a6wmyb9akndiwq79jqy5lz84bz2k01xp505j60ynsflim7shq"; + vendorSha256 = "sha256-kt6KflivmsG6prxWXtODcXSP2sNn4daH8ruZMxYLk3g="; meta = with lib; { description = "NATS Command Line Interface"; diff --git a/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/nixpkgs/pkgs/tools/system/rocm-smi/default.nix index de9afdae2940..52b75b7a4e9e 100644 --- a/nixpkgs/pkgs/tools/system/rocm-smi/default.nix +++ b/nixpkgs/pkgs/tools/system/rocm-smi/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake, wrapPython }: stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "4.1.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-LEaC1XhmyoVWrpL05MhgN02LVT2rLKdnw9g2QdfM/uE="; + hash = "sha256-Ckno73Otkc9rHEUkSgNoOui+6ZHGUF+B9iAoe0NQH0c="; }; - nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; + nativeBuildInputs = [ cmake wrapPython ]; postPatch = '' # Upstream ROCm is installed in an /opt directory. For this reason, @@ -42,11 +42,18 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocm-smi "$version" + ''; + meta = with lib; { description = "System management interface for AMD GPUs supported by ROCm"; - homepage = "https://github.com/RadeonOpenCompute/ROC-smi"; + homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lovesegfault ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/tools/text/csview/default.nix b/nixpkgs/pkgs/tools/text/csview/default.nix new file mode 100644 index 000000000000..60186a6b3b75 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/csview/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "csview"; + version = "0.3.8"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = pname; + rev = "v${version}"; + sha256 = "18bz12yn85h9vj0b18iaziix9km2iwh8gwfs93fddjv6kg87p38q"; + }; + + cargoSha256 = "1my6gl8zq5k7clzapgbf1mmcgq8mmdbhl250rdd1fvfd59wkrwra"; + + meta = with lib; { + description = "A high performance csv viewer with cjk/emoji support"; + homepage = "https://github.com/wfxr/csview"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/text/difftastic/default.nix b/nixpkgs/pkgs/tools/text/difftastic/default.nix index 3a32f855c0c5..bfe430957484 100644 --- a/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "WFvxdRCbTBW1RGn2SvAo2iXn82OO/Z06cZQkIu4eiew="; + sha256 = "0103py4v4v7xqv85yiczhd9w9h1aa54svhhdibvbl6x4b35y2mk5"; }; - cargoSha256 = "2hRUfIxNVs4uSrEESas3wvvVsZHVocP8aiO7K0NZ+mY="; + cargoSha256 = "1k0d7yadicfzfc2m1aqs4c4a2k3srb54fpwarc3kwn26v3vfjai1"; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; + changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/text/hck/default.nix b/nixpkgs/pkgs/tools/text/hck/default.nix index f10c01ca2fd6..271e4d9b7168 100644 --- a/nixpkgs/pkgs/tools/text/hck/default.nix +++ b/nixpkgs/pkgs/tools/text/hck/default.nix @@ -1,17 +1,29 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ cmake +, fetchFromGitHub +, lib +, rustPlatform +, stdenv +, libiconv +, CoreFoundation +, Security +}: rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.5.4"; + version = "0.6.3"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "1zdzi98qywlwk5bp47963vya2p2ahrbjkc9h63lmb05wlas9s78y"; + sha256 = "02yvpgvzdprysg0spa0abn7d3vjj5spzc3528rwbpl4cw2yx8j6w"; }; - cargoSha256 = "0lvd5xpgh2vq2lszzb0fs6ha2vb419a5w0hlkq3287vq3ya3p4qg"; + cargoSha256 = "0n6wywb1xyaxkbr0fs39992dfv55wzvp05i1vk9mxgnsim9s7aw8"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; meta = with lib; { description = "A close to drop in replacement for cut that can use a regex delimiter instead of a fixed string"; diff --git a/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock index b1bfe4aaa8bd..18dc624c3da1 100644 --- a/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock +++ b/nixpkgs/pkgs/tools/text/reckon/Gemfile.lock @@ -4,7 +4,7 @@ GEM chronic (0.10.2) highline (2.0.3) rchardet (1.8.0) - reckon (0.7.1) + reckon (0.8.0) chronic (>= 0.3.0) highline (>= 1.5.2) rchardet (>= 1.8.0) @@ -16,4 +16,4 @@ DEPENDENCIES reckon BUNDLED WITH - 1.17.2 + 2.2.20 diff --git a/nixpkgs/pkgs/tools/text/reckon/default.nix b/nixpkgs/pkgs/tools/text/reckon/default.nix index 3af64e39ed17..91233dfe97b4 100644 --- a/nixpkgs/pkgs/tools/text/reckon/default.nix +++ b/nixpkgs/pkgs/tools/text/reckon/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; + changelog = "https://github.com/cantino/reckon/blob/v${version}/CHANGELOG.md"; }; } diff --git a/nixpkgs/pkgs/tools/text/reckon/gemset.nix b/nixpkgs/pkgs/tools/text/reckon/gemset.nix index 09a4e704d08e..0e2cc48886a4 100644 --- a/nixpkgs/pkgs/tools/text/reckon/gemset.nix +++ b/nixpkgs/pkgs/tools/text/reckon/gemset.nix @@ -35,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hsmzjxj1f5ma816gag1b3bdjbynhj2szgar955fcs3gbbzv4sk7"; + sha256 = "0qnghypb9pj7888096xwyrx7myhzk85x69ympxkxki3kxcgcrdfn"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; } diff --git a/nixpkgs/pkgs/tools/text/sad/default.nix b/nixpkgs/pkgs/tools/text/sad/default.nix new file mode 100644 index 000000000000..2b748d60d1fe --- /dev/null +++ b/nixpkgs/pkgs/tools/text/sad/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "sad"; + version = "0.4.14"; + + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = pname; + rev = "v${version}"; + sha256 = "03b6qxkn8sqv06gs4p6wg02arz0n9llc3z92zhfd5ipz8han83fd"; + }; + + cargoSha256 = "13nkd4354siy8pr2032bxz2z5x8b378mccq6pnm71cpl9dl6w4ad"; + + meta = with lib; { + description = "CLI tool to search and replace"; + homepage = "https://github.com/ms-jpq/sad"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/text/tv/default.nix b/nixpkgs/pkgs/tools/text/tv/default.nix new file mode 100644 index 000000000000..1f0e4078f3f1 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/tv/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "tv"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "uzimaru0000"; + repo = pname; + rev = "v${version}"; + sha256 = "07gcs64j468213jxcjjv9vywzvfair7gbaiqzqm9wwsdgjyw0wwc"; + }; + + cargoSha256 = "00fi7wimr0rihf6qx20r77w85w2i55kn823gp283lsszbw1z8as9"; + + meta = with lib; { + description = "Format json into table view"; + homepage = "https://github.com/uzimaru0000/tv"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/nixpkgs/pkgs/tools/typesetting/sile/default.nix index 92062b8eac8a..049938581b67 100644 --- a/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -3,9 +3,8 @@ , fetchurl , makeWrapper , pkg-config -, autoconf -, automake , poppler_utils +, gitMinimal , harfbuzz , icu , fontconfig @@ -39,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.15"; + version = "0.11.1"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0p1w3s6j34qi93aycqmqggfm277n90z90nlmm1j3qizxxwq5gda9"; + sha256 = "06bx94zx6skhizk2bbrid82sldwgxfycvjh6zx1zy1xz8gajgrm3"; }; configureFlags = [ @@ -52,8 +51,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoconf - automake + gitMinimal pkg-config makeWrapper ]; @@ -70,7 +68,9 @@ stdenv.mkDerivation rec { poppler_utils ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = '' + patchShebangs build-aux/*.sh + '' + lib.optionalString stdenv.isDarwin '' sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m ''; @@ -108,7 +108,8 @@ stdenv.mkDerivation rec { technologies and borrowing some ideas from graphical systems such as InDesign. ''; - homepage = "https://sile-typesetter.org/"; + homepage = "https://sile-typesetter.org"; + changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md"; platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018 maintainers = with maintainers; [ doronbehar alerque ]; diff --git a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index c815f6fcf6d5..e5f98df3f010 100644 --- a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -22,13 +22,13 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.8.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "19lfnwgm09gxk0mcikwl7v4hw2ai2k9lkdjlalz8fsswf81my7h6"; + sha256 = "sha256-JlWbhElgRDeFMjtPPy7Sk69SMlpQYfnZ3AjAfl2SRyI="; }; # remove need for git history diff --git a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index 9c67b5462bbf..7fe09aa6b426 100644 --- a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.2"; + version = "0.3.27"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-9eGaOSmHrJlcLOvZuLaNu8D/D/rWiyFb4ztxybUP0uM="; + sha256 = "sha256-VbcOoIMhY4FpfQbC2ESFaPoV9AS5DpGvid8jcQxLuEE="; }; - vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA="; + vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 142d64babb7e..887137a4b83b 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -570,6 +570,7 @@ mapAliases ({ openisns = open-isns; # added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 openjpeg_2 = openjpeg; # added 2021-01-25 + openmpt123 = libopenmpt; # added 2021-09-05 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 orchis = orchis-theme; # added 2021-06-09 @@ -703,6 +704,7 @@ mapAliases ({ pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 + python-swiftclient = swiftclient; # added 2021-09-09 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 @@ -891,6 +893,7 @@ mapAliases ({ tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 timescale-prometheus = promscale; # added 2020-09-29 + timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05 tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16 tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16 tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 @@ -908,7 +911,8 @@ mapAliases ({ truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 - turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08 + typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 @@ -942,6 +946,7 @@ mapAliases ({ webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 + wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 winstone = throw "winstone is not supported anymore. Alternatives are Jetty or Tomcat."; # added 2019-05-14 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index c5d0c1957b60..c56550b68150 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -302,6 +302,8 @@ with pkgs; mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + prisma-engines = callPackage ../development/tools/database/prisma-engines { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -338,6 +340,8 @@ with pkgs; creddump = callPackage ../tools/security/creddump {}; + credential-detector = callPackage ../tools/security/credential-detector { }; + credslayer = callPackage ../tools/security/credslayer { }; device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; @@ -626,7 +630,7 @@ with pkgs; mkShell = callPackage ../build-support/mkshell { }; mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -657,6 +661,8 @@ with pkgs; srcOnly = callPackage ../build-support/src-only { }; + substitute = callPackage ../build-support/substitute/substitute.nix { }; + substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; substituteAllFiles = callPackage ../build-support/substitute-files/substitute-all-files.nix { }; @@ -690,7 +696,7 @@ with pkgs; enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; makeGCOVReport = makeSetupHook - { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } + { deps = [ lcov enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; # intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage' @@ -891,6 +897,12 @@ with pkgs; gobgp = callPackage ../tools/networking/gobgp { }; + gofu = callPackage ../applications/misc/gofu { }; + + linux-router = callPackage ../tools/networking/linux-router { }; + + linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; + metapixel = callPackage ../tools/graphics/metapixel { }; pferd = callPackage ../tools/misc/pferd {}; @@ -901,12 +913,16 @@ with pkgs; sx-go = callPackage ../tools/security/sx-go { }; + tauon = callPackage ../applications/audio/tauon { }; + tfk8s = callPackage ../tools/misc/tfk8s { }; tnat64 = callPackage ../tools/networking/tnat64 { }; veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; + ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; + xcd = callPackage ../tools/misc/xcd { }; xtrt = callPackage ../tools/archivers/xtrt { }; @@ -1015,6 +1031,9 @@ with pkgs; extraLibs = config.st.extraLibs or []; }; xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; + lukesmithxyz-st = callPackage ../applications/terminal-emulators/st/lukesmithxyz-st { }; + mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; + siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; @@ -1090,6 +1109,8 @@ with pkgs; analog = callPackage ../tools/admin/analog {}; + android-backup-extractor = callPackage ../tools/backup/android-backup-extractor {}; + android-tools = lowPrio (callPackage ../tools/misc/android-tools { stdenv = if stdenv.targetPlatform.isAarch64 then gcc10Stdenv else stdenv; }); @@ -1296,6 +1317,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + checkip = callPackage ../tools/networking/checkip { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -1978,6 +2001,8 @@ with pkgs; blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; + blitz = callPackage ../development/libraries/blitz { }; + blockbook = callPackage ../servers/blockbook { }; blockhash = callPackage ../tools/graphics/blockhash { }; @@ -2190,9 +2215,9 @@ with pkgs; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; - calamares = libsForQt514.callPackage ../tools/misc/calamares { + calamares = libsForQt515.callPackage ../tools/misc/calamares { python = python3; - boost = pkgs.boost.override { python = python3; }; + boost = boost.override { enablePython = true; python = python3; }; }; calendar-cli = callPackage ../tools/networking/calendar-cli { }; @@ -2437,6 +2462,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csview = callPackage ../tools/text/csview { }; + csvkit = callPackage ../tools/text/csvkit { }; csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; @@ -3129,7 +3156,7 @@ with pkgs; moonraker = callPackage ../servers/moonraker { }; mousetweaks = callPackage ../applications/accessibility/mousetweaks { - inherit (pkgs.xorg) libX11 libXtst libXfixes; + inherit (xorg) libX11 libXtst libXfixes; }; mp3blaster = callPackage ../applications/audio/mp3blaster { }; @@ -3161,6 +3188,7 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; }; nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); @@ -4355,6 +4383,8 @@ with pkgs; doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; + dorkscout = callPackage ../tools/security/dorkscout { }; + sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; slade = callPackage ../applications/misc/slade { @@ -4691,7 +4721,7 @@ with pkgs; entr = callPackage ../tools/misc/entr { }; - envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; }; eot_utilities = callPackage ../tools/misc/eot-utilities { }; @@ -4859,6 +4889,7 @@ with pkgs; fgallery = callPackage ../tools/graphics/fgallery { }; flannel = callPackage ../tools/networking/flannel { }; + cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix {}; flare = callPackage ../games/flare { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -5279,6 +5310,10 @@ with pkgs; git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { }; + git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { }; git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { }; @@ -5432,6 +5467,8 @@ with pkgs; gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; + gitty = callPackage ../applications/version-management/git-and-tools/gitty { }; + gitui = callPackage ../applications/version-management/git-and-tools/gitui { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; @@ -5778,6 +5815,8 @@ with pkgs; gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; + gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; + gvpe = callPackage ../tools/networking/gvpe { openssl = openssl_1_0_2; }; @@ -5971,6 +6010,10 @@ with pkgs; html-proofer = callPackage ../tools/misc/html-proofer { }; + htmlq = callPackage ../development/tools/htmlq { + inherit (darwin.apple_sdk.frameworks) Security; + }; + htpdate = callPackage ../tools/networking/htpdate { }; http-prompt = callPackage ../tools/networking/http-prompt { }; @@ -6296,6 +6339,10 @@ with pkgs; jo = callPackage ../development/tools/jo { }; + joshuto = callPackage ../applications/misc/joshuto { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; + jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; @@ -6589,6 +6636,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + mask = callPackage ../development/tools/mask { }; + mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails @@ -6607,6 +6656,8 @@ with pkgs; matrix-corporal = callPackage ../servers/matrix-corporal { }; + mautrix-facebook = callPackage ../servers/mautrix-facebook { }; + mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { }); mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); @@ -6748,11 +6799,11 @@ with pkgs; nodejs-slim_latest = nodejs-slim-16_x; nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - nodejs = pkgs.nodejs_latest; + nodejs = nodejs_latest; }); nodePackages = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - nodejs = pkgs.nodejs; + inherit nodejs; }); np2kai = callPackage ../misc/emulators/np2kai { }; @@ -7208,7 +7259,7 @@ with pkgs; pythonPackages = python3Packages; }; - mirakurun = nodePackages.mirakurun; + mirakurun = callPackage ../applications/video/mirakurun { }; miredo = callPackage ../tools/networking/miredo { }; @@ -7330,6 +7381,8 @@ with pkgs; mydumper = callPackage ../tools/backup/mydumper { }; + mylvmbackup = callPackage ../tools/backup/mylvmbackup { }; + mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; mysqltuner = callPackage ../tools/misc/mysqltuner { }; @@ -7689,6 +7742,10 @@ with pkgs; ocserv = callPackage ../tools/networking/ocserv { }; + oha = callPackage ../tools/networking/oha { + inherit (darwin.apple_sdk.frameworks) Security; + }; + opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; @@ -7884,6 +7941,8 @@ with pkgs; os-prober = callPackage ../tools/misc/os-prober {}; + oshka = callPackage ../development/tools/oshka {}; + osl = callPackage ../development/compilers/osl { }; osqp = callPackage ../development/libraries/science/math/osqp { }; @@ -8769,6 +8828,8 @@ with pkgs; sacad = callPackage ../tools/misc/sacad { }; + sad = callPackage ../tools/text/sad { }; + safecopy = callPackage ../tools/system/safecopy { }; sacd = callPackage ../tools/cd-dvd/sacd { }; @@ -9072,6 +9133,8 @@ with pkgs; spicy = callPackage ../development/tools/spicy { }; + spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -9117,6 +9180,8 @@ with pkgs; sqliteman = callPackage ../applications/misc/sqliteman { }; + sqls = callPackage ../applications/misc/sqls { }; + stdman = callPackage ../data/documentation/stdman { }; steck = callPackage ../servers/pinnwand/steck.nix { }; @@ -9269,6 +9334,8 @@ with pkgs; stunnel = callPackage ../tools/networking/stunnel { }; + stuntman = callPackage ../tools/networking/stuntman { }; + stutter = haskell.lib.justStaticExecutables haskellPackages.stutter; strongswan = callPackage ../tools/networking/strongswan { }; @@ -9487,8 +9554,6 @@ with pkgs; timetrap = callPackage ../applications/office/timetrap { }; - timetable = callPackage ../applications/office/timetable { }; - timekeeper = callPackage ../applications/office/timekeeper { }; timezonemap = callPackage ../development/libraries/timezonemap { }; @@ -9693,6 +9758,8 @@ with pkgs; turses = callPackage ../applications/networking/instant-messengers/turses { }; + tv = callPackage ../tools/text/tv { }; + tvm = callPackage ../development/compilers/tvm { }; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; @@ -9841,6 +9908,8 @@ with pkgs; vend = callPackage ../development/tools/vend { }; + verco = callPackage ../applications/version-management/verco { }; + verilator = callPackage ../applications/science/electronics/verilator {}; verilog = callPackage ../applications/science/electronics/verilog { @@ -10304,8 +10373,6 @@ with pkgs; chase = callPackage ../tools/system/chase { }; - wicd = callPackage ../tools/networking/wicd { }; - wimlib = callPackage ../tools/archivers/wimlib { }; wipe = callPackage ../tools/security/wipe { }; @@ -10511,6 +10578,8 @@ with pkgs; zerofree = callPackage ../tools/filesystems/zerofree { }; + zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; + zfsbackup = callPackage ../tools/backup/zfsbackup { }; zfstools = callPackage ../tools/filesystems/zfstools { }; @@ -10664,6 +10733,8 @@ with pkgs; oksh = callPackage ../shells/oksh { }; + loksh = callPackage ../shells/loksh { }; + pash = callPackage ../shells/pash { }; scponly = callPackage ../shells/scponly { }; @@ -10822,10 +10893,14 @@ with pkgs; asciigraph = callPackage ../tools/text/asciigraph { }; + as31 = callPackage ../development/compilers/as31 { }; + asn1c = callPackage ../development/compilers/asn1c { }; aspectj = callPackage ../development/compilers/aspectj { }; + atasm = callPackage ../development/compilers/atasm { }; + ats = callPackage ../development/compilers/ats { }; ats2 = callPackage ../development/compilers/ats2 { }; @@ -11575,6 +11650,13 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); + go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; + }); + go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -11771,17 +11853,17 @@ with pkgs; openspin = callPackage ../development/compilers/openspin { }; - oraclejdk = pkgs.jdkdistro true false; + oraclejdk = jdkdistro true false; - oraclejdk8 = pkgs.oraclejdk8distro true false; + oraclejdk8 = oraclejdk8distro true false; - oraclejre = lowPrio (pkgs.jdkdistro false false); + oraclejre = lowPrio (jdkdistro false false); - oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); + oraclejre8 = lowPrio (oraclejdk8distro false false); jrePlugin = jre8Plugin; - jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); + jre8Plugin = lowPrio (oraclejdk8distro false true); jdkdistro = oraclejdk8distro; @@ -12161,11 +12243,14 @@ with pkgs; inherit (llvmPackages_rocm) clang; }; + hip = callPackage ../development/compilers/hip { + inherit (llvmPackages_rocm) clang clang-unwrapped compiler-rt lld llvm; + }; + rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { }; rocm-comgr = callPackage ../development/libraries/rocm-comgr { inherit (llvmPackages_rocm) clang lld llvm; - device-libs = rocm-device-libs; }; rocm-device-libs = callPackage ../development/libraries/rocm-device-libs { @@ -12182,11 +12267,12 @@ with pkgs; inherit (llvmPackages_rocm) clang-unwrapped llvm; }; - # Python >= 3.8 still gives a bunch of warnings. - rocm-smi = python37.pkgs.callPackage ../tools/system/rocm-smi { }; + rocm-smi = python3Packages.callPackage ../tools/system/rocm-smi { }; rocm-thunk = callPackage ../development/libraries/rocm-thunk { }; + rocminfo = callPackage ../development/tools/rocminfo { }; + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; @@ -12280,7 +12366,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { @@ -12319,6 +12405,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; + cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { @@ -12378,6 +12465,7 @@ with pkgs; sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {}; sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {}; + sbcl_2_1_8 = callPackage ../development/compilers/sbcl/2.1.8.nix {}; sbcl = sbcl_2_1_2; roswell = callPackage ../development/tools/roswell/default.nix { }; @@ -12475,7 +12563,7 @@ with pkgs; }); thrust = callPackage ../development/tools/thrust { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; tinycc = callPackage ../development/compilers/tinycc { }; @@ -12646,6 +12734,11 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; beam_nox = callPackage ./beam-packages.nix { beam = beam_nox; wxSupport = false; }; + beam_minimal = callPackage ./beam-packages.nix { + beam = beam_minimal; + wxSupport = false; + systemdSupport = false; + }; inherit (beam.interpreters) erlang erlangR24 erlangR23 erlangR22 erlangR21 @@ -12732,7 +12825,7 @@ with pkgs; ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -12943,6 +13036,8 @@ with pkgs; inherit pkgs lib; }; + poetry2conda = python3Packages.callPackage ../development/python-modules/poetry2conda { }; + pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; @@ -13472,7 +13567,7 @@ with pkgs; bison = callPackage ../development/tools/parsing/bison { }; # Ruby fails to build with current bison - bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec { + bison_3_5 = bison.overrideAttrs (oldAttrs: rec { version = "3.5.4"; src = fetchurl { url = "mirror://gnu/${oldAttrs.pname}/${oldAttrs.pname}-${version}.tar.gz"; @@ -13500,6 +13595,8 @@ with pkgs; buck = callPackage ../development/tools/build-managers/buck { }; + build2 = callPackage ../development/tools/build-managers/build2 { }; + buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; @@ -13641,7 +13738,7 @@ with pkgs; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { - inherit (pkgs) cmake; + inherit cmake; }; # Does not actually depend on Qt 5 @@ -14130,6 +14227,8 @@ with pkgs; kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubescape = callPackage ../tools/security/kubescape { }; + kubesec = callPackage ../tools/security/kubesec { }; kubespy = callPackage ../applications/networking/cluster/kubespy { }; @@ -14192,7 +14291,7 @@ with pkgs; luaformatter = callPackage ../development/tools/luaformatter (lib.optionalAttrs stdenv.isDarwin { - stdenv = overrideCC stdenv llvmPackages_latest.clang; + stdenv = overrideCC stdenv llvmPackages_9.clang; }); malt = callPackage ../development/tools/profiling/malt {}; @@ -14275,17 +14374,17 @@ with pkgs; }; nwjs = callPackage ../development/tools/nwjs { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; nwjs-sdk = callPackage ../development/tools/nwjs { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; sdk = true; }; # only kept for nixui, see https://github.com/matejc/nixui/issues/27 nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. @@ -15394,7 +15493,7 @@ with pkgs; faad2 = callPackage ../development/libraries/faad2 { }; factor-lang = callPackage ../development/compilers/factor-lang { - inherit (pkgs.gnome2) gtkglext; + inherit (gnome2) gtkglext; }; far2l = callPackage ../applications/misc/far2l { @@ -16102,6 +16201,8 @@ with pkgs; gvfs = callPackage ../development/libraries/gvfs { }; + gvm-libs = callPackage ../development/libraries/gvm-libs { }; + gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; hamlib = hamlib_3; @@ -16170,6 +16271,8 @@ with pkgs; http-parser = callPackage ../development/libraries/http-parser { }; + hubble = callPackage ../applications/networking/cluster/hubble { }; + hunspell = callPackage ../development/libraries/hunspell { }; hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {}); @@ -17438,6 +17541,8 @@ with pkgs; libspiro = callPackage ../development/libraries/libspiro {}; + libspng = callPackage ../development/libraries/libspng { }; + libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; @@ -18175,6 +18280,8 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; + openstackclient = with python3Packages; toPythonApplication python-openstackclient; + openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) @@ -18396,14 +18503,14 @@ with pkgs; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; + inherit (gnome2) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; # XXX: mariadb doesn't built on fbsd as of nov 2015 libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null; - inherit (pkgs.darwin) libobjc; - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; qmake48Hook = makeSetupHook @@ -18967,7 +19074,7 @@ with pkgs; svxlink = libsForQt5.callPackage ../applications/radio/svxlink { }; - swiftclient = python3.pkgs.callPackage ../tools/admin/swiftclient { }; + swiftclient = with python3Packages; toPythonApplication python-swiftclient; sword = callPackage ../development/libraries/sword { }; @@ -19547,6 +19654,15 @@ with pkgs; buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; + # go_1_17 has go module changes which may not be portable + # across different go versions and/or platforms, + # it also requires >=10.13 stdenv on darwin which + # is not currently available for x86_64-darwin + # + # do not uncomment this without approval from the go CODEOWNERS + #buildGo117Package = callPackage ../development/go-packages/generic { + # go = buildPackages.go_1_17; + #}; buildGoPackage = buildGo116Package; @@ -19556,6 +19672,15 @@ with pkgs; buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; + # go_1_17 has go module changes which may not be portable + # across different go versions and/or platforms, + # it also requires >=10.13 stdenv on darwin which + # is not currently available for x86_64-darwin + # + # do not uncomment this without approval from the go CODEOWNERS + #buildGo117Module = callPackage ../development/go-modules/generic { + # go = buildPackages.go_1_17; + #}; buildGoModule = buildGo116Module; @@ -19856,9 +19981,8 @@ with pkgs; prosody = callPackage ../servers/xmpp/prosody { # _compat can probably be removed on next minor version after 0.10.0 - lua5 = lua5_2_compat; - withExtraLibs = [ luaPackages.luadbi-sqlite3 ]; - inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi; + lua = lua5_2_compat; + withExtraLibs = []; }; biboumi = callPackage ../servers/xmpp/biboumi { }; @@ -19986,6 +20110,8 @@ with pkgs; jetty = callPackage ../servers/http/jetty { }; + jibri = callPackage ../servers/jibri { }; + jicofo = callPackage ../servers/jicofo { }; jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; @@ -20307,7 +20433,7 @@ with pkgs; mariadb = callPackage ../servers/sql/mariadb { inherit (darwin) cctools; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; mongodb = hiPrio mongodb-3_4; @@ -21207,7 +21333,7 @@ with pkgs; open-isns = callPackage ../os-specific/linux/open-isns { }; osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { - inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; macfuse-stubs = callPackage ../os-specific/darwin/macfuse { @@ -21725,6 +21851,9 @@ with pkgs; linuxPackages_5_10_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_10 { }); linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; + linuxPackages_5_13_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_13 { }); + linux_5_13_hardened = linuxPackages_5_13_hardened.kernel; + # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; @@ -22065,6 +22194,8 @@ with pkgs; pipes = callPackage ../misc/screensavers/pipes { }; + pipes-rs = callPackage ../misc/screensavers/pipes-rs { }; + pipework = callPackage ../os-specific/linux/pipework { }; pktgen = callPackage ../os-specific/linux/pktgen { }; @@ -23653,7 +23784,7 @@ with pkgs; libxkbcommon = libxkbcommon_7; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { - inherit (pkgs) bitwig-studio1; + inherit bitwig-studio1; }; bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { }; @@ -23899,7 +24030,9 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; - corrscope = libsForQt5.callPackage ../applications/video/corrscope { }; + corrscope = libsForQt5.callPackage ../applications/video/corrscope { + ffmpeg = ffmpeg-full; + }; coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; @@ -24023,8 +24156,10 @@ with pkgs; dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; + dht = callPackage ../applications/networking/p2p/dht { }; + dia = callPackage ../applications/graphics/dia { - inherit (pkgs.gnome2) libart_lgpl libgnomeui; + inherit (gnome2) libart_lgpl libgnomeui; }; direwolf = callPackage ../applications/radio/direwolf { @@ -24281,6 +24416,8 @@ with pkgs; evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + exaile = callPackage ../applications/audio/exaile { }; + exercism = callPackage ../applications/misc/exercism { }; expenses = callPackage ../applications/misc/expenses { }; @@ -24404,7 +24541,9 @@ with pkgs; foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; - fossil = callPackage ../applications/version-management/fossil { }; + fossil = callPackage ../applications/version-management/fossil { + sqlite = sqlite.override { enableDeserialize = true; }; + }; freebayes = callPackage ../applications/science/biology/freebayes { }; @@ -24637,6 +24776,8 @@ with pkgs; fbida = callPackage ../applications/graphics/fbida { }; + fclones = callPackage ../tools/misc/fclones { }; + fcp = callPackage ../tools/misc/fcp { }; fdupes = callPackage ../tools/misc/fdupes { }; @@ -24733,6 +24874,8 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; + fragments = callPackage ../applications/networking/p2p/fragments { }; + freecad = libsForQt5.callPackage ../applications/graphics/freecad { inherit (python3Packages) GitPython @@ -25577,7 +25720,7 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; k3d = callPackage ../applications/graphics/k3d { - inherit (pkgs.gnome2) gtkglext; + inherit (gnome2) gtkglext; stdenv = gcc6Stdenv; boost = boost155.override { enablePython = true; @@ -25859,6 +26002,8 @@ with pkgs; libvmi = callPackage ../development/libraries/libvmi { }; + libutp = callPackage ../applications/networking/p2p/libutp { }; + lifelines = callPackage ../applications/misc/lifelines { }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; @@ -26066,11 +26211,15 @@ with pkgs; # Needs qtwebkit which is broken on qt5.15 mendeley = libsForQt514.callPackage ../applications/office/mendeley { - gconf = pkgs.gnome2.GConf; + gconf = gnome2.GConf; }; menumaker = callPackage ../applications/misc/menumaker { }; + menyoki = callPackage ../applications/graphics/menyoki { + inherit (xorg) libX11 libXrandr; + }; + mercurial_4 = callPackage ../applications/version-management/mercurial/4.9.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -26544,8 +26693,6 @@ with pkgs; mlt-qt5 = libsForQt514.mlt; }; - typora = callPackage ../applications/editors/typora { }; - taxi = callPackage ../applications/networking/ftp/taxi { }; librep = callPackage ../development/libraries/librep { }; @@ -26746,7 +26893,7 @@ with pkgs; opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { - inherit (pkgs) pkg-config; + inherit pkg-config; }; orca-c = callPackage ../applications/audio/orca-c {}; @@ -26773,7 +26920,7 @@ with pkgs; vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { }; - openmpt123 = callPackage ../applications/audio/openmpt123 { }; + libopenmpt = callPackage ../applications/audio/libopenmpt { }; openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; @@ -27827,10 +27974,16 @@ with pkgs; tendermint = callPackage ../tools/networking/tendermint { }; + termdbms = callPackage ../development/tools/database/termdbms { }; + termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; + textplots = callPackage ../tools/graphics/textplots { }; + + texture-synthesis = callPackage ../tools/graphics/texture-synthesis { }; + tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; termtosvg = callPackage ../tools/misc/termtosvg { }; @@ -28151,12 +28304,7 @@ with pkgs; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # See: - # - https://github.com/NixOS/nixpkgs/issues/129099 - # - https://github.com/NixOS/nixpkgs/issues/128959 - lua = - if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else - luajit; + lua = luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; @@ -28175,9 +28323,7 @@ with pkgs; neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - vis = callPackage ../applications/editors/vis { - inherit (lua52Packages) lpeg; - }; + vis = callPackage ../applications/editors/vis { }; viw = callPackage ../applications/editors/viw { }; @@ -28351,9 +28497,7 @@ with pkgs; imlib2 = imlib2-nox; }; - watson = callPackage ../applications/office/watson { - pythonPackages = python3Packages; - }; + watson = callPackage ../applications/office/watson { }; wapiti = callPackage ../tools/security/wapiti { }; @@ -29194,6 +29338,8 @@ with pkgs; adom = callPackage ../games/adom { }; + airshipper = callPackage ../games/airshipper { }; + airstrike = callPackage ../games/airstrike { }; alephone = callPackage ../games/alephone { }; @@ -29349,6 +29495,9 @@ with pkgs; crawl = callPackage ../games/crawl { }; + inherit (import ../games/crossfire pkgs) + crossfire-server crossfire-arch crossfire-maps crossfire-client; + crrcsim = callPackage ../games/crrcsim {}; curseofwar = callPackage ../games/curseofwar { SDL = null; }; @@ -29358,6 +29507,9 @@ with pkgs; cuyo = callPackage ../games/cuyo { }; + inherit (import ../games/deliantra pkgs) + deliantra-server deliantra-arch deliantra-maps deliantra-data; + devilutionx = callPackage ../games/devilutionx {}; dhewm3 = callPackage ../games/dhewm3 {}; @@ -29396,7 +29548,9 @@ with pkgs; ecwolf = callPackage ../games/ecwolf { }; - eduke32 = callPackage ../games/eduke32 { }; + eduke32 = callPackage ../games/eduke32 { + inherit (darwin.apple_sdk.frameworks) AGL Cocoa GLUT OpenGL; + }; egoboo = callPackage ../games/egoboo { }; @@ -29821,7 +29975,9 @@ with pkgs; quake3hires = callPackage ../games/quake3/content/hires.nix { }; - quakespasm = callPackage ../games/quakespasm { }; + quakespasm = callPackage ../games/quakespasm { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio CoreFoundation IOKit OpenGL; + }; vkquake = callPackage ../games/quakespasm/vulkan.nix { }; ioquake3 = callPackage ../games/quake3/ioquake { }; @@ -29979,9 +30135,13 @@ with pkgs; steamcmd = steamPackages.steamcmd; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { - inherit steam-run; - inherit winetricks; - inherit (gnome) zenity; + winetricks = winetricks.override { + # Remove default build of wine to reduce closure size. + # Falls back to wine in PATH. + wine = null; + }; + + inherit steam-run yad; }; protonup = with python3Packages; toPythonApplication protonup; @@ -31108,7 +31268,9 @@ with pkgs; ngspice = callPackage ../applications/science/electronics/ngspice { }; - openems = callPackage ../applications/science/electronics/openems { }; + openems = callPackage ../applications/science/electronics/openems { + qcsxcad = libsForQt5.qcsxcad; + }; openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { }; @@ -31233,7 +31395,7 @@ with pkgs; celestia = callPackage ../applications/science/astronomy/celestia { autoreconfHook = buildPackages.autoreconfHook269; - inherit (pkgs.gnome2) gtkglext; + inherit (gnome2) gtkglext; }; convertall = qt5.callPackage ../applications/science/misc/convertall { }; @@ -31275,7 +31437,7 @@ with pkgs; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }); rink = callPackage ../applications/science/misc/rink { @@ -31466,6 +31628,10 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + dcp9020cdwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).driver; + + dcp9020cdw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).cupswrapper; + cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; cups-brother-hl1210w = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1210w { }; @@ -31489,7 +31655,7 @@ with pkgs; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; }; + desmume = callPackage ../misc/emulators/desmume { inherit (gnome2) gtkglext libglade; }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -31614,7 +31780,9 @@ with pkgs; hatari = callPackage ../misc/emulators/hatari { }; - hck = callPackage ../tools/text/hck { }; + hck = callPackage ../tools/text/hck { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; helm = callPackage ../applications/audio/helm { }; @@ -31995,6 +32163,8 @@ with pkgs; nut = callPackage ../applications/misc/nut { }; + nhentai = callPackage ../applications/misc/nhentai { }; + nvd = callPackage ../tools/package-management/nvd { }; solfege = python3Packages.callPackage ../misc/solfege { }; @@ -32142,7 +32312,7 @@ with pkgs; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { - inherit (pkgs) glib gtk3 gobject-introspection wrapGAppsHook; + inherit glib gtk3 gobject-introspection wrapGAppsHook; }; rpl = callPackage ../tools/text/rpl { @@ -32244,7 +32414,7 @@ with pkgs; satysfi = callPackage ../tools/typesetting/satysfi { }; - sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { + sc-controller = python3Packages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. }; @@ -32498,6 +32668,8 @@ with pkgs; websocketd = callPackage ../applications/networking/websocketd { }; + wike = callPackage ../applications/misc/wike { }; + wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; @@ -32645,11 +32817,11 @@ with pkgs; yuzu-mainline = import ../misc/emulators/yuzu { branch = "mainline"; - inherit (pkgs) libsForQt5 fetchFromGitHub; + inherit libsForQt5 fetchFromGitHub; }; yuzu-ea = import ../misc/emulators/yuzu { branch = "early-access"; - inherit (pkgs) libsForQt5 fetchFromGitHub; + inherit libsForQt5 fetchFromGitHub; }; zap = callPackage ../tools/networking/zap { }; diff --git a/nixpkgs/pkgs/top-level/beam-packages.nix b/nixpkgs/pkgs/top-level/beam-packages.nix index 1b5ff3a3f25a..bdd8b6e32516 100644 --- a/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/nixpkgs/pkgs/top-level/beam-packages.nix @@ -1,4 +1,7 @@ -{ beam, callPackage, wxGTK30, buildPackages, wxSupport ? true }: +{ beam, callPackage, wxGTK30, buildPackages, stdenv +, wxSupport ? true +, systemdSupport ? stdenv.isLinux +}: with beam; { lib = callPackage ../development/beam-modules/lib.nix { }; @@ -23,7 +26,7 @@ with beam; { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR24_odbc = erlangR24.override { odbcSupport = true; }; erlangR24_javac = erlangR24.override { javacSupport = true; }; @@ -38,7 +41,7 @@ with beam; { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -53,7 +56,7 @@ with beam; { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -66,7 +69,7 @@ with beam; { erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; diff --git a/nixpkgs/pkgs/top-level/lua-packages.nix b/nixpkgs/pkgs/top-level/lua-packages.nix index 246d62b903b3..80f71dc1942e 100644 --- a/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/nixpkgs/pkgs/top-level/lua-packages.nix @@ -18,85 +18,60 @@ let packages = ( self: let - luaAtLeast = lib.versionAtLeast lua.luaversion; - luaOlder = lib.versionOlder lua.luaversion; - isLua51 = (lib.versions.majorMinor lua.version) == "5.1"; - isLua52 = (lib.versions.majorMinor lua.version) == "5.2"; - isLua53 = lua.luaversion == "5.3"; - isLuaJIT = lib.getName lua == "luajit"; - lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix { }; - - # Check whether a derivation provides a lua module. - hasLuaModule = drv: drv ? luaModule ; + # a function of lua_path / lua_cpath + lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix { + inherit lib; + }; callPackage = pkgs.newScope self; - requiredLuaModules = drvs: with lib; let - modules = filter hasLuaModule drvs; - in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); - - # Convert derivation to a lua module. - toLuaModule = drv: - drv.overrideAttrs( oldAttrs: { - # Use passthru in order to prevent rebuilds when possible. - passthru = (oldAttrs.passthru or {})// { - luaModule = lua; - requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs; - }; - }); - - - platformString = - if stdenv.isDarwin then "macosx" - else if stdenv.isFreeBSD then "freebsd" - else if stdenv.isLinux then "linux" - else if stdenv.isSunOS then "solaris" - else throw "unsupported platform"; - buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args ); - buildLuarocksPackage = with pkgs.lib; makeOverridable(callPackage ../development/interpreters/lua-5/build-lua-package.nix { - inherit toLuaModule; + buildLuarocksPackage = lib.makeOverridable(callPackage ../development/interpreters/lua-5/build-lua-package.nix { inherit lua; + inherit (pkgs) lib; + inherit (luaLib) toLuaModule; }); -in -with self; { - getLuaPathList = majorVersion: [ - "share/lua/${majorVersion}/?.lua" - "share/lua/${majorVersion}/?/init.lua" - ]; - getLuaCPathList = majorVersion: [ - "lib/lua/${majorVersion}/?.so" - ]; - - # helper functions for dealing with LUA_PATH and LUA_CPATH - getPath = drv: pathListForVersion: - lib.concatMapStringsSep ";" (path: "${drv}/${path}") (pathListForVersion lua.luaversion); - getLuaPath = drv: getPath drv getLuaPathList; - getLuaCPath = drv: getPath drv getLuaCPathList; + luaLib = import ../development/lua-modules/lib.nix { + inherit (pkgs) lib; + inherit pkgs lua; + }; #define build lua package function buildLuaPackage = callPackage ../development/lua-modules/generic { - inherit lua writeText; + inherit writeText; }; + getPath = drv: pathListForVersion: + lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion; - inherit toLuaModule hasLuaModule lua-setup-hook; - inherit buildLuarocksPackage buildLuaApplication; - inherit requiredLuaModules luaOlder luaAtLeast - isLua51 isLua52 isLua53 isLuaJIT lua callPackage; +in +{ + # helper functions for dealing with LUA_PATH and LUA_CPATH + lib = luaLib; + + getLuaPath = drv: luaLib.getPath drv (luaLib.luaPathList lua.luaversion) ; + getLuaCPath = drv: luaLib.getPath drv (luaLib.luaCPathList lua.luaversion) ; + + + inherit lua lua-setup-hook callPackage; + inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; + inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT + requiredLuaModules toLuaModule hasLuaModule; # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { - inherit lua; inherit (pkgs) makeSetupHook makeWrapper; + inherit lua lib; + inherit (pkgs) makeSetupHook makeWrapper; }; luarocks = callPackage ../development/tools/misc/luarocks { - inherit lua; + inherit lua lib; }; + # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; luxio = buildLuaPackage { @@ -132,7 +107,7 @@ with self; { }; }; - vicious = toLuaModule(stdenv.mkDerivation rec { + vicious = luaLib.toLuaModule( stdenv.mkDerivation rec { pname = "vicious"; version = "2.5.0"; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index c166abb95dda..da27b2e2bf7e 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -7,7 +7,7 @@ { config , stdenv, lib, buildPackages, pkgs -, fetchurl, fetchgit, fetchpatch, fetchFromGitHub +, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, fetchFromGitLab , perl, overrides, buildPerl, shortenPerlShebang , nixosTests }: @@ -392,6 +392,20 @@ let }; }; + AnyEventBDB = buildPerlPackage rec { + pname = "AnyEvent-BDB"; + version = "1.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + sha256 = "93e36010940464626e5f31b9faedd65e12ed8d1abf16ce052febf23f495aefc8"; + }; + buildInputs = [ CanaryStability ]; + propagatedBuildInputs = [ BDB AnyEvent ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AnyEventCacheDNS = buildPerlModule { pname = "AnyEvent-CacheDNS"; version = "0.08"; @@ -444,6 +458,20 @@ let }; }; + AnyEventIRC = buildPerlPackage rec { + pname = "AnyEvent-IRC"; + version = "0.97"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EL/ELMEX/${pname}-${version}.tar.gz"; + sha256 = "bfd7cf645c3c8c611471057128611447e20f1adf01516c69624cbd8bc77f5bf0"; + }; + propagatedBuildInputs = [ AnyEvent ObjectEvent commonsense ]; + meta = { + description = "An event based IRC protocol client API"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AnyEventRabbitMQ = buildPerlPackage { pname = "AnyEvent-RabbitMQ"; version = "1.22"; @@ -1221,6 +1249,26 @@ let }; }; + BarcodeZBar = buildPerlPackage { + pname = "Barcode-ZBar"; + version = "0.04pre"; + # The meta::cpan version of this module has been unmaintained from 2009 + # This uses an updated version from the ZBar repo that works with the current ZBar library + src = "${pkgs.zbar.src}/perl"; + postPatch = '' + substituteInPlace Makefile.PL --replace "-lzbar" "-L${pkgs.zbar.lib}/lib -lzbar" + rm t/Processor.t + ''; + buildInputs =[ ExtUtilsMakeMaker ]; + propagatedBuildInputs = [ pkgs.zbar PerlMagick ]; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + homepage = "https://github.com/mchehab/zbar/tree/master/perl"; + description = "Perl interface to the ZBar Barcode Reader"; + license = with lib.licenses; [ gpl2Plus ]; + }; + }; + BC = buildPerlPackage { pname = "B-C"; version = "1.57"; @@ -1291,6 +1339,22 @@ let ''; }; + BDB = buildPerlPackage rec { + pname = "BDB"; + version = "1.92"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + sha256 = "a3f2ca9d2baefc1aaa40908b2f9cb9292fda3e7d797e38bbd78eabb9d9daeb6b"; + }; + NIX_CFLAGS_COMPILE = "-I${pkgs.db4.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.db4.out}/lib -ldb"; + buildInputs = [ pkgs.db4 ]; + propagatedBuildInputs = [ commonsense ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + BHooksEndOfScope = buildPerlPackage { pname = "B-Hooks-EndOfScope"; version = "0.24"; @@ -3289,6 +3353,18 @@ let }; }; + CompressLZF = buildPerlPackage rec { + pname = "Compress-LZF"; + version = "3.8"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + sha256 = "5d1f5df48ce13b4dee1cc9f278ecdbf8177877b0b98815a4eb3c91c3466716f2"; + }; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CompressRawBzip2 = buildPerlPackage { pname = "Compress-Raw-Bzip2"; version = "2.096"; @@ -3778,6 +3854,23 @@ let }; }; + CoroEV = buildPerlPackage rec { + pname = "CoroEV"; + version = "6.55"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-${version}.tar.gz"; + sha256 = "43d79c027170fcda4ca0ee92734605bc95e122686f5071b94d90764c81ae8a30"; + }; + buildInputs = [ CanaryStability ]; + propagatedBuildInputs = [ AnyEvent Coro EV Guard commonsense ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + preConfigure = '' + cd EV + ''; + }; + Corona = buildPerlPackage { pname = "Corona"; version = "0.1004"; @@ -4657,6 +4750,20 @@ let propagatedBuildInputs = [ Curses TermReadKey ]; }; + CursesUIGrid = buildPerlPackage { + pname = "Curses-UI-Grid"; + version = "0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADRIANWIT/Curses-UI-Grid-0.15.tar.gz"; + sha256 = "0820ca4a9fb949ba8faf97af574018baeffb694e980c5087bb6522aa70b9dbec"; + }; + propagatedBuildInputs = [ CursesUI TestPod TestPodCoverage ]; + meta = { + description = "Create and manipulate data in grid model"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptX = buildPerlPackage { pname = "CryptX"; version = "0.069"; @@ -4995,6 +5102,21 @@ let buildInputs = [ TestFailWarnings ]; }; + DataSectionSimple = buildPerlPackage { + pname = "Data-Section-Simple"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Data-Section-Simple-0.07.tar.gz"; + sha256 = "0b3035ffdb909aa1f7ded6b608fa9d894421c82c097d51e7171170d67579a9cb"; + }; + buildInputs = [ TestRequires ]; + meta = { + homepage = "https://github.com/miyagawa/Data-Section-Simple"; + description = "Read data from __DATA__"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataSerializer = buildPerlModule { pname = "Data-Serializer"; version = "0.65"; @@ -5572,6 +5694,19 @@ let }; }; + Deliantra = buildPerlPackage rec { + pname = "Deliantra"; + version = "2.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + sha256 = "2716d9b1f05627d60942ce0634b9c1a25109b164818285d45b609ae8596e2b17"; + }; + propagatedBuildInputs = [ AnyEvent CompressLZF JSONXS commonsense ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelCaller = buildPerlPackage { pname = "Devel-Caller"; version = "2.06"; @@ -6423,6 +6558,19 @@ let }; }; + DigestMD5 = buildPerlPackage rec { + pname = "Digest-MD5"; + version = "2.55"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/${pname}-${version}.tar.gz"; + sha256 = "03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c"; + }; + meta = { + description = "Perl interface to the MD-5 algorithm"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DigestMD5File = buildPerlPackage { pname = "Digest-MD5-File"; version = "0.08"; @@ -16199,6 +16347,20 @@ let }; }; + ObjectEvent = buildPerlPackage rec { + pname = "Object-Event"; + version = "1.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EL/ELMEX/${pname}-${version}.tar.gz"; + sha256 = "ab6bb80508f4fddaf2d51b20ca876aab038582a86b5228e6435411348af53c82"; + }; + propagatedBuildInputs = [ AnyEvent commonsense ]; + meta = { + description = "A class that provides an event callback interface"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ObjectInsideOut = buildPerlModule { pname = "Object-InsideOut"; version = "4.05"; @@ -17207,13 +17369,19 @@ let }; }; - PkgConfig = buildPerlPackage { + PkgConfig = buildPerlPackage rec { pname = "PkgConfig"; version = "0.25026"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.25026.tar.gz"; sha256 = "1862hzlkibqsgynrnwg43acycp4rlsv19gsybjwq39nnqb9mxfjd"; }; + # support cross-compilation by simplifying the way we get version during build + postPatch = '' + substituteInPlace Makefile.PL --replace \ + 'do { require "./lib/PkgConfig.pm"; $PkgConfig::VERSION; }' \ + '"${version}"' + ''; meta = { description = "Pure-Perl Core-Only replacement for pkg-config"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -19954,10 +20122,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.0.0"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v7.0.0.tar.gz"; - sha256 = "1w3div7p86kz9mmcdzmap7fi8hxvzs4nfglks044ihgi5la14r1y"; + version = "7.7.0"; + src = fetchFromGitLab { + owner = "libvirt"; + repo = "libvirt-perl"; + rev = "v7.7.0"; + sha256 = "sha256-rcokZm4pKZrLlkpAZCpECCepNWm+UyXemJGklokiSzM="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -21722,6 +21892,21 @@ let }; }; + TestSnapshot = buildPerlPackage { + pname = "Test-Snapshot"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETJ/Test-Snapshot-0.06.tar.gz"; + sha256 = "f4dd7a9a55baa2247540ae34210cd05a04f9d1061befec97a1c90eda95bfae45"; + }; + buildInputs = [ CaptureTiny ]; + propagatedBuildInputs = [ TextDiff ]; + meta = { + description = "Test against data stored in automatically-named file"; + license = lib.licenses.artistic2; + }; + }; + TestSpec = buildPerlPackage { pname = "Test-Spec"; version = "0.54"; diff --git a/nixpkgs/pkgs/top-level/python-aliases.nix b/nixpkgs/pkgs/top-level/python-aliases.nix index 27b467cbb2a4..0c375a664999 100644 --- a/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/nixpkgs/pkgs/top-level/python-aliases.nix @@ -65,6 +65,7 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 python-lz4 = lz4; # added 2018-06-01 + python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index df257491f28d..a58dcfbd8211 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -267,6 +267,8 @@ in { aioeafm = callPackage ../development/python-modules/aioeafm { }; + aioeagle = callPackage ../development/python-modules/aioeagle { }; + aioemonitor = callPackage ../development/python-modules/aioemonitor { }; aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; @@ -1886,6 +1888,8 @@ in { debian-inspector = callPackage ../development/python-modules/debian-inspector { }; + debtcollector = callPackage ../development/python-modules/debtcollector { }; + debts = callPackage ../development/python-modules/debts { }; debugpy = callPackage ../development/python-modules/debugpy { }; @@ -2249,6 +2253,8 @@ in { dulwich = callPackage ../development/python-modules/dulwich { }; + dungeon-eos = callPackage ../development/python-modules/dungeon-eos { }; + dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; dyn = callPackage ../development/python-modules/dyn { }; @@ -2368,6 +2374,8 @@ in { envoy-reader = callPackage ../development/python-modules/envoy-reader { }; + envoy-utils = callPackage ../development/python-modules/envoy-utils { }; + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { }; @@ -2718,6 +2726,8 @@ in { flux-led = callPackage ../development/python-modules/flux-led { }; + flynt = callPackage ../development/python-modules/flynt { }; + fn = callPackage ../development/python-modules/fn { }; fnvhash = callPackage ../development/python-modules/fnvhash { }; @@ -2961,6 +2971,8 @@ in { glcontext = callPackage ../development/python-modules/glcontext { }; + glfw = callPackage ../development/python-modules/glfw { }; + glob2 = callPackage ../development/python-modules/glob2 { }; globre = callPackage ../development/python-modules/globre { }; @@ -3243,6 +3255,8 @@ in { guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + gvm-tools = callPackage ../development/python-modules/gvm-tools {}; + gviz-api = callPackage ../development/python-modules/gviz-api {}; gym = callPackage ../development/python-modules/gym { }; @@ -3271,6 +3285,8 @@ in { hachoir = callPackage ../development/python-modules/hachoir { }; + hacking = callPackage ../development/python-modules/hacking { }; + hdate = callPackage ../development/python-modules/hdate { }; ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; @@ -3321,6 +3337,8 @@ in { heudiconv = callPackage ../development/python-modules/heudiconv { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; + hg-evolve = callPackage ../development/python-modules/hg-evolve { }; hglib = callPackage ../development/python-modules/hglib { }; @@ -3692,6 +3710,8 @@ in { isort = callPackage ../development/python-modules/isort { }; + isounidecode = callPackage ../development/python-modules/isounidecode { }; + isoweek = callPackage ../development/python-modules/isoweek { }; itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; @@ -3730,6 +3750,10 @@ in { javaproperties = callPackage ../development/python-modules/javaproperties { }; + jax = callPackage ../development/python-modules/jax { }; + + jaxlib = callPackage ../development/python-modules/jaxlib { }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; @@ -3956,6 +3980,8 @@ in { keystone-engine = callPackage ../development/python-modules/keystone-engine { }; + keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; @@ -5087,6 +5113,8 @@ in { opensimplex = callPackage ../development/python-modules/opensimplex { }; + openstacksdk = callPackage ../development/python-modules/openstacksdk { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; @@ -5124,8 +5152,12 @@ in { orvibo = callPackage ../development/python-modules/orvibo { }; + os-service-types = callPackage ../development/python-modules/os-service-types { }; + osc = callPackage ../development/python-modules/osc { }; + osc-lib = callPackage ../development/python-modules/osc-lib { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; oset = callPackage ../development/python-modules/oset { }; @@ -5134,6 +5166,24 @@ in { osmpythontools = callPackage ../development/python-modules/osmpythontools { }; + oslo-concurrency = callPackage ../development/python-modules/oslo-concurrency { }; + + oslo-config = callPackage ../development/python-modules/oslo-config { }; + + oslo-context = callPackage ../development/python-modules/oslo-context { }; + + oslo-db = callPackage ../development/python-modules/oslo-db { }; + + oslo-i18n = callPackage ../development/python-modules/oslo-i18n { }; + + oslo-log = callPackage ../development/python-modules/oslo-log { }; + + oslo-serialization = callPackage ../development/python-modules/oslo-serialization { }; + + oslo-utils = callPackage ../development/python-modules/oslo-utils { }; + + oslotest = callPackage ../development/python-modules/oslotest { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; @@ -5496,6 +5546,8 @@ in { python-juicenet = callPackage ../development/python-modules/python-juicenet { }; + python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { }; + python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; python-openems = callPackage ../development/python-modules/python-openems { }; @@ -5504,6 +5556,8 @@ in { python-songpal = callPackage ../development/python-modules/python-songpal { }; + python-swiftclient = callPackage ../development/python-modules/python-swiftclient { }; + python-tado = callPackage ../development/python-modules/python-tado { }; pyutil = callPackage ../development/python-modules/pyutil { }; @@ -5566,6 +5620,10 @@ in { poetry-core = callPackage ../development/python-modules/poetry-core { }; + poetry-semver = callPackage ../development/python-modules/poetry-semver { }; + + poetry2conda = callPackage ../development/python-modules/poetry2conda { }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { }; polib = callPackage ../development/python-modules/polib { }; @@ -5578,6 +5636,8 @@ in { pomegranate = callPackage ../development/python-modules/pomegranate { }; + pontos = callPackage ../development/python-modules/pontos { }; + pony = callPackage ../development/python-modules/pony { }; ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; @@ -6303,6 +6363,8 @@ in { pylutron-caseta = callPackage ../development/python-modules/pylutron-caseta { }; + pylyrics = callPackage ../development/python-modules/pylyrics { }; + pylxd = callPackage ../development/python-modules/pylxd { }; pylzma = callPackage ../development/python-modules/pylzma { }; @@ -7079,6 +7141,8 @@ in { python-box = callPackage ../development/python-modules/python-box { }; + python-cinderclient = callPackage ../development/python-modules/python-cinderclient { }; + python-constraint = callPackage ../development/python-modules/python-constraint { }; python-crontab = callPackage ../development/python-modules/python-crontab { }; @@ -7127,6 +7191,8 @@ in { python-gnupg = callPackage ../development/python-modules/python-gnupg { }; + python-gvm = callPackage ../development/python-modules/python-gvm { }; + python-hosts = callPackage ../development/python-modules/python-hosts { }; python-hpilo = callPackage ../development/python-modules/python-hpilo { }; @@ -7216,6 +7282,8 @@ in { python-nomad = callPackage ../development/python-modules/python-nomad { }; + python-novaclient = callPackage ../development/python-modules/python-novaclient { }; + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { @@ -7227,6 +7295,8 @@ in { python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; + python-openstackclient = callPackage ../development/python-modules/python-openstackclient { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { }; python-packer = callPackage ../development/python-modules/python-packer { }; @@ -7557,6 +7627,8 @@ in { queuelib = callPackage ../development/python-modules/queuelib { }; + qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {}; + r2pipe = callPackage ../development/python-modules/r2pipe { }; rabbitpy = callPackage ../development/python-modules/rabbitpy { }; @@ -8497,6 +8569,8 @@ in { stem = callPackage ../development/python-modules/stem { }; + stestr = callPackage ../development/python-modules/stestr { }; + stevedore = callPackage ../development/python-modules/stevedore { }; stm32loader = callPackage ../development/python-modules/stm32loader { }; @@ -8549,6 +8623,8 @@ in { inherit (pkgs) subunit cppunit check; }; + subunit2sql = callPackage ../development/python-modules/subunit2sql { }; + suds-jurko = callPackage ../development/python-modules/suds-jurko { }; sumo = callPackage ../development/python-modules/sumo { }; @@ -9072,6 +9148,8 @@ in { ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; + ueagle = callPackage ../development/python-modules/ueagle { }; + ujson = callPackage ../development/python-modules/ujson { }; ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; @@ -9329,6 +9407,8 @@ in { waterfurnace = callPackage ../development/python-modules/waterfurnace { }; + wavedrom = callPackage ../development/python-modules/wavedrom { }; + WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { }; @@ -9606,6 +9686,8 @@ in { yoda = toPythonModule (pkgs.yoda.override { inherit python; }); + youless-api = callPackage ../development/python-modules/youless-api { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { }; youtube-dl-light = callPackage ../tools/misc/youtube-dl { diff --git a/nixpkgs/pkgs/top-level/release-haskell.nix b/nixpkgs/pkgs/top-level/release-haskell.nix index 26f538ff3386..367bf95b3d83 100644 --- a/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/nixpkgs/pkgs/top-level/release-haskell.nix @@ -312,6 +312,7 @@ let language-nix = all; nix-paths = all; titlecase = all; + ghc-api-compat = all; }) { mergeable = pkgs.releaseTools.aggregate { diff --git a/nixpkgs/pkgs/top-level/release-small.nix b/nixpkgs/pkgs/top-level/release-small.nix index 47c47e04e1cc..66c6bb373484 100644 --- a/nixpkgs/pkgs/top-level/release-small.nix +++ b/nixpkgs/pkgs/top-level/release-small.nix @@ -166,7 +166,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; webkitgtk = linux; wget = all; which = all; - wicd = linux; wireshark = linux; wirelesstools = linux; wpa_supplicant = linux; diff --git a/nixpkgs/pkgs/top-level/static.nix b/nixpkgs/pkgs/top-level/static.nix index 73d8d9e53032..449f825be0b6 100644 --- a/nixpkgs/pkgs/top-level/static.nix +++ b/nixpkgs/pkgs/top-level/static.nix @@ -93,6 +93,12 @@ in { gssSupport = false; }; + liblinear = super.liblinear.override { + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; + ocaml-ng = self.lib.mapAttrs (_: set: if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; diff --git a/overlays/personal/pr-tracker/default.nix b/overlays/personal/pr-tracker/default.nix index 0fa30a4e8835..ba8c05f06706 100644 --- a/overlays/personal/pr-tracker/default.nix +++ b/overlays/personal/pr-tracker/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0faj2ir0m4cs6y10xkqc9xvrqkv9w2j4z4yhv354dbfchsg127jk"; }; - cargoSha256 = "1sfc08m8vxvd07p321nh4bmnsf7xfxq8kfbq8inm9yz2fh8f84m9"; + cargoSha256 = "0kgs5h7h30481h67lgxv38px736293jwnmasvzah170sy94q012a"; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ openssl systemd ]; |